From a54513e53d723a9797e23601015ced8c338c0fc6 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Mon, 15 May 2023 17:08:45 +0200
Subject: [PATCH] Fix extrinsic Jump-start not exiling

---
 forge-game/src/main/java/forge/game/GameAction.java    |  1 +
 .../i/invasion_of_fiora_marchesa_resolute_monarch.txt  |  2 +-
 forge-gui/res/cardsfolder/l/lorehold_command.txt       | 10 +++++-----
 forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt     |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 4ecb72a7584..01925daa050 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -264,6 +264,7 @@ public class GameAction {
 
             if (zoneTo.is(ZoneType.Stack)) {
                 // try not to copy changed stats when moving to stack
+                copied.setChangedCardKeywords(c.getChangedCardKeywords());
 
                 // copy exiled properties when adding to stack
                 // will be cleanup later in MagicStack
diff --git a/forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt b/forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt
index 29014d1491c..bea3c7f53cd 100644
--- a/forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt
+++ b/forge-gui/res/cardsfolder/i/invasion_of_fiora_marchesa_resolute_monarch.txt
@@ -19,7 +19,7 @@ PT:3/6
 K:Menace
 K:Deathtouch
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever CARDNAME attacks, remove all counters from up to one target permanent.
-SVar:TrigRemoveCounter:DB$ RemoveCounter | ValidTgts$ Permanent | CounterType$ All | CounterNum$ All
+SVar:TrigRemoveCounter:DB$ RemoveCounter | ValidTgts$ Permanent | TargetMin$ 0 | TargetMax$ 1 | CounterType$ All | CounterNum$ All
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ0 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, if you haven't been dealt combat damage since your last turn, you draw a card and you lose 1 life.
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
diff --git a/forge-gui/res/cardsfolder/l/lorehold_command.txt b/forge-gui/res/cardsfolder/l/lorehold_command.txt
index e4b007264a7..73574b42718 100644
--- a/forge-gui/res/cardsfolder/l/lorehold_command.txt
+++ b/forge-gui/res/cardsfolder/l/lorehold_command.txt
@@ -3,10 +3,10 @@ ManaCost:3 W R
 Types:Instant
 A:SP$ Charm | Cost$ 3 W R | Choices$ DBSpirit,DBIndestructible,DBHelix,DBSacrifice | CharmNum$ 2
 SVar:DBSpirit:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_3_2_spirit | TokenOwner$ You | SpellDescription$ Create a 3/2 red and white Spirit token.
-SVar:DBIndestructible:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Indestructible & haste | SpellDescription$ • Creatures you control get +1/+0 and gain indestructible and haste until end of turn.
-SVar:DBHelix:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ • CARDNAME deals 3 damage to any target. Target player gains 3 life.
-SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player (to gain 3 life) | LifeAmount$ 3 | SpellDescription$ Target player gains 3 life.
-SVar:DBSacrifice:DB$ Sacrifice | Defined$ You | SacValid$ Permanent | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ 2 | SpellDescription$ Sacrifice a permanent,draw two cards.
+SVar:DBIndestructible:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Indestructible & Haste | SpellDescription$ Creatures you control get +1/+0 and gain indestructible and haste until end of turn.
+SVar:DBHelix:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to any target. Target player gains 3 life.
+SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player (to gain 3 life) | LifeAmount$ 3
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ You | SacValid$ Permanent | SpellDescription$ Sacrifice a permanent, then draw two cards. | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 2
 DeckHas:Ability$Token|LifeGain
 Oracle:Choose two —\n• Create a 3/2 red and white Spirit creature token.\n• Creatures you control get +1/+0 and gain indestructible and haste until end of turn.\n• Lorehold Command deals 3 damage to any target. Target player gains 3 life.\n• Sacrifice a permanent, then draw two cards.
diff --git a/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt b/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
index f3077bfb5b1..91b85c4c69f 100644
--- a/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
+++ b/forge-gui/res/cardsfolder/r/radha_heir_to_keld.txt
@@ -3,6 +3,6 @@ ManaCost:R G
 Types:Legendary Creature Elf Warrior
 PT:2/2
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add R R.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add {R}{R}.
 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 2 | SpellDescription$ Add {R}{R}.
 Oracle:Whenever Radha, Heir to Keld attacks, you may add {R}{R}.\n{T}: Add {G}.