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

Migrated Isengard cards in set 5 to hjson

Browse Source
This commit is contained in:
MarcinSc
2024-04-22 11:25:10 +07:00
parent 803e0e6470
commit c0cda4eec7
37 changed files with 787 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-sauron.hjson
View File

@@ -23,7 +23,7 @@
] ]
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
over: 4 over: 4
@@ -371,7 +371,7 @@
] ]
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
over: 5 over: 5

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson
View File

@@ -1008,7 +1008,7 @@
] ]
effect: { effect: {
type: Repeat type: Repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
over: 4 over: 4

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1.hjson
View File

@@ -1228,7 +1228,7 @@
effect: [ effect: [
{ {
type: repeat type: repeat
amount: 3 times: 3
effect: { effect: {
type: playCardFromDiscard type: playCardFromDiscard
filter: choose(tracker) filter: choose(tracker)

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dwarven.hjson
View File

@@ -802,7 +802,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: forEachInMemory type: forEachInMemory
memory: stackedCards memory: stackedCards
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson
View File

@@ -554,7 +554,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: 3 times: 3
effect: { effect: {
type: heal type: heal
count: 0-1 count: 0-1

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gollum.hjson
View File

@@ -422,7 +422,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: forEachMatchingInMemory type: forEachMatchingInMemory
filter: side(shadow) filter: side(shadow)
memory: revealedCards memory: revealedCards

45
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Gondor.hjson
View File

@@ -566,39 +566,18 @@
effect: [ effect: [
{ {
type: doWhile type: doWhile
condition: [ effect: {
{ type: playCardFromDiscard
type: memoryIs optional: true
memory: answer filter: choose(possession)
value: yes on: companion,signet(Aragorn)
} memorize: playedCard
{ }
type: memoryMatches condition: {
memory: playedCard type: memoryMatches
filter: possession memory: playedCard
} filter: possession
] }
effect: [
{
type: chooseYesOrNo
text: Would you like to play next possession?
memorize: answer
}
{
type: conditional
requires: {
type: memoryIs
memory: answer
value: yes
}
effect: {
type: playCardFromDiscard
filter: choose(possession)
on: companion,signet(Aragorn)
memorize: playedCard
}
}
]
} }
] ]
} }

901
gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set05-Isengard.hjson → gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Isengard.hjson
View File

File diff suppressed because it is too large Load Diff

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-1.hjson
View File

@@ -490,7 +490,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: fromMemory type: fromMemory
memory: spottedElfCount memory: spottedElfCount
} }
@@ -740,7 +740,7 @@
effect: [ effect: [
{ {
type: repeat type: repeat
amount: { times: {
type: forEachVitality type: forEachVitality
filter: bearer filter: bearer
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson
View File

@@ -109,7 +109,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: forEachInHand type: forEachInHand
filter: side(shadow) filter: side(shadow)
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set14/set14.hjson
View File

@@ -512,7 +512,7 @@
filter: choose(uruk-hai) filter: choose(uruk-hai)
count: 0-1 count: 0-1
} }
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-fp.hjson
View File

@@ -65,7 +65,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: twilightCostInMemory type: twilightCostInMemory
memory: discardedFollower memory: discardedFollower
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
View File

@@ -745,7 +745,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: culture(dwarven),companion filter: culture(dwarven),companion
over: 3 over: 3

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson
View File

@@ -185,7 +185,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: culture(dwarven),companion filter: culture(dwarven),companion
over: 3 over: 3

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
View File

@@ -753,7 +753,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: forEachMatchingInMemory type: forEachMatchingInMemory
memory: cardsInHand memory: cardsInHand
filter: side(free people),skirmish,event filter: side(free people),skirmish,event

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-sites.hjson
View File

@@ -112,7 +112,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: follower,culture(dwarven),not(memory(transferredFollowers)) filter: follower,culture(dwarven),not(memory(transferredFollowers))
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson
View File

@@ -61,7 +61,7 @@
] ]
effect: { effect: {
type: Repeat type: Repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
over: 4 over: 4

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Sauron-errata.hjson
View File

@@ -392,7 +392,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: ForEachInDeadPile type: ForEachInDeadPile
filter: any filter: any
} }
@@ -432,7 +432,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: ForEachInDeadPile type: ForEachInDeadPile
filter: any filter: any
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set02/set02-Dwarven-errata.hjson
View File

@@ -164,7 +164,7 @@
} }
{ {
type: Repeat type: Repeat
amount: 9 times: 9
effect: { effect: {
type: conditional type: conditional
requires: { requires: {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Moria-errata.hjson
View File

@@ -53,7 +53,7 @@
} }
{ {
type: repeat type: repeat
amount: { times: {
type: sum type: sum
source: [ source: [
{ {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set04/set04-Isengard-errata.hjson
View File

@@ -50,7 +50,7 @@
} }
{ {
type: Repeat type: Repeat
amount: { times: {
type: Sum type: Sum
source: [ source: [
1 1

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set05/set05-Isengard-errata.hjson
View File

@@ -63,7 +63,7 @@
effect: [ effect: [
{ {
type: repeat type: repeat
amount: { times: {
type: ForEachToken type: ForEachToken
filter: self filter: self
culture: isengard culture: isengard

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Rohan-errata.hjson
View File

@@ -62,7 +62,7 @@
} }
{ {
type: Repeat type: Repeat
amount: { times: {
type: ForEachWound type: ForEachWound
filter: minion,InSkirmishAgainst(self) filter: minion,InSkirmishAgainst(self)
} }

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set15/set15-Gondor-errata.hjson
View File

@@ -132,7 +132,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachThreat type: forEachThreat
} }
effect: { effect: {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson
View File

@@ -405,7 +405,7 @@
} }
effect: { effect: {
type: repeat type: repeat
amount: { times: {
type: forEachYouCanSpot type: forEachYouCanSpot
filter: companion filter: companion
over: 5 over: 5

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

@@ -7,12 +7,10 @@ import com.gempukku.lotro.cards.build.Requirement;
import com.gempukku.lotro.cards.build.field.FieldUtils; import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.cards.build.field.effect.EffectAppender; import com.gempukku.lotro.cards.build.field.effect.EffectAppender;
import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer; import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.CostToEffectAction; import com.gempukku.lotro.logic.actions.CostToEffectAction;
import com.gempukku.lotro.logic.actions.SubAction; import com.gempukku.lotro.logic.actions.DoWhileSubAction;
import com.gempukku.lotro.logic.effects.StackActionEffect; import com.gempukku.lotro.logic.effects.StackActionEffect;
import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.UnrespondableEffect;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
public class DoWhile implements EffectAppenderProducer { public class DoWhile implements EffectAppenderProducer {
@@ -36,30 +34,15 @@ public class DoWhile implements EffectAppenderProducer {
return true; return true;
} }
private SubAction createSubAction(CostToEffectAction action, ActionContext actionContext) {
SubAction subAction = new SubAction(action);
for (EffectAppender effectAppender : effectAppenders)
effectAppender.appendEffect(false, subAction, actionContext);
subAction.appendEffect(
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
if (conditionsMatch(actionContext)) {
game.getActionsEnvironment().addActionToStack(createSubAction(action, actionContext));
}
}
}
);
return subAction;
}
@Override @Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) { protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
if (conditionsMatch(actionContext)) { DoWhileSubAction doWhile = new DoWhileSubAction(action,
return new StackActionEffect(createSubAction(action, actionContext)); () -> conditionsMatch(actionContext),
} else { costToEffectAction -> {
return null; for (EffectAppender effectAppender : effectAppenders)
} effectAppender.appendEffect(false, costToEffectAction, actionContext);
});
return new StackActionEffect(doWhile);
} }
}; };
} }

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

@@ -15,6 +15,8 @@ import com.gempukku.lotro.logic.actions.CostToEffectAction;
import com.gempukku.lotro.logic.effects.StackActionEffect; import com.gempukku.lotro.logic.effects.StackActionEffect;
import com.gempukku.lotro.logic.modifiers.ModifierFlag; import com.gempukku.lotro.logic.modifiers.ModifierFlag;
import com.gempukku.lotro.logic.modifiers.evaluator.ConstantEvaluator; import com.gempukku.lotro.logic.modifiers.evaluator.ConstantEvaluator;
import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator;
import com.gempukku.lotro.logic.modifiers.evaluator.RangeEvaluator;
import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.ExtraFilters; import com.gempukku.lotro.logic.timing.ExtraFilters;
import com.gempukku.lotro.logic.timing.FailedEffect; import com.gempukku.lotro.logic.timing.FailedEffect;
@@ -25,12 +27,13 @@ import java.util.Collection;
public class PlayCardFromDiscard implements EffectAppenderProducer { public class PlayCardFromDiscard implements EffectAppenderProducer {
@Override @Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "filter", "on", "cost", "removedTwilight", "memorize"); FieldUtils.validateAllowedFields(effectObject, "filter", "on", "cost", "removedTwilight", "optional", "memorize");
final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter");
final String onFilter = FieldUtils.getString(effectObject.get("on"), "on"); final String onFilter = FieldUtils.getString(effectObject.get("on"), "on");
final int removedTwilight = FieldUtils.getInteger(effectObject.get("removedTwilight"), "removedTwilight", 0); final int removedTwilight = FieldUtils.getInteger(effectObject.get("removedTwilight"), "removedTwilight", 0);
final ValueSource costModifierSource = ValueResolver.resolveEvaluator(effectObject.get("cost"), 0, environment); final ValueSource costModifierSource = ValueResolver.resolveEvaluator(effectObject.get("cost"), 0, environment);
final boolean optional = FieldUtils.getBoolean(effectObject.get("optional"), "optional", false);
final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp");
final FilterableSource onFilterableSource = (onFilter != null) ? environment.getFilterFactory().generateFilter(onFilter, environment) : null; final FilterableSource onFilterableSource = (onFilter != null) ? environment.getFilterFactory().generateFilter(onFilter, environment) : null;
@@ -38,6 +41,8 @@ public class PlayCardFromDiscard implements EffectAppenderProducer {
MultiEffectAppender result = new MultiEffectAppender(); MultiEffectAppender result = new MultiEffectAppender();
result.setPlayabilityCheckedForEffect(true); result.setPlayabilityCheckedForEffect(true);
Evaluator countEvaluator = optional ? new RangeEvaluator(0, 1) : new ConstantEvaluator(1);
result.addEffectAppender( result.addEffectAppender(
CardResolver.resolveCardsInDiscard(filter, CardResolver.resolveCardsInDiscard(filter,
(actionContext) -> { (actionContext) -> {
@@ -60,7 +65,7 @@ public class PlayCardFromDiscard implements EffectAppenderProducer {
return Filters.playable(actionContext.getGame(), removedTwilight, costModifier, false, false, true); return Filters.playable(actionContext.getGame(), removedTwilight, costModifier, false, false, true);
}, },
new ConstantEvaluator(1), memorize, "you", "Choose card to play", environment)); countEvaluator, memorize, "you", "Choose card to play", environment));
result.addEffectAppender( result.addEffectAppender(
new DelayedAppender() { new DelayedAppender() {
@Override @Override

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

@@ -19,9 +19,9 @@ import java.util.Arrays;
public class Repeat implements EffectAppenderProducer { public class Repeat implements EffectAppenderProducer {
@Override @Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "amount", "effect"); FieldUtils.validateAllowedFields(effectObject, "times", "effect");
final ValueSource amountSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), environment); final ValueSource timesSource = ValueResolver.resolveEvaluator(effectObject.get("times"), environment);
final JSONObject[] effectArray = FieldUtils.getObjectArray(effectObject.get("effect"), "effect"); final JSONObject[] effectArray = FieldUtils.getObjectArray(effectObject.get("effect"), "effect");
final EffectAppender[] effectAppenders = environment.getEffectAppenderFactory().getEffectAppenders(effectArray, environment); final EffectAppender[] effectAppenders = environment.getEffectAppenderFactory().getEffectAppenders(effectArray, environment);
@@ -29,10 +29,10 @@ public class Repeat implements EffectAppenderProducer {
return new DelayedAppender() { return new DelayedAppender() {
@Override @Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) { protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
final int count = amountSource.getEvaluator(actionContext).evaluateExpression(actionContext.getGame(), null); final int times = timesSource.getEvaluator(actionContext).evaluateExpression(actionContext.getGame(), null);
if (count > 0) { if (times > 0) {
SubAction subAction = new SubAction(action); SubAction subAction = new SubAction(action);
for (int i = 0; i < count; i++) { for (int i = 0; i < times; i++) {
for (EffectAppender effectAppender : effectAppenders) for (EffectAppender effectAppender : effectAppenders)
effectAppender.appendEffect(false, subAction, actionContext); effectAppender.appendEffect(false, subAction, actionContext);
} }

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java
View File

@@ -41,6 +41,7 @@ public class FilterFactory {
}); });
simpleFilters.put("bearer", (actionContext -> Filters.hasAttached(actionContext.getSource()))); simpleFilters.put("bearer", (actionContext -> Filters.hasAttached(actionContext.getSource())));
simpleFilters.put("character", (actionContext) -> Filters.character); simpleFilters.put("character", (actionContext) -> Filters.character);
simpleFilters.put("canbereturnedtohand", (actionContext -> Filters.canBeReturnedToHand(actionContext.getSource())));
simpleFilters.put("canexert", (actionContext -> Filters.canExert(actionContext.getSource()))); simpleFilters.put("canexert", (actionContext -> Filters.canExert(actionContext.getSource())));
simpleFilters.put("controlledbyotherplayer", simpleFilters.put("controlledbyotherplayer",
(actionContext -> Filters.siteControlledByOtherPlayer(actionContext.getPerformingPlayer()))); (actionContext -> Filters.siteControlledByOtherPlayer(actionContext.getPerformingPlayer())));

18
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/CanSpotFPCultures.java Normal file
View File

@@ -0,0 +1,18 @@
package com.gempukku.lotro.cards.build.field.effect.requirement;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.Requirement;
import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.logic.GameUtils;
import org.json.simple.JSONObject;
public class CanSpotFPCultures implements RequirementProducer {
@Override
public Requirement getPlayRequirement(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(object, "amount");
final int amount = FieldUtils.getInteger(object.get("amount"), "amount");
return (actionContext) -> GameUtils.getSpottableFPCulturesCount(actionContext.getGame(), actionContext.getPerformingPlayer()) >= amount;
}
}

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java
View File

@@ -20,6 +20,7 @@ public class RequirementFactory {
requirementProducers.put("canspot", new CanSpot()); requirementProducers.put("canspot", new CanSpot());
requirementProducers.put("canspotburdens", new CanSpotBurdens()); requirementProducers.put("canspotburdens", new CanSpotBurdens());
requirementProducers.put("canspotculturetokens", new CanSpotCultureTokens()); requirementProducers.put("canspotculturetokens", new CanSpotCultureTokens());
requirementProducers.put("canspotfpcultures", new CanSpotFPCultures());
requirementProducers.put("canspotthreats", new CanSpotThreats()); requirementProducers.put("canspotthreats", new CanSpotThreats());
requirementProducers.put("canspottwilight", new CanSpotTwilight()); requirementProducers.put("canspottwilight", new CanSpotTwilight());
requirementProducers.put("canspotwounds", new CanSpotWounds()); requirementProducers.put("canspotwounds", new CanSpotWounds());

16
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/AboutToDiscardFromPlay.java
View File

@@ -11,10 +11,11 @@ import org.json.simple.JSONObject;
public class AboutToDiscardFromPlay implements TriggerCheckerProducer { public class AboutToDiscardFromPlay implements TriggerCheckerProducer {
@Override @Override
public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(value, "source", "filter"); FieldUtils.validateAllowedFields(value, "source", "filter", "opponent");
String source = FieldUtils.getString(value.get("source"), "source", "any"); String source = FieldUtils.getString(value.get("source"), "source", "any");
String filter = FieldUtils.getString(value.get("filter"), "filter"); String filter = FieldUtils.getString(value.get("filter"), "filter");
boolean opponent = FieldUtils.getBoolean(value.get("opponent"), "opponent", false);
final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(source, environment); final FilterableSource sourceFilter = environment.getFilterFactory().generateFilter(source, environment);
final FilterableSource affectedFilter = environment.getFilterFactory().generateFilter(filter, environment); final FilterableSource affectedFilter = environment.getFilterFactory().generateFilter(filter, environment);
@@ -22,9 +23,16 @@ public class AboutToDiscardFromPlay implements TriggerCheckerProducer {
return new TriggerChecker() { return new TriggerChecker() {
@Override @Override
public boolean accepts(ActionContext actionContext) { public boolean accepts(ActionContext actionContext) {
return TriggerConditions.isGettingDiscardedBy(actionContext.getEffect(), actionContext.getGame(), if (opponent) {
sourceFilter.getFilterable(actionContext), return TriggerConditions.isGettingDiscardedByOpponent(actionContext.getEffect(), actionContext.getGame(),
affectedFilter.getFilterable(actionContext)); actionContext.getPerformingPlayer(),
sourceFilter.getFilterable(actionContext),
affectedFilter.getFilterable(actionContext));
} else {
return TriggerConditions.isGettingDiscardedBy(actionContext.getEffect(), actionContext.getGame(),
sourceFilter.getFilterable(actionContext),
affectedFilter.getFilterable(actionContext));
}
} }
@Override @Override

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/UsesSpecialAbility.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.FilterableSource; import com.gempukku.lotro.cards.build.FilterableSource;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException; import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.field.FieldUtils; import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.logic.timing.TriggerConditions; import com.gempukku.lotro.logic.timing.TriggerConditions;
import com.gempukku.lotro.logic.timing.results.ActivateCardResult; import com.gempukku.lotro.logic.timing.results.ActivateCardResult;
@@ -13,10 +14,11 @@ import org.json.simple.JSONObject;
public class UsesSpecialAbility implements TriggerCheckerProducer { public class UsesSpecialAbility implements TriggerCheckerProducer {
@Override @Override
public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(value, "filter", "memorize"); FieldUtils.validateAllowedFields(value, "filter", "memorize", "phase");
String filter = FieldUtils.getString(value.get("filter"), "filter", "any"); String filter = FieldUtils.getString(value.get("filter"), "filter", "any");
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
final Phase phase = FieldUtils.getEnum(Phase.class, value.get("phase"), "phase");
final String memorize = FieldUtils.getString(value.get("memorize"), "memorize"); final String memorize = FieldUtils.getString(value.get("memorize"), "memorize");
return new TriggerChecker() { return new TriggerChecker() {
@@ -31,6 +33,10 @@ public class UsesSpecialAbility implements TriggerCheckerProducer {
if (activated) { if (activated) {
ActivateCardResult activateCardResult = (ActivateCardResult) actionContext.getEffectResult(); ActivateCardResult activateCardResult = (ActivateCardResult) actionContext.getEffectResult();
if (phase != null) {
if (activateCardResult.getActionTimeword() != phase)
return false;
}
if (memorize != null) { if (memorize != null) {
PhysicalCard playedCard = activateCardResult.getSource(); PhysicalCard playedCard = activateCardResult.getSource();

9
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -519,6 +519,15 @@ public class Filters {
}; };
} }
public static Filter canBeReturnedToHand(final PhysicalCard source) {
return new Filter() {
@Override
public boolean accepts(LotroGame game, PhysicalCard physicalCard) {
return game.getModifiersQuerying().canBeReturnedToHand(game, physicalCard, source);
}
};
}
public static Filter canExert(final PhysicalCard source) { public static Filter canExert(final PhysicalCard source) {
return canExert(source, 1); return canExert(source, 1);
} }

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/AbstractCostToEffectAction.java
View File

@@ -122,6 +122,10 @@ public abstract class AbstractCostToEffectAction implements CostToEffectAction {
return sum; return sum;
} }
protected final boolean hasNextCost() {
return !_costs.isEmpty();
}
protected final Effect getNextCost() { protected final Effect getNextCost() {
Effect cost = _costs.poll(); Effect cost = _costs.poll();
if (cost != null) if (cost != null)
@@ -129,6 +133,10 @@ public abstract class AbstractCostToEffectAction implements CostToEffectAction {
return cost; return cost;
} }
protected final boolean hasNextEffect() {
return !_effects.isEmpty();
}
protected final Effect getNextEffect() { protected final Effect getNextEffect() {
final Effect effect = _effects.poll(); final Effect effect = _effects.poll();
if (effect != null) if (effect != null)

37
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/DoWhileSubAction.java Normal file
View File

@@ -0,0 +1,37 @@
package com.gempukku.lotro.logic.actions;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.Effect;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
public class DoWhileSubAction extends SubAction {
private final BooleanSupplier condition;
private final Consumer<CostToEffectAction> effectsAppender;
private boolean firstExecution = true;
public DoWhileSubAction(Action action, BooleanSupplier condition, Consumer<CostToEffectAction> effectsAppender) {
super(action);
this.condition = condition;
this.effectsAppender = effectsAppender;
}
@Override
public Effect nextEffect(LotroGame game) {
if (firstExecution) {
effectsAppender.accept(this);
firstExecution = false;
}
if (!hasNextEffect()) {
if (condition.getAsBoolean()) {
effectsAppender.accept(this);
}
}
return getNextEffect();
}
}

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java
View File

@@ -419,10 +419,11 @@ public class TriggerConditions {
return false; return false;
} }
public static boolean isGettingDiscardedByOpponent(Effect effect, LotroGame game, String playerId, Filterable... filters) { public static boolean isGettingDiscardedByOpponent(Effect effect, LotroGame game, String playerId, Filterable sourceFilter, Filterable... filters) {
if (effect.getType() == Effect.Type.BEFORE_DISCARD_FROM_PLAY) { if (effect.getType() == Effect.Type.BEFORE_DISCARD_FROM_PLAY) {
PreventableCardEffect preventableEffect = (PreventableCardEffect) effect; PreventableCardEffect preventableEffect = (PreventableCardEffect) effect;
if (effect.getSource() != null && !effect.getPerformingPlayer().equals(playerId)) if (effect.getSource() != null && Filters.and(sourceFilter).accepts(game, effect.getSource())
&& !effect.getPerformingPlayer().equals(playerId))
return Filters.filter(preventableEffect.getAffectedCardsMinusPrevented(game), game, filters).size() > 0; return Filters.filter(preventableEffect.getAffectedCardsMinusPrevented(game), game, filters).size() > 0;
} }
return false; return false;