From 14291e6a4f7971af94218c79aa8aa6932f6ea94d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Nov 2024 19:36:00 -0500 Subject: [PATCH] YDSK: valiant_emberkin.txt + support --- .../game/staticability/StaticAbilityPanharmonicon.java | 10 +++++++++- forge-gui/res/cardsfolder/v/valiant_emberkin.txt | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/v/valiant_emberkin.txt diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java index 1b4bc16c7f4..677c61b3e98 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPanharmonicon.java @@ -161,7 +161,15 @@ public class StaticAbilityPanharmonicon { if (!stAb.matchesValidParam("ValidActivator", sa.getActivatingPlayer())) { return false; } - } else if (trigMode.equals(TriggerType.DamageDone) || trigMode.equals(TriggerType.DamageDoneOnce) + } else if (trigMode.equals(TriggerType.BecomesTarget)) { + if (!stAb.matchesValidParam("ValidTarget", runParams.get(AbilityKey.Target))) { + return false; + } + } else if (trigMode.equals(TriggerType.BecomesTargetOnce)) { + if (!stAb.matchesValidParam("ValidTarget", runParams.get(AbilityKey.Targets))) { + return false; + } + } else if (trigMode.equals(TriggerType.DamageDone) || trigMode.equals(TriggerType.DamageDoneOnce) || trigMode.equals(TriggerType.DamageAll) || trigMode.equals(TriggerType.DamageDealtOnce)) { if (stAb.hasParam("CombatDamage") && stAb.getParam("CombatDamage").equalsIgnoreCase("True") != (Boolean) runParams.get(AbilityKey.IsCombatDamage)) { diff --git a/forge-gui/res/cardsfolder/v/valiant_emberkin.txt b/forge-gui/res/cardsfolder/v/valiant_emberkin.txt new file mode 100644 index 00000000000..61ef65bf8c4 --- /dev/null +++ b/forge-gui/res/cardsfolder/v/valiant_emberkin.txt @@ -0,0 +1,10 @@ +Name:Valiant Emberkin +ManaCost:1 R W +Types:Enchantment Creature Mouse Glimmer +PT:1/1 +K:Haste +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME enters or attacks, target creature you control perpetually gets +1/+0. +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, target creature you control perpetually gets +1/+0. +SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ 1 | Duration$ Perpetual +S:Mode$ Panharmonicon | ValidMode$ BecomesTarget,BecomesTargetOnce | ValidCard$ Permanent.YouCtrl | ValidTarget$ Creature.YouCtrl | Description$ If a creature you control becoming the target of a spell or ability causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time. +Oracle:Haste\Whenever Valiant Emberkin enters or attacks, target creature you control perpetually gets +1/+0.\nIf a creature you control becoming the target of a spell or ability causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.