external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Impending: use Effect for Last Time counter removed (#6096)

Browse Source
This commit is contained in:
Hans Mackowiak
2024-09-07 16:19:17 +02:00
committed by GitHub
parent 73adb8b2d9
commit f792a5b79e
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -463,6 +463,11 @@ public abstract class SpellAbilityEffect {
card.addChangedSVars(Collections.singletonMap("EndOfTurnLeavePlay", "AtEOT"), card.getGame().getNextTimestamp(), 0);
}
protected static SpellAbility getExileSpellAbility(final Card card) {
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
return AbilityFactory.getAbility(effect, card);
}
protected static SpellAbility getForgetSpellAbility(final Card card) {
String forgetEffect = "DB$ Pump | ForgetObjects$ TriggeredCard";
String exileEffect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile"
@@ -498,17 +503,15 @@ public abstract class SpellAbilityEffect {
protected static void addExileOnMovedTrigger(final Card card, final String zone) {
String trig = "Mode$ ChangesZone | ValidCard$ Card.IsRemembered | Origin$ " + zone + " | Destination$ Any | TriggerZones$ Command | Static$ True";
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
parsedTrigger.setOverridingAbility(getExileSpellAbility(card));
card.addTrigger(parsedTrigger);
}
protected static void addExileOnCounteredTrigger(final Card card) {
String trig = "Mode$ Countered | ValidCard$ Card.IsRemembered | TriggerZones$ Command | Static$ True";
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
parsedTrigger.setOverridingAbility(getExileSpellAbility(card));
card.addTrigger(parsedTrigger);
}
@@ -520,6 +523,13 @@ public abstract class SpellAbilityEffect {
card.addTrigger(parsedTrigger);
}
protected static void addExileCounterTrigger(final Card card, final String counterType) {
String trig = "Mode$ CounterRemoved | TriggerZones$ Command | ValidCard$ Card.EffectSource | CounterType$ " + counterType + " | NewCounterAmount$ 0 | Static$ True";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(getExileSpellAbility(card));
card.addTrigger(parsedTrigger);
}
protected static void addForgetCounterTrigger(final Card card, final String counterType) {
String trig = "Mode$ CounterRemoved | TriggerZones$ Command | ValidCard$ Card.IsRemembered | CounterType$ " + counterType + " | NewCounterAmount$ 0 | Static$ True";
String trig2 = "Mode$ PhaseOut | TriggerZones$ Command | ValidCard$ Card.phasedOutIsRemembered | Static$ True";
@@ -536,9 +546,8 @@ public abstract class SpellAbilityEffect {
protected static void addExileOnLostTrigger(final Card card) {
String trig = "Mode$ LosesGame | ValidPlayer$ You | TriggerController$ Player | TriggerZones$ Command | Static$ True";
String effect = "DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile";
final Trigger parsedTrigger = TriggerHandler.parseTrigger(trig, card, true);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
parsedTrigger.setOverridingAbility(getExileSpellAbility(card));
card.addTrigger(parsedTrigger);
}

4
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -251,6 +251,10 @@ public class EffectEffect extends SpellAbilityEffect {
addExileOnLostTrigger(eff);
}
if (sa.hasParam("ExileOnCounter")) {
addExileCounterTrigger(eff, sa.getParam("ExileOnCounter"));
}
// Set Imprinted
if (effectImprinted != null) {
eff.addImprintedCards(AbilityUtils.getDefinedCards(hostCard, effectImprinted, sa));

27
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1067,8 +1067,8 @@ public class CardFactoryUtil {
pump.setSubAbility(remove);
remove.setSubAbility(cleanup);
trigger.setOverridingAbility(trigMake);
inst.addTrigger(trigger);
inst.addTrigger(trigger);
} else if (keyword.startsWith("Echo")) {
final String[] k = keyword.split(":");
final String cost = k[1];
@@ -1381,7 +1381,7 @@ public class CardFactoryUtil {
String hideawayDig = "DB$ Dig | Defined$ You | DigNum$ " + n + " | DestinationZone$ Exile | ExileFaceDown$ True | RememberChanged$ True | RestRandomOrder$ True";
String hideawayEffect = "DB$ Effect | StaticAbilities$ STHideawayEffectLookAtCard | ForgetOnMoved$ Exile | RememberObjects$ Remembered | Duration$ Permanent";
String cleanupStr = "DB$ Cleanup | ClearRemembered$ True";
String lookAtCard = "Mode$ Continuous | Affected$ Card.IsRemembered | MayLookAt$ EffectSourceController | EffectZone$ Command | AffectedZone$ Exile | Description$ Any player who has controlled the permanent that exiled this card may look at this card in the exile zone.";
SpellAbility digSA = AbilityFactory.getAbility(hideawayDig, card);
@@ -1597,7 +1597,7 @@ public class CardFactoryUtil {
trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
trigger.setSVar("Offspring", "Count$OptionalKeywordAmount");
inst.addTrigger(trigger);
inst.addTrigger(trigger);
} else if (keyword.startsWith("Partner:")) {
// Partner With
final String[] k = keyword.split(":");
@@ -2354,7 +2354,17 @@ public class CardFactoryUtil {
final String effect = "DB$ PutCounter | Defined$ ReplacedCard | CounterType$ TIME | CounterNum$ " + m
+ " | ETB$ True | SpellDescription$ " + desc;
final ReplacementEffect re = createETBReplacement(card, ReplacementLayer.Other, effect, false, true, intrinsic, "Card.Self+impended", "");
SpellAbility repAb = AbilityFactory.getAbility(effect, card);
String staticEffect = "DB$ Effect | StaticAbilities$ NoCreature | ExileOnCounter$ TIME | Duration$ UntilHostLeavesPlay";
String staticNoCreature = "Mode$ Continuous | Affected$ Card.EffectSource+counters_GE1_TIME | RemoveType$ Creature | Description$ EFFECTSOURCE isn't a creature.";
AbilitySub effectAb = (AbilitySub)AbilityFactory.getAbility(staticEffect, card);
effectAb.setSVar("NoCreature", staticNoCreature);
repAb.setSubAbility(effectAb);
final ReplacementEffect re = createETBReplacement(card, ReplacementLayer.Other, repAb, false, true, intrinsic, "Card.Self+impended", "");
inst.addReplacement(re);
} else if (keyword.equals("Jump-start")) {
@@ -2438,7 +2448,7 @@ public class CardFactoryUtil {
re.setOverridingAbility(saCounter);
inst.addReplacement(re);
inst.addReplacement(re);
} else if (keyword.equals("Rebound")) {
String repeffstr = "Event$ Moved | ValidLKI$ Card.Self+wasCastFromHand+YouOwn+YouCtrl "
+ " | Origin$ Stack | Destination$ Graveyard | Fizzle$ False "
@@ -2729,7 +2739,7 @@ public class CardFactoryUtil {
sbRem.append(i + 1 == bCost.getCostParts().size() ? "." : " and ");
i++;
}
remTxt = sbRem.toString();
remTxt = sbRem.toString();
}
sbDesc.append(onlyMana ? " " : "—").append(bCost.toSimpleString()).append(!onlyMana ? "." : "");
sbDesc.append(" (").append(remTxt).append(")");
@@ -3988,9 +3998,6 @@ public class CardFactoryUtil {
String effect = "Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.withoutHorsemanship | Secondary$ True " +
" | Description$ Horsemanship (" + inst.getReminderText() + ")";
inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
} else if (keyword.startsWith("Impending")) {
String effect = "Mode$ Continuous | Affected$ Card.Self+counters_GE1_TIME | RemoveType$ Creature | Secondary$ True";
inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
} else if (keyword.equals("Intimidate")) {
String effect = "Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.nonArtifact+notSharesColorWith | Secondary$ True " +
" | Description$ Intimidate (" + inst.getReminderText() + ")";