From 610488bc22fc19afd10e6d1fc33250a8ff139e30 Mon Sep 17 00:00:00 2001 From: Jetz Date: Fri, 23 Aug 2024 18:55:52 -0400 Subject: [PATCH] include components for RememberTargets --- .../src/main/java/forge/game/ability/AbilityUtils.java | 5 +++++ forge-gui/res/cardsfolder/y/youre_in_command.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index c5ff9a72f14..86d67ab29b5 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -1541,6 +1541,11 @@ public class AbilityUtils { host.clearRemembered(); } host.addRemembered(sa.getTargets()); + if (sa.hasParam("IncludeAllComponentCards")) { + for (Card c : sa.getTargets().getTargetCards()) { + host.addRemembered(c.getAllComponentCards(false)); + } + } } if (sa.hasParam("RememberCostMana")) { diff --git a/forge-gui/res/cardsfolder/y/youre_in_command.txt b/forge-gui/res/cardsfolder/y/youre_in_command.txt index 1646177ec44..a7549b3907a 100644 --- a/forge-gui/res/cardsfolder/y/youre_in_command.txt +++ b/forge-gui/res/cardsfolder/y/youre_in_command.txt @@ -1,7 +1,7 @@ Name:You're in Command ManaCost:1 W Types:Sorcery -A:SP$ AlterAttribute | ValidTgts$ Creature.YouOwn+YouCtrl | IncludeAllComponentCards$ True | Attributes$ Commander | RememberAltered$ True | SubAbility$ DBDemote | SpellDescription$ Choose target creature you own and control. That creature becomes your commander. Any other commanders you have are no longer your commander. (That creature starts with a commander tax of {0}.) +A:SP$ AlterAttribute | ValidTgts$ Creature.YouOwn+YouCtrl | IncludeAllComponentCards$ True | Attributes$ Commander | RememberTargets$ True | SubAbility$ DBDemote | SpellDescription$ Choose target creature you own and control. That creature becomes your commander. Any other commanders you have are no longer your commander. (That creature starts with a commander tax of {0}.) SVar:DBDemote:DB$ AlterAttribute | Defined$ ValidAll Card.YouOwn+IsNotRemembered+IsCommander | Attributes$ Commander | Activate$ False | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:Choose target creature you own and control. That creature becomes your commander. Any other commanders you have are no longer your commander. (That creature starts with a commander tax of {0}.) \ No newline at end of file