Clean up

forge-game/src/main/java/forge/game/GameActionUtil.java

@@ -692,6 +692,7 @@ public static SpellAbility addExtraKeywordCost(final SpellAbility sa) {
 
                         if (v > 0) {
                             Card eff = createETBCountersEffect(c, host, activator, "P1P1", String.valueOf(v));
+
                             if (result == null) {
                                 result = sa.copy();
                             }
@@ -724,7 +725,6 @@ public static SpellAbility addExtraKeywordCost(final SpellAbility sa) {
     public static Card createETBCountersEffect(Card sourceCard, Card c, Player controller, String counter, String amount) {
         final Game game = sourceCard.getGame();
         final Card eff = new Card(game.nextCardId(), game);
-
         eff.setGameTimestamp(game.getNextTimestamp());
         eff.setName(sourceCard + "'s Effect");
         eff.setOwner(controller);

forge-game/src/main/java/forge/game/ability/effects/AlterAttributeEffect.java

@@ -53,7 +53,7 @@ public void resolve(SpellAbility sa) {
                     case "Solved":
                         altered = gameCard.setSolved(activate);
                         if (altered) {
-                            Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(c);
+                            Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(gameCard);
                             runParams.put(AbilityKey.Player, sa.getActivatingPlayer());
                             c.getGame().getTriggerHandler().runTrigger(TriggerType.CaseSolved, runParams, false);
                         }
@@ -104,7 +104,7 @@ public void resolve(SpellAbility sa) {
                     sa.getHostCard().addRemembered(gameCard);
                 }
             }
-            c.updateAbilityTextForView();
+            gameCard.updateAbilityTextForView();
         }
     }
 }

forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java

@@ -73,7 +73,7 @@ public void run() {
             }
 
             if (remember && gameCard.isGoaded()) {
-                sa.getHostCard().addRemembered(tgtC);
+                sa.getHostCard().addRemembered(gameCard);
             }
         }
     }

forge-gui/res/cardsfolder/b/bramble_sovereign.txt

@@ -3,5 +3,5 @@ ManaCost:2 G G
 Types:Creature Dryad
 PT:4/4
 T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature enters, you may pay {1}{G}. If you do, that creature's controller creates a token that's a copy of that creature.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 G | Defined$ TriggeredCard | Controller$ TriggeredCardController
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 G | Defined$ TriggeredCardLKICopy | Controller$ TriggeredCardController
 Oracle:Whenever another nontoken creature enters, you may pay {1}{G}. If you do, that creature's controller creates a token that's a copy of that creature.

forge-gui/res/cardsfolder/c/chronozoa.txt

@@ -5,5 +5,5 @@ PT:3/3
 K:Flying
 K:Vanishing:3
 T:Mode$ ChangesZone | ValidCard$ Card.Self+counters_EQ0_TIME | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigCopyPermanent | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, create two tokens that are copies of it.
-SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2
+SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | NumCopies$ 2
 Oracle:Flying\nVanishing 3 (This creature enters with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)\nWhen Chronozoa dies, if it had no time counters on it, create two tokens that are copies of it.

forge-gui/res/cardsfolder/g/gruff_triplets.txt

@@ -4,7 +4,7 @@ Types:Creature Satyr Warrior
 PT:3/3
 K:Trample
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+nonToken | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters, if it isn't a token, create two tokens that are copies of it.
-SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2
+SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | NumCopies$ 2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCounters | TriggerDescription$ When CARDNAME dies, put a number of +1/+1 counters equal to its power on each creature you control named Gruff Triplets.
 SVar:TrigCounters:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+namedGruff_Triplets | CounterType$ P1P1 | CounterNum$ X
 SVar:X:TriggeredCard$CardPower

forge-gui/res/cardsfolder/k/kharasha_foothills.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Mongseng
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Command | Attacked$ Player | Execute$ TrigCopy | TriggerDescription$ Whenever a creature you control attacks a player, for each other opponent, you may create a token that's a copy of that creature, tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.
 SVar:TrigCopy:DB$ RepeatEach | RepeatPlayers$ OppNonTriggeredDefender | RepeatSubAbility$ DBCopy | ChangeZoneTable$ True | SubAbility$ DelTrig
-SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ 1 | TokenAttacking$ Remembered | TokenTapped$ True | Optional$ True | ImprintTokens$ True
+SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredAttackerLKICopy | NumCopies$ 1 | TokenAttacking$ Remembered | TokenTapped$ True | Optional$ True | ImprintTokens$ True
 # The DelayedTrigger is for all player, not just for each attacking, so can't use AtEOT there
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ ImprintedLKI | TriggerDescription$ At the beginning of the next end step, exile those tokens. | SubAbility$ DBCleanup
 SVar:TrigExile:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Exile

forge-gui/res/cardsfolder/m/mirror_march.txt

@@ -3,7 +3,7 @@ ManaCost:5 R
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigFlipACoin | TriggerDescription$ Whenever a nontoken creature you control enters, flip a coin until you lose a flip. For each flip you won, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.
 SVar:TrigFlipACoin:DB$ FlipACoin | FlipUntilYouLose$ True | SaveNumFlipsToSVar$ MirrorAmount | LoseSubAbility$ DBCopies
-SVar:DBCopies:DB$ CopyPermanent | PumpKeywords$ Haste | AtEOT$ Exile | Defined$ TriggeredCard | NumCopies$ MirrorAmount
+SVar:DBCopies:DB$ CopyPermanent | PumpKeywords$ Haste | AtEOT$ Exile | Defined$ TriggeredCardLKICopy | NumCopies$ MirrorAmount
 SVar:MirrorAmount:Number$0
 DeckHas:Ability$Token
 Oracle:Whenever a nontoken creature you control enters, flip a coin until you lose a flip. For each flip you won, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.

forge-gui/res/cardsfolder/m/mirrorworks.txt

@@ -2,5 +2,5 @@ Name:Mirrorworks
 ManaCost:5
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Artifact.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken artifact you control enters, you may pay {2}. If you do, create a token that's a copy of that artifact.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 | Defined$ TriggeredCard
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 | Defined$ TriggeredCardLKICopy
 Oracle:Whenever another nontoken artifact you control enters, you may pay {2}. If you do, create a token that's a copy of that artifact.

forge-gui/res/cardsfolder/n/nacatl_war_pride.txt

@@ -4,7 +4,7 @@ Types:Creature Cat Warrior
 PT:3/3
 K:CARDNAME must be blocked by exactly one creature if able.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopyPermanent | TriggerDescription$ Whenever CARDNAME attacks, create X tokens that are copies of CARDNAME and that are tapped and attacking, where X is the number of creatures defending player controls. Exile the tokens at the beginning of the next end step.
-SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ X | TokenTapped$ True | TokenAttacking$ True | AtEOT$ Exile
+SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredAttackerLKICopy | NumCopies$ X | TokenTapped$ True | TokenAttacking$ True | AtEOT$ Exile
 SVar:X:Count$Valid Creature.DefenderCtrl
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token

forge-gui/res/cardsfolder/r/replication_specialist.txt

@@ -4,7 +4,7 @@ Types:Creature Moonfolk Artificer
 PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken artifact you control enters, you may pay {1}{U}. If you do, create a token that's a copy of that artifact.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 U | Defined$ TriggeredCard
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 U | Defined$ TriggeredCardLKICopy
 DeckHas:Ability$Token
 DeckNeeds:Type$Artifact
 Oracle:Flying\nWhenever a nontoken artifact you control enters, you may pay {1}{U}. If you do, create a token that's a copy of that artifact.

forge-gui/res/cardsfolder/r/riku_of_two_reflections.txt

@@ -5,5 +5,5 @@ PT:2/2
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopySpell | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy.
 T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that's a copy of that creature.
 SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ U R | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ G U | Defined$ TriggeredCard
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ G U | Defined$ TriggeredCardLKICopy
 Oracle:Whenever you cast an instant or sorcery spell, you may pay {U}{R}. If you do, copy that spell. You may choose new targets for the copy.\nWhenever another nontoken creature you control enters, you may pay {G}{U}. If you do, create a token that's a copy of that creature.

forge-gui/res/cardsfolder/s/skitterbeam_battalion.txt

@@ -6,7 +6,7 @@ K:Trample
 K:Haste
 K:Prototype:3 R R:2:2
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+wasCastByYou | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters, if you cast it, create two tokens that are copies of it.
-SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2
+SVar:TrigToken:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | NumCopies$ 2
 DeckHas:Ability$Token
 DeckHints:Color$Red
 Oracle:Prototype {3}{R}{R} — 2/2 (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)\nTrample, haste\nWhen Skitterbeam Battalion enters, if you cast it, create two tokens that are copies of it.

forge-gui/res/cardsfolder/s/skyclave_relic.txt

@@ -4,7 +4,7 @@ Types:Artifact
 K:Kicker:3
 K:Indestructible
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigCopyPermanent | TriggerDescription$ When CARDNAME enters, if it was kicked, create two tapped tokens that are copies of CARDNAME.
-SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredCard | NumCopies$ 2 | TokenTapped$ True
+SVar:TrigCopyPermanent:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | NumCopies$ 2 | TokenTapped$ True
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHas:Ability$Token
 Oracle:Kicker {3}\nIndestructible\nWhen Skyclave Relic enters, if it was kicked, create two tapped tokens that are copies of Skyclave Relic.\n{T}: Add one mana of any color.

forge-gui/res/cardsfolder/v/vaultborn_tyrant.txt

@@ -7,6 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+!token | Execute$ DBCopy | TriggerDescription$ When CARDNAME dies, if it's not a token, create a token that's a copy of it, except it's an artifact in addition to its other types.
-SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredCard | AddTypes$ Artifact
+SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | AddTypes$ Artifact
 DeckHas:Ability$Token & Type$Artifact
 Oracle:Trample\nWhenever Vaultborn Tyrant or another creature you control with power 4 or greater enters, you gain 3 life and draw a card.\nWhen Vaultborn Tyrant dies, if it's not a token, create a token that's a copy of it, except it's an artifact in addition to its other types.