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

Restoring Radagast errata that somehow got altered

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2025-06-19 05:36:41 -05:00
parent 0ecb93b947
commit 794c8e4fa6
3 changed files with 129 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set09/set09-Gandalf-errata.hjson
View File

@@ -25,12 +25,80 @@
resistance: 6,
effects: [
{
type: modifier
modifier: {
type: modifyMoveLimit
amount: 1
type: trigger
trigger: [
{
type: played
filter: self
}
{
type: startOfTurn
}
]
requires: {
type: perTurnLimit
limit: 1
}
effect: [
{
type: incrementPerTurnLimit
limit: 1
}
{
type: addModifier
until: endOfTurn
modifier: {
type: modifyMoveLimit
amount: 1
}
}
{
type: AddTrigger
until: endOfTurn
optional: false
trigger: {
type: RemovedFromPlay
filter: title(Radagast)
}
effect: {
type: addModifier
until: endOfTurn
modifier: {
type: modifyMoveLimit
amount: -1
}
}
}
]
}
# {
# type: DiscardedFromPlayTrigger
# optional: false
# effect: [
# {
# type: addModifier
# until: endOfTurn
# modifier: {
# type: modifyMoveLimit
# amount: -1
# }
# }
# ]
# }
# {
# type: KilledTrigger
# optional: false
# effect: [
# {
# type: addModifier
# until: endOfTurn
# modifier: {
# type: modifyMoveLimit
# amount: -1
# }
# }
# ]
# }
{
type: Trigger
optional: false

56
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/RemovedFromPlay.java Normal file
View File

@@ -0,0 +1,56 @@
package com.gempukku.lotro.cards.build.field.effect.trigger;
import com.gempukku.lotro.cards.build.ActionContext;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.FilterableSource;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.common.Filterable;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.logic.timing.TriggerConditions;
import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult;
import com.gempukku.lotro.logic.timing.results.ForEachKilledResult;
import com.gempukku.lotro.logic.timing.results.ReturnCardsToHandResult;
import org.json.simple.JSONObject;
public class RemovedFromPlay implements TriggerCheckerProducer {
@Override
public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(value, "filter", "memorize");
final String filter = FieldUtils.getString(value.get("filter"), "filter", "any");
final String memorize = FieldUtils.getString(value.get("memorize"), "memorize");
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
return new TriggerChecker() {
@Override
public boolean isBefore() {
return false;
}
@Override
public boolean accepts(ActionContext actionContext) {
final Filterable filterable = filterableSource.getFilterable(actionContext);
final boolean killResult = TriggerConditions.forEachKilled(actionContext.getGame(), actionContext.getEffectResult(), false, null, filterable);
if (killResult && memorize != null) {
final PhysicalCard killedCard = ((ForEachKilledResult) actionContext.getEffectResult()).getKilledCard();
actionContext.setCardMemory(memorize, killedCard);
}
final boolean discardResult = TriggerConditions.forEachDiscardedFromPlay(actionContext.getGame(), actionContext.getEffectResult(), filterable);
if (discardResult && memorize != null) {
final PhysicalCard discardedCard = ((DiscardCardsFromPlayResult) actionContext.getEffectResult()).getDiscardedCard();
actionContext.setCardMemory(memorize, discardedCard);
}
final boolean returnedResult = TriggerConditions.forEachReturnedToHand(actionContext.getGame(), actionContext.getEffectResult(), filterable);
if (returnedResult && memorize != null) {
final PhysicalCard returnedCard = ((ReturnCardsToHandResult) actionContext.getEffectResult()).getReturnedCard();
actionContext.setCardMemory(memorize, returnedCard);
}
return killResult || discardResult || returnedResult;
}
};
}
}

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

@@ -59,6 +59,7 @@ public class TriggerCheckerFactory {
triggerCheckers.put("playerdrawscard", new PlayerDrawsCard());
triggerCheckers.put("putsonring", new PutsOnRing());
triggerCheckers.put("reconciles", new Reconciles());
triggerCheckers.put("removedfromplay", new RemovedFromPlay());
triggerCheckers.put("removesburden", new RemovesBurden());
triggerCheckers.put("removesculturetoken", new RemovesCultureToken());
triggerCheckers.put("replacessite", new ReplacesSite());