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

Migrated Isengard cards in set 12 to hjson

Browse Source
This commit is contained in:
MarcinSc
2024-05-18 19:06:13 +07:00
parent ebcbc3ed74
commit 03b9440cf8
6 changed files with 125 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java
View File

@@ -1,97 +0,0 @@
package com.gempukku.lotro.cards.set12.isengard;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.ReadableStringWhileInZoneData;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.cardtype.AbstractMinion;
import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.modifiers.Modifier;
import com.gempukku.lotro.logic.modifiers.StrengthModifier;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.TriggerConditions;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
/**
* Set: Black Rider
* Side: Shadow
* Culture: Isengard
* Twilight Cost: 4
* Type: Minion • Wizard
* Strength: 8
* Vitality: 4
* Site: 4
* Game Text: Damage +1. Fierce. Lurker. (Skirmishes involving lurker minions must be resolved after any others.) When
* you play Saruman, name a culture. Each companion of the named culture is strength -1.
*/
public class Card12_054 extends AbstractMinion {
public Card12_054() {
super(4, 8, 4, 4, Race.WIZARD, Culture.ISENGARD, "Saruman", "Of Many Colours", true);
addKeyword(Keyword.DAMAGE, 1);
addKeyword(Keyword.FIERCE);
addKeyword(Keyword.LURKER);
}
@Override
public List<? extends Modifier> getInPlayModifiers(LotroGame game, final PhysicalCard self) {
return Collections.singletonList(new StrengthModifier(self, Filters.and(CardType.COMPANION,
new Filter() {
@Override
public boolean accepts(LotroGame game, PhysicalCard physicalCard) {
return self.getWhileInZoneData() != null && physicalCard.getBlueprint().getCulture() == fromData(self.getWhileInZoneData());
}
}), -1));
}
@Override
public String getDisplayableInformation(PhysicalCard self) {
if (self.getWhileInZoneData() != null)
return "Chosen culture is " + self.getWhileInZoneData().getHumanReadable();
return null;
}
@Override
public List<RequiredTriggerAction> getRequiredAfterTriggers(final LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (TriggerConditions.played(game, effectResult, self)) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
final Set<String> possibleCultures = new LinkedHashSet<>();
for (Culture culture : Culture.values())
if (culture.isOfficial())
possibleCultures.add(culture.getHumanReadable());
action.appendEffect(
new PlayoutDecisionEffect(self.getOwner(),
new MultipleChoiceAwaitingDecision(1, "Choose a culture", possibleCultures.toArray(new String[possibleCultures.size()])) {
@Override
protected void validDecisionMade(int index, String result) {
self.setWhileInZoneData(toData(Culture.findCultureByHumanReadable(result)));
game.getGameState().sendMessage(self.getOwner() +" has chosen "+ result);
}
}));
return Collections.singletonList(action);
}
return null;
}
private Culture fromData(PhysicalCard.WhileInZoneData data) {
if (data == null)
return null;
return Culture.valueOf(data.getValue());
}
private PhysicalCard.WhileInZoneData toData(Culture culture) {
return new ReadableStringWhileInZoneData(culture.name(), culture.getHumanReadable());
}
}

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

@@ -32,6 +32,35 @@
Lurker
]
effects: [
{
type: trigger
trigger: {
type: played
filter: self
}
effect: [
{
type: chooseACulture
memorize: chosenCulture
}
{
type: storeCulture
memory: chosenCulture
}
]
}
{
type: displayableInformation
text: Chosen culture - {stored}
}
{
type: modifier
modifier: {
type: modifyStrength
filter: companion,storedCulture
amount: -1
}
}
]
gametext: <b>Damage +1</b>. <b>Fierce</b>. <b>Lurker</b>. <helper>(Skirmishes involving lurker minions must be resolved after any others.)</helper><br>When you play Saruman, name a culture. Each companion of the named culture is strength -1.
lore: White!" he sneered. "It serves as a beginning."'"

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

@@ -31,6 +31,7 @@ public class EffectAppenderFactory {
effectAppenderProducers.put("canplaynextaction", new CanPlayNextAction());
effectAppenderProducers.put("choice", new Choice());
effectAppenderProducers.put("chooseactivecards", new ChooseActiveCards());
effectAppenderProducers.put("chooseaculture", new ChooseACulture());
effectAppenderProducers.put("chooseakeyword", new ChooseAKeyword());
effectAppenderProducers.put("chooseandaddtwilight", new ChooseAndAddTwilight());
effectAppenderProducers.put("chooseandheal", new ChooseAndHeal());
@@ -180,6 +181,7 @@ public class EffectAppenderFactory {
effectAppenderProducers.put("stackplayedevent", new StackPlayedEvent());
effectAppenderProducers.put("stacktopcardsofdrawdeck", new StackTopCardsOfDrawDeck());
effectAppenderProducers.put("startskirmish", new StartSkirmish());
effectAppenderProducers.put("storeculture", new StoreCulture());
effectAppenderProducers.put("storekeyword", new StoreKeyword());
effectAppenderProducers.put("storewhileinzone", new StoreWhileInZone());
effectAppenderProducers.put("takecontrolofsite", new TakeControlOfSite());

47
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ChooseACulture.java Normal file
View File

@@ -0,0 +1,47 @@
package com.gempukku.lotro.cards.build.field.effect.appender;
import com.gempukku.lotro.cards.build.ActionContext;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
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.EffectAppenderProducer;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.logic.actions.CostToEffectAction;
import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision;
import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
import com.gempukku.lotro.logic.timing.Effect;
import org.json.simple.JSONObject;
import java.util.Set;
import java.util.TreeSet;
public class ChooseACulture implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "memorize");
final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize");
return new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
final Set<String> possibleCultures = new TreeSet<>();
for (Culture culture : Culture.values()) {
possibleCultures.add(culture.getHumanReadable());
}
return new PlayoutDecisionEffect(
actionContext.getPerformingPlayer(),
new MultipleChoiceAwaitingDecision(1, "Choose a culture",
possibleCultures.toArray(new String[0])) {
@Override
protected void validDecisionMade(int index, String result) {
actionContext.setValueToMemory(memorize, Culture.findCultureByHumanReadable(result).toString());
actionContext.getGame().getGameState().sendMessage(actionContext.getPerformingPlayer() + " has chosen " + result);
}
});
}
};
}
}

40
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StoreCulture.java Normal file
View File

@@ -0,0 +1,40 @@
package com.gempukku.lotro.cards.build.field.effect.appender;
import com.gempukku.lotro.cards.build.ActionContext;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
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.EffectAppenderProducer;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.game.ReadableStringWhileInZoneData;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.CostToEffectAction;
import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.UnrespondableEffect;
import org.json.simple.JSONObject;
public class StoreCulture implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "memory");
final String memory = FieldUtils.getString(effectObject.get("memory"), "memory");
return new DelayedAppender() {
@Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
return new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
String valueFromMemory = actionContext.getValueFromMemory(memory);
if (valueFromMemory != null) {
Culture keyword = Culture.valueOf(valueFromMemory);
actionContext.getSource().setWhileInZoneData(new ReadableStringWhileInZoneData(keyword.name(), keyword.getHumanReadable()));
}
}
};
}
};
}
}

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

@@ -143,6 +143,13 @@ public class FilterFactory {
final CharacterLostSkirmishResult lostSkirmish = (CharacterLostSkirmishResult) actionContext.getEffectResult();
return lostSkirmish.getLoser();
});
simpleFilters.put("storedculture",
(actionContext) -> {
PhysicalCard.WhileInZoneData data = actionContext.getSource().getWhileInZoneData();
if (data == null)
return Filters.none;
return Culture.valueOf(data.getValue());
});
simpleFilters.put("storedkeyword",
(actionContext) -> {
PhysicalCard.WhileInZoneData data = actionContext.getSource().getWhileInZoneData();