ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issues with not delayed effect resolution

Browse Source
This commit is contained in:
marcin.sciesinski
2019-08-28 12:00:00 -07:00
parent f8c97b08a1
commit 31943cf33e
6 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddBurden.java
View File

@@ -30,7 +30,7 @@ public class AddBurden implements EffectAppenderProducer {
MultiEffectAppender result = new MultiEffectAppender();
result.addEffectAppender(
new AbstractEffectAppender() {
new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final String playerAddingBurden = playerSource.getPlayer(playerId, game, self, effectResult, effect);

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddTwilight.java
View File

@@ -21,7 +21,7 @@ public class AddTwilight implements EffectAppenderProducer {
final int amount = FieldUtils.getInteger(effectObject.get("amount"), "amount");
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return new AddTwilightEffect(self, amount);

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardCardAtRandomFromHand.java
View File

@@ -19,7 +19,7 @@ public class DiscardCardAtRandomFromHand implements EffectAppenderProducer {
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return new DiscardCardAtRandomFromHandEffect(self, self.getOwner(), false);

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/NegateWound.java
View File

@@ -35,7 +35,7 @@ public class NegateWound implements EffectAppenderProducer {
return Filters.in(woundEffect.getAffectedCardsMinusPrevented(game));
}, 1, 1, "_temp", "owner", "Choose characters to negate wound to", environment));
result.addEffectAppender(
new AbstractEffectAppender() {
new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final Collection<? extends PhysicalCard> cards = action.getCardsFromMemory("_temp");

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutOnRing.java
View File

@@ -18,7 +18,7 @@ public class PutOnRing implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return new PutOnTheOneRingEffect();

30
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
View File

@@ -997,7 +997,7 @@ public class IndividualCardAtTest extends AbstractAtTest {
_game.getGameState().addTokens(frodo, Token.WOUND, 4);
_game.getGameState().addTwilight(3);
// Pass felloship
// Pass in fellowship
playerDecided(P1, "");
// Play minion
@@ -1006,8 +1006,34 @@ public class IndividualCardAtTest extends AbstractAtTest {
// Put on the ring
playerDecided(P1, "0");
assertEquals(Zone.DISCARD, randomCard1.getZone());
// Pass in maneuver
playerDecided(P2, "");
playerDecided(P1, "");
// Pass in archery
playerDecided(P1, "");
playerDecided(P2, "");
// Pass in assignment
playerDecided(P1, "");
playerDecided(P2, "");
// Assign minion to Frodo
playerDecided(P1, frodo.getCardId() + " " + cheapMinion.getCardId());
// Start skirmish
playerDecided(P1, String.valueOf(frodo.getCardId()));
int burdensBefore = _game.getGameState().getBurdens();
// Pass in skirmish
playerDecided(P1, "");
playerDecided(P2, "");
assertEquals(burdensBefore + 1, _game.getGameState().getBurdens());
assertEquals(4, _game.getGameState().getWounds(frodo));
}
@Test