From 1587c95ca13b55359b37418c2dbf0cef143a28b5 Mon Sep 17 00:00:00 2001 From: tool4ever Date: Fri, 19 Apr 2024 18:45:39 +0200 Subject: [PATCH] Fix Doomsday Confluence asking for X twice (#5071) --- .../main/java/forge/game/ability/effects/ChooseCardEffect.java | 2 +- forge-gui/res/cardsfolder/r/romana_ii.txt | 2 +- .../res/cardsfolder/s/{spel_stutter.txt => spell_stutter.txt} | 2 +- .../res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt | 2 +- .../src/main/java/forge/player/HumanPlaySpellAbility.java | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) rename forge-gui/res/cardsfolder/s/{spel_stutter.txt => spell_stutter.txt} (63%) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java index 4c30f8c13b0..46467622807 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java @@ -237,7 +237,7 @@ public class ChooseCardEffect extends SpellAbilityEffect { dontRevealToOwner = false; } else { String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : Localizer.getInstance().getMessage("lblChooseaCard") + " "; - if (sa.hasParam ("ChoiceTitleAppend")) { + if (sa.hasParam("ChoiceTitleAppend")) { String tag = ""; String value = sa.getParam("ChoiceTitleAppend"); if (value.startsWith("Defined ")) { diff --git a/forge-gui/res/cardsfolder/r/romana_ii.txt b/forge-gui/res/cardsfolder/r/romana_ii.txt index 36341d6181f..99b0c8781b2 100644 --- a/forge-gui/res/cardsfolder/r/romana_ii.txt +++ b/forge-gui/res/cardsfolder/r/romana_ii.txt @@ -3,7 +3,7 @@ ManaCost:3 W Types:Legendary Creature Time Lord Scientist PT:3/3 K:Vigilance -A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Permanent.token+ThisTurnEntered | TgtPrompt$ Select target token that entered the battlefield this turn | TokenTapped$ True +A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Permanent.token+ThisTurnEntered | TgtPrompt$ Select target token that entered the battlefield this turn | TokenTapped$ True | SpellDescription$ Create a tapped token that's a copy of target token that entered the battlefield this turn. K:Doctor's companion DeckHas:Ability$Token DeckNeeds:Ability$Token diff --git a/forge-gui/res/cardsfolder/s/spel_stutter.txt b/forge-gui/res/cardsfolder/s/spell_stutter.txt similarity index 63% rename from forge-gui/res/cardsfolder/s/spel_stutter.txt rename to forge-gui/res/cardsfolder/s/spell_stutter.txt index 90fb4865170..4b2fdd6211c 100644 --- a/forge-gui/res/cardsfolder/s/spel_stutter.txt +++ b/forge-gui/res/cardsfolder/s/spell_stutter.txt @@ -1,7 +1,7 @@ Name:Spell Stutter ManaCost:1 U Types:Instant -A:SP$ Counter | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ Y | SpellDescription$ Counter target spell unless its controller pays {2} plus an additional {1} for each Faerie you control. +A:SP$ Counter | TargetType$ Spell | ValidTgts$ Card | UnlessCost$ Y | StackDescription$ SpellDescription | SpellDescription$ Counter target spell unless its controller pays {2} plus an additional {1} for each Faerie you control. SVar:Y:Count$Valid Faerie.YouCtrl/Plus.2 DeckHints:Type$Faerie Oracle:Counter target spell unless its controller pays {2} plus an additional {1} for each Faerie you control. diff --git a/forge-gui/res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt b/forge-gui/res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt index 61266d99964..36e8333e7a3 100644 --- a/forge-gui/res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt +++ b/forge-gui/res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt @@ -5,7 +5,7 @@ PT:4/4 K:Vigilance T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each of up to two target creatures. SVar:TrigPutCounters:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures -T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | Execute$ TrigDoubleCounters | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it attacks, double the number of +1/+1 counters on it. +T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | Execute$ TrigDoubleCounters | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it attacks, double the number of +1/+1 counters on it. SVar:TrigDoubleCounters:DB$ MultiplyCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 DeckHas:Ability$Counters DeckHints:Ability$Counters diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java index ec524c5ee98..408c7811c12 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java +++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java @@ -77,7 +77,6 @@ public class HumanPlaySpellAbility { game.clearTopLibsCast(ability); return false; } - needX = false; } if (!CharmEffect.makeChoices(ability)) { game.clearTopLibsCast(ability); @@ -236,7 +235,7 @@ public class HumanPlaySpellAbility { // Announcing Requirements like Choosing X or Multikicker // SA Params as comma delimited list final String announce = ability.getParam("Announce"); - if (announce != null) { + if (announce != null && needX) { for (final String aVar : announce.split(",")) { final String varName = aVar.trim();