From 29b571f153ddfefcb80df5e3ca40a4b80ba6951b Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 13 Nov 2022 22:16:59 +0100 Subject: [PATCH] Fix for zone changes --- .../src/main/java/forge/game/trigger/WrappedAbility.java | 4 +++- forge-gui/res/cardsfolder/o/ochre_jelly.txt | 4 ++-- forge-gui/res/cardsfolder/p/preyseizer_dragon.txt | 2 +- forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/thopter_mechanic.txt | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java index ac6dbc662c1..9b23d6fd23b 100644 --- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java +++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java @@ -62,7 +62,9 @@ public class WrappedAbility extends Ability { ApiType.Token, ApiType.SetState, ApiType.Play, - ApiType.SacrificeAll + ApiType.SacrificeAll, + + ApiType.DelayedTrigger ); private final SpellAbility sa; diff --git a/forge-gui/res/cardsfolder/o/ochre_jelly.txt b/forge-gui/res/cardsfolder/o/ochre_jelly.txt index ddb70720f0c..9277b57cf3b 100644 --- a/forge-gui/res/cardsfolder/o/ochre_jelly.txt +++ b/forge-gui/res/cardsfolder/o/ochre_jelly.txt @@ -6,8 +6,8 @@ K:Trample K:etbCounter:P1P1:X SVar:X:Count$xPaid T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_GE2_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDelayTrigger | TriggerDescription$ Split — When CARDNAME dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down. -SVar:TrigDelayTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | RememberObjects$ TriggeredCardLKICopy | CopyTriggeringObjects$ True | Execute$ TrigCopy | TriggerDescription$ Create a token that's a copy of it at the beginning of the next end step. That token enters the battlefield with half that many +1/+1 counters on it, rounded down. +SVar:TrigDelayTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | RememberObjects$ TriggeredCardLKICopy | Execute$ TrigCopy | TriggerDescription$ Create a token that's a copy of it at the beginning of the next end step. That token enters the battlefield with half that many +1/+1 counters on it, rounded down. SVar:TrigCopy:DB$ CopyPermanent | Defined$ DelayTriggerRememberedLKI | WithCountersType$ P1P1 | WithCountersAmount$ Y -SVar:Y:TriggeredCard$CardCounters.P1P1/HalfDown +SVar:Y:TriggerRemembered$CardCounters.P1P1/HalfDown DeckHas:Ability$Counters|Token Oracle:Trample\nOchre Jelly enters the battlefield with X +1/+1 counters on it.\nSplit — When Ochre Jelly dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down. diff --git a/forge-gui/res/cardsfolder/p/preyseizer_dragon.txt b/forge-gui/res/cardsfolder/p/preyseizer_dragon.txt index 37b9901096f..80fdf309be4 100644 --- a/forge-gui/res/cardsfolder/p/preyseizer_dragon.txt +++ b/forge-gui/res/cardsfolder/p/preyseizer_dragon.txt @@ -4,7 +4,7 @@ Types:Creature Dragon PT:4/4 K:Flying K:Devour:2 -T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage to any target equal to the number of +1/+1 counters on CARDNAME. +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage to any target equal to the number of +1/+1 counters on CARDNAME. SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X SVar:X:Count$CardCounters.P1P1 Oracle:Flying\nDevour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.)\nWhenever Preyseizer Dragon attacks, it deals damage to any target equal to the number of +1/+1 counters on Preyseizer Dragon. diff --git a/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt b/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt index 717e43c381d..6938cc57193 100644 --- a/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt +++ b/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt @@ -7,8 +7,8 @@ K:Ward:2 K:etbCounter:P1P1:X SVar:X:Count$xPaid T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_GE2_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDelayTrigger | TriggerDescription$ Split — When CARDNAME dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down. -SVar:TrigDelayTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | RememberObjects$ TriggeredCardLKICopy | CopyTriggeringObjects$ True | Execute$ TrigCopy | TriggerDescription$ Create a token that's a copy of it at the beginning of the next end step. That token enters the battlefield with half that many +1/+1 counters on it, rounded down. +SVar:TrigDelayTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | RememberObjects$ TriggeredCardLKICopy | Execute$ TrigCopy | TriggerDescription$ Create a token that's a copy of it at the beginning of the next end step. That token enters the battlefield with half that many +1/+1 counters on it, rounded down. SVar:TrigCopy:DB$ CopyPermanent | Defined$ DelayTriggerRememberedLKI | WithCountersType$ P1P1 | WithCountersAmount$ Y -SVar:Y:TriggeredCard$CardCounters.P1P1/HalfDown +SVar:Y:TriggerRemembered$CardCounters.P1P1/HalfDown DeckHas:Ability$Counters|Token Oracle:Trample\nWard {2}\nOchre Jelly enters the battlefield with X +1/+1 counters on it.\nSplit — When Ochre Jelly dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down. diff --git a/forge-gui/res/cardsfolder/upcoming/thopter_mechanic.txt b/forge-gui/res/cardsfolder/upcoming/thopter_mechanic.txt index b0c005dae2e..8d7e2ea0e71 100644 --- a/forge-gui/res/cardsfolder/upcoming/thopter_mechanic.txt +++ b/forge-gui/res/cardsfolder/upcoming/thopter_mechanic.txt @@ -4,7 +4,7 @@ Types:Creature Human Artificer PT:2/1 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw your second card each turn, put a +1/+1 counter on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | Defined$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Thopter artifact creature token with flying. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 1/1 colorless Thopter artifact creature token with flying. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_thopter_flying DeckHas:Ability$Token|Counters & Type$Thopter Oracle:Whenever you draw your second card each turn, put a +1/+1 counter on Thopter Mechanic.\nWhen Thopter Mechanic dies, create a 1/1 colorless Thopter artifact creature token with flying. \ No newline at end of file