diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java index c174343b171..010104e4868 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -89,7 +89,7 @@ public class TriggerAttackersDeclared extends Trigger { /** {@inheritDoc} */ @Override public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { - sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attackers, AbilityKey.AttackingPlayer); + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attackers, AbilityKey.AttackingPlayer, AbilityKey.AttackedTarget); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java index c48e2693b29..742bf9b7e63 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java @@ -68,6 +68,13 @@ public class TriggerDrawn extends Trigger { } } + if (hasParam("ValidPlayer")) { + if (!matchesValid(runParams.get(AbilityKey.Player), getParam("ValidPlayer").split(","), + this.getHostCard())) { + return false; + } + } + if (hasParam("Number")) { if (number != Integer.parseInt(getParam("Number"))) { return false; diff --git a/forge-gui/res/cardsfolder/upcoming/chandras_incinerator.txt b/forge-gui/res/cardsfolder/upcoming/chandras_incinerator.txt index cbe373ca8ac..4686d9b1230 100644 --- a/forge-gui/res/cardsfolder/upcoming/chandras_incinerator.txt +++ b/forge-gui/res/cardsfolder/upcoming/chandras_incinerator.txt @@ -2,7 +2,7 @@ Name:Chandra's Incinerator ManaCost:5 R Types:Creature Elemental PT:6/6 -S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | References$ X | EffectZone$ All | Description$ CARDNAME costs {X} less to cast, where X is the total amount of noncombat damage dealt to your opponents this turn. +S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | References$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the total amount of noncombat damage dealt to your opponents this turn. SVar:X:PlayerCountOpponents$NonCombatDamageDealtThisTurn K:Trample T:Mode$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Opponent | CombatDamage$ False | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever a source you control deals noncombat damage to an opponent, CARDNAME deals that much damage to target creature or planeswalker that player controls. diff --git a/forge-gui/res/cardsfolder/upcoming/zurzoth_chaos_rider.txt b/forge-gui/res/cardsfolder/upcoming/zurzoth_chaos_rider.txt new file mode 100644 index 00000000000..8e82c2cf193 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/zurzoth_chaos_rider.txt @@ -0,0 +1,10 @@ +Name:Zurzoth, Chaos Rider +ManaCost:2 R +Types:Legendary Creature Devil +PT:2/3 +T:Mode$ Drawn | ValidPlayer$ Player.Opponent+NonActive | Number$ 1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent draws their first card each turn, if it's not their turn, you create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target." +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_devil_burn | TokenOwner$ You | LegacyImage$ r 1 1 devil burn jmp +T:Mode$ AttackersDeclared | ValidAttackers$ Devil.YouCtrl | AttackedTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever one or more Devils you control attack one or more players, you and those players each draw a card, then discard a card at random. +SVar:TrigDraw:DB$ Draw | Defined$ TriggeredAttackedTargetAndYou | NumCards$ 1 | SubAbility$ DBDiscard +SVar:DBDiscard:DB$ Discard | Defined$ TriggeredAttackedTargetAndYou | NumCards$ 1 | Mode$ Random +Oracle:Whenever an opponent draws their first card each turn, if it's not their turn, you create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target."\nWhenever one or more Devils you control attack one or more players, you and those players each draw a card, then discard a card at random.