From 1a1bd6077b09be34b8bfed7aee71a277cd67431f Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Wed, 3 Mar 2021 03:50:17 +0000 Subject: [PATCH] Fix Akiri multiplayer --- .../src/main/java/forge/game/trigger/TriggerHandler.java | 4 ++++ forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt | 3 ++- forge-gui/res/cardsfolder/z/zurzoth_chaos_rider.txt | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 07b71db7a04..295c17c52d2 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -570,6 +570,10 @@ public class TriggerHandler { host.addRemembered(triggeredCard); } + if (regtrig.hasParam("RememberKey")) { + host.addRemembered(runParams.get(AbilityKey.fromString(regtrig.getParam("RememberKey")))); + } + sa.setStackDescription(sa.toString()); if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) { if (!CharmEffect.makeChoices(sa)) { diff --git a/forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt b/forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt index d03cda57991..f4fe2d7129a 100755 --- a/forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt +++ b/forge-gui/res/cardsfolder/a/akiri_fearless_voyager.txt @@ -2,8 +2,9 @@ Name:Akiri, Fearless Voyager ManaCost:1 R W Types:Legendary Creature Kor Warrior PT:3/3 -T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl+equipped | AttackedTarget$ Player | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player with one or more equipped creatures, draw a card. +T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+equipped | Attacked$ Player.IsNotRemembered | RememberKey$ DefendingPlayer | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player with one or more equipped creatures, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 +T:Mode$ Phase | Phase$ Declare Attackers | Static$ True | Execute$ DBCleanup A:AB$ ChooseCard | Cost$ W | Defined$ You | Choices$ Creature.YouCtrl+equipped | ChoiceTitle$ Choose an equipped creature you control | RememberChosen$ True | SubAbility$ DBChooseEquip | StackDescription$ SpellDescription | SpellDescription$ You may unattach an Equipment from a creature you control. If you do, tap that creature and it gains indestructible until end of turn. SVar:DBChooseEquip:DB$ ChooseCard | Defined$ You | Choices$ Equipment.AttachedTo Creature.IsRemembered | ChoiceTitle$ You may choose an Equipment to unattach from that creature | SubAbility$ DBUnattach SVar:DBUnattach:DB$ Unattach | Defined$ ChosenCard | SubAbility$ DBTap | StackDescription$ None diff --git a/forge-gui/res/cardsfolder/z/zurzoth_chaos_rider.txt b/forge-gui/res/cardsfolder/z/zurzoth_chaos_rider.txt index 60292b5ef20..19d12a1513f 100644 --- a/forge-gui/res/cardsfolder/z/zurzoth_chaos_rider.txt +++ b/forge-gui/res/cardsfolder/z/zurzoth_chaos_rider.txt @@ -4,8 +4,10 @@ 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. +T:Mode$ Attacks | ValidCards$ Devil.YouCtrl | Attacked$ Player.IsNotRemembered | RememberKey$ DefendingPlayer | 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 +T:Mode$ Phase | Phase$ Declare Attackers | Static$ True | Execute$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True DeckHas:Ability$Token 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.