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

Fixed issue with effects being created out of order

Browse Source
This commit is contained in:
marcin.sciesinski
2019-08-30 10:12:07 -07:00
parent 584198d164
commit e1df113e31
6 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.UnrespondableEffect;
import java.util.Collections;
import java.util.List;
public abstract class DelayedAppender implements EffectAppender {
private String text;
@@ -27,9 +28,11 @@ public abstract class DelayedAppender implements EffectAppender {
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
for (Effect effect : createEffects(action, playerId, game, self, effectResult, effect)) {
action.appendCost(effect);
}
// Need to insert them, but in the reverse order
final List<? extends Effect> effects = createEffects(action, playerId, game, self, effectResult, effect);
final Effect[] effectsArray = effects.toArray(new Effect[0]);
for (int i = effectsArray.length - 1; i >= 0; i--)
action.insertCost(effectsArray[i]);
}
@Override
@@ -45,9 +48,11 @@ public abstract class DelayedAppender implements EffectAppender {
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
for (Effect effect : createEffects(action, playerId, game, self, effectResult, effect)) {
action.appendEffect(effect);
}
// Need to insert them, but in the reverse order
final List<? extends Effect> effects = createEffects(action, playerId, game, self, effectResult, effect);
final Effect[] effectsArray = effects.toArray(new Effect[0]);
for (int i = effectsArray.length - 1; i >= 0; i--)
action.insertEffect(effectsArray[i]);
}
@Override
@@ -61,7 +66,7 @@ public abstract class DelayedAppender implements EffectAppender {
throw new UnsupportedOperationException("One of createEffect or createEffects has to be overwritten");
}
protected Iterable<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
protected List<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return Collections.singletonList(createEffect(action, playerId, game, self, effectResult, effect));
}

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

@@ -41,7 +41,7 @@ public class Exert implements EffectAppenderProducer {
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Iterable<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
protected List<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final Collection<? extends PhysicalCard> cardsFromMemory = action.getCardsFromMemory(memory);
List<Effect> result = new LinkedList<>();

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

@@ -37,7 +37,7 @@ public class PutStackedCardsIntoHand implements EffectAppenderProducer {
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Iterable<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
protected List<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final Collection<? extends PhysicalCard> cardsToPutToHand = action.getCardsFromMemory("_temp");
List<Effect> result = new LinkedList<>();
for (PhysicalCard physicalCard : cardsToPutToHand)

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

@@ -40,7 +40,7 @@ public class Wound implements EffectAppenderProducer {
result.addEffectAppender(
new DelayedAppender() {
@Override
protected Iterable<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
protected List<? extends Effect> createEffects(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final Collection<? extends PhysicalCard> cardsFromMemory = action.getCardsFromMemory(memory);
List<Effect> result = new LinkedList<>();
for (int i = 0; i < times; i++)

22
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/CardResolver.java
View File

@@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.build.field.effect.appender.resolver;
import com.gempukku.lotro.cards.build.*;
import com.gempukku.lotro.cards.build.field.effect.EffectAppender;
import com.gempukku.lotro.cards.build.field.effect.appender.AbstractEffectAppender;
import com.gempukku.lotro.cards.build.field.effect.appender.DelayedAppender;
import com.gempukku.lotro.common.Filterable;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -27,7 +27,7 @@ public class CardResolver {
String memory, String choicePlayer, String choiceText, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
if (type.startsWith("memory(") && type.endsWith(")")) {
String sourceMemory = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return true;
@@ -47,7 +47,7 @@ public class CardResolver {
final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter);
final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
final int min = countSource.getMinimum(null, playerId, game, self, effectResult, effect);
@@ -87,7 +87,7 @@ public class CardResolver {
public static EffectAppender resolveCardsInHand(String type, ValueSource countSource, String memory, String choicePlayer, String choiceText, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
if (type.startsWith("memory(") && type.endsWith(")")) {
String sourceMemory = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return true;
@@ -107,7 +107,7 @@ public class CardResolver {
final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter);
final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
int min = countSource.getMinimum(null, playerId, game, self, effectResult, effect);
@@ -143,7 +143,7 @@ public class CardResolver {
final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
String sourceMemory = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
if (additionalFilter != null) {
@@ -170,7 +170,7 @@ public class CardResolver {
final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter);
final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
int min = countSource.getMinimum(null, playerId, game, self, effectResult, effect);
@@ -217,7 +217,7 @@ public class CardResolver {
public static EffectAppender resolveCards(String type, FilterableSource additionalFilter, ValueSource countSource, String memory, String choicePlayer, String choiceText, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
if (type.equals("self")) {
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
if (additionalFilter != null)
@@ -237,7 +237,7 @@ public class CardResolver {
};
} else if (type.startsWith("memory(") && type.endsWith(")")) {
String sourceMemory = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
if (additionalFilter != null) {
@@ -264,7 +264,7 @@ public class CardResolver {
} else if (type.startsWith("all(") && type.endsWith(")")) {
final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
protected Effect createEffect(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
return new UnrespondableEffect() {
@@ -285,7 +285,7 @@ public class CardResolver {
final String filter = type.substring(type.indexOf("(") + 1, type.lastIndexOf(")"));
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter);
final PlayerSource playerSource = PlayerResolver.resolvePlayer(choicePlayer, environment);
return new AbstractEffectAppender() {
return new DelayedAppender() {
@Override
public boolean isPlayableInFull(CostToEffectAction action, String playerId, LotroGame game, PhysicalCard self, EffectResult effectResult, Effect effect) {
int min = countSource.getMinimum(null, playerId, game, self, effectResult, effect);

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

@@ -51,4 +51,34 @@ public class NewCardsAtTest extends AbstractAtTest {
assertEquals(0, ((String[]) _userFeedback.getAwaitingDecision(P1).getDecisionParameters().get("actionId")).length);
}
@Test
public void reduceArcheryTotal() throws DecisionResultInvalidException, CardNotFoundException {
initializeSimplestGame();
PhysicalCardImpl legolas = new PhysicalCardImpl(100, "40_52", P1, _library.getLotroCardBlueprint("40_52"));
PhysicalCardImpl arrowsOfLight = new PhysicalCardImpl(100, "40_33", P1, _library.getLotroCardBlueprint("40_33"));
PhysicalCardImpl inquisitor = new PhysicalCardImpl(100, "1_268", P2, _library.getLotroCardBlueprint("1_268"));
_game.getGameState().addCardToZone(_game, inquisitor, Zone.SHADOW_CHARACTERS);
_game.getGameState().addCardToZone(_game, legolas, Zone.FREE_CHARACTERS);
_game.getGameState().addCardToZone(_game, arrowsOfLight, Zone.HAND);
skipMulligans();
// Pass in fellowship
playerDecided(P1, "");
// Pass in shadow
playerDecided(P2, "");
// Pass in maneuver
playerDecided(P1, "");
playerDecided(P2, "");
// Play ArrowsOfLight
playerDecided(P1, "0");
playerDecided(P1, "0");
}
}