From 021bd2c16bce22bf794ba4fa46a07f8c416a33f6 Mon Sep 17 00:00:00 2001 From: tool4ever Date: Mon, 2 Oct 2023 11:14:48 +0200 Subject: [PATCH] LKI: fix wrong state on stack (#3843) * fix wrong state on stack * fix typo --- forge-game/src/main/java/forge/game/card/CardUtil.java | 2 +- forge-gui/res/cardsfolder/c/carnival_carnage.txt | 2 +- forge-gui/res/cardsfolder/upcoming/ruby_daring_tracker.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index fe147be0ae1..2e63d4c6073 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -229,7 +229,7 @@ public final class CardUtil { if (in.isTransformed()) { newCopy.incrementTransformedTimestamp(); } - newCopy.setState(newCopy.getFaceupCardStateName(), false, true); + newCopy.setState(in.getCurrentStateName(), false, true); if (in.isFaceDown()) { newCopy.turnFaceDownNoUpdate(); newCopy.setType(new CardType(in.getFaceDownState().getType())); diff --git a/forge-gui/res/cardsfolder/c/carnival_carnage.txt b/forge-gui/res/cardsfolder/c/carnival_carnage.txt index ad3801a0416..46ba26c7a4a 100644 --- a/forge-gui/res/cardsfolder/c/carnival_carnage.txt +++ b/forge-gui/res/cardsfolder/c/carnival_carnage.txt @@ -11,6 +11,6 @@ ALTERNATE Name:Carnage ManaCost:2 B R Types:Sorcery -A:SP$ DealDamage | Cost$ 2 B R | ValidTgts$ Player.Opponent | NumDmg$ 3 | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 3 damage to target player. That player discards two cards. +A:SP$ DealDamage | Cost$ 2 B R | ValidTgts$ Player.Opponent | NumDmg$ 3 | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 3 damage to target opponent. That player discards two cards. SVar:DBDiscard:DB$ Discard | Defined$ TargetedPlayer | NumCards$ 2 | Mode$ TgtChoose Oracle:Carnage deals 3 damage to target opponent. That player discards two cards. diff --git a/forge-gui/res/cardsfolder/upcoming/ruby_daring_tracker.txt b/forge-gui/res/cardsfolder/upcoming/ruby_daring_tracker.txt index c4dd7904efd..8a085170406 100644 --- a/forge-gui/res/cardsfolder/upcoming/ruby_daring_tracker.txt +++ b/forge-gui/res/cardsfolder/upcoming/ruby_daring_tracker.txt @@ -3,7 +3,7 @@ ManaCost:R G Types:Legendary Creature Human Scout PT:1/2 K:Haste -T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+powerGE4 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute TrigPump | TriggerDescription$ Whenever CARDNAME attacks while you control a creature with power 4 or greater, NICKNAME gets +2/+2 until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+powerGE4 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks while you control a creature with power 4 or greater, NICKNAME gets +2/+2 until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}. SVar:HasAttackEffect:TRUE