From fee0fdf600394c4d2946ea63f7ed78f51bd8b046 Mon Sep 17 00:00:00 2001
From: Chase Hinesman <chasehinesman@gmail.com>
Date: Sat, 7 Mar 2026 21:09:00 -0600
Subject: [PATCH 1/2] Retain galvanize when using Argent Hero

---
 src/main/java/ti4/helpers/ButtonHelperHeroes.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ti4/helpers/ButtonHelperHeroes.java b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
index d2add84c93..b06d7bca21 100644
--- a/src/main/java/ti4/helpers/ButtonHelperHeroes.java
+++ b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
@@ -242,8 +242,8 @@ public static void argentHeroStep4(Game game, Player player, ButtonInteractionEv
             unitName = unitName.replace("damaged", "");
         }
         destination = FlipTileService.flipTileIfNeeded(event, destination, game);
-        RemoveUnitService.removeUnits(event, origin, game, player.getColor(), unitName + " " + unitHolderName);
-        AddUnitService.addUnits(event, destination, game, player.getColor(), unitName);
+        var removed = RemoveUnitService.removeUnits(event, origin, game, player.getColor(), unitName + " " + unitHolderName);
+        AddUnitService.addUnits(event, destination, game, player.getColor(), unitName, removed);
         List<Button> buttons = getArgentHeroStep3Buttons(game, player, buttonID);
         String msg2 = player.getFactionEmoji() + " moved 1 " + unitName + " from "
                 + origin.getRepresentationForButtons(game, player) + " to "

From e1074a7da5432406cca9f5736a27becb3f93c865 Mon Sep 17 00:00:00 2001
From: Chase Hinesman <chasehinesman@gmail.com>
Date: Sat, 7 Mar 2026 21:15:02 -0600
Subject: [PATCH 2/2] Fix spotless and remove now-unnecessary code

---
 src/main/java/ti4/helpers/ButtonHelperHeroes.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ti4/helpers/ButtonHelperHeroes.java b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
index b06d7bca21..fb47764b19 100644
--- a/src/main/java/ti4/helpers/ButtonHelperHeroes.java
+++ b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
@@ -242,24 +242,13 @@ public static void argentHeroStep4(Game game, Player player, ButtonInteractionEv
             unitName = unitName.replace("damaged", "");
         }
         destination = FlipTileService.flipTileIfNeeded(event, destination, game);
-        var removed = RemoveUnitService.removeUnits(event, origin, game, player.getColor(), unitName + " " + unitHolderName);
+        var removed = RemoveUnitService.removeUnits(
+                event, origin, game, player.getColor(), unitName + " " + unitHolderName, damaged);
         AddUnitService.addUnits(event, destination, game, player.getColor(), unitName, removed);
         List<Button> buttons = getArgentHeroStep3Buttons(game, player, buttonID);
         String msg2 = player.getFactionEmoji() + " moved 1 " + unitName + " from "
                 + origin.getRepresentationForButtons(game, player) + " to "
                 + destination.getRepresentationForButtons(game, player);
-        if (damaged) {
-            origin.getUnitHolders()
-                    .get(unitHolderName)
-                    .removeDamagedUnit(Mapper.getUnitKey(AliasHandler.resolveUnit(unitName), player.getColorID()), 1);
-            destination
-                    .getUnitHolders()
-                    .get("space")
-                    .addDamagedUnit(Mapper.getUnitKey(AliasHandler.resolveUnit(unitName), player.getColorID()), 1);
-            msg2 = player.getFactionEmoji() + " moved 1 damaged " + unitName + " from "
-                    + origin.getRepresentationForButtons(game, player) + " to "
-                    + destination.getRepresentationForButtons(game, player);
-        }
 
         MessageHelper.sendMessageToChannel(event.getMessageChannel(), msg2);
         String msg =