diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java index e9a597697c1..5f95d0c4dd8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java @@ -42,7 +42,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect { } final SpellAbility fallback = sa.getAdditionalAbility("FallbackAbility"); final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("ChoiceAmount", "1"), sa); - + final List tgtPlayers = getDefinedPlayersOrTargeted(sa); for (final Player p : tgtPlayers) { @@ -61,7 +61,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect { } } abilities.removeAll(saToRemove); - + if (sa.usesTargeting() && sa.getTargets().contains(p) && !p.canBeTargetedBy(sa)) { continue; } diff --git a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt index af85918e41e..9abf5789f33 100644 --- a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt +++ b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt @@ -5,7 +5,7 @@ PT:6/6 K:Flying K:ETBReplacement:Other:ChooseEach SVar:ChooseEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoice | SubAbility$ DBRemember | ClearRememberedBeforeLoop$ True | SpellDescription$ As CARDNAME enters the battlefield, each player chooses war or peace. Creatures controlled by players who chose war get +3/+0. Creatures controlled by players who chose peace get +0/+3. -SVar:DBChoice:DB$ GenericChoice | Defined$ Player.IsRemembered | Choices$ WarChoice,PeaceChoice +SVar:DBChoice:DB$ GenericChoice | Defined$ Player.IsRemembered | Choices$ WarChoice,PeaceChoice | ShowChoice$ ExceptSelf SVar:WarChoice:DB$ Pump | Defined$ Player.IsRemembered | NoteCards$ Self | NoteCardsFor$ Strife | SpellDescription$ War SVar:PeaceChoice:DB$ Pump | Defined$ Player.IsRemembered | ClearNotedCardsFor$ Strife | SpellDescription$ Peace SVar:DBRemember:DB$ Pump | RememberObjects$ Player.NotedForStrife | ImprintCards$ Self