external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Doomsday Confluence asking for X twice (#5071)

Browse Source
This commit is contained in:
tool4ever
2024-04-19 18:45:39 +02:00
committed by GitHub
parent 8769ad693b
commit 1587c95ca1
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
View File

@@ -237,7 +237,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
dontRevealToOwner = false; dontRevealToOwner = false;
} else { } else {
String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : Localizer.getInstance().getMessage("lblChooseaCard") + " "; String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : Localizer.getInstance().getMessage("lblChooseaCard") + " ";
if (sa.hasParam ("ChoiceTitleAppend")) { if (sa.hasParam("ChoiceTitleAppend")) {
String tag = ""; String tag = "";
String value = sa.getParam("ChoiceTitleAppend"); String value = sa.getParam("ChoiceTitleAppend");
if (value.startsWith("Defined ")) { if (value.startsWith("Defined ")) {

2
forge-gui/res/cardsfolder/r/romana_ii.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 W
Types:Legendary Creature Time Lord Scientist Types:Legendary Creature Time Lord Scientist
PT:3/3 PT:3/3
K:Vigilance 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 K:Doctor's companion
DeckHas:Ability$Token DeckHas:Ability$Token
DeckNeeds:Ability$Token DeckNeeds:Ability$Token

2
forge-gui/res/cardsfolder/s/spel_stutter.txt → forge-gui/res/cardsfolder/s/spell_stutter.txt
View File

@@ -1,7 +1,7 @@
Name:Spell Stutter Name:Spell Stutter
ManaCost:1 U ManaCost:1 U
Types:Instant 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 SVar:Y:Count$Valid Faerie.YouCtrl/Plus.2
DeckHints:Type$Faerie DeckHints:Type$Faerie
Oracle:Counter target spell unless its controller pays {2} plus an additional {1} for each Faerie you control. Oracle:Counter target spell unless its controller pays {2} plus an additional {1} for each Faerie you control.

2
forge-gui/res/cardsfolder/upcoming/byrke_long_ear_of_the_law.txt
View File

@@ -5,7 +5,7 @@ PT:4/4
K:Vigilance 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. 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 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 SVar:TrigDoubleCounters:DB$ MultiplyCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1
DeckHas:Ability$Counters DeckHas:Ability$Counters
DeckHints:Ability$Counters DeckHints:Ability$Counters

3
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -77,7 +77,6 @@ public class HumanPlaySpellAbility {
game.clearTopLibsCast(ability); game.clearTopLibsCast(ability);
return false; return false;
} }
needX = false;
} }
if (!CharmEffect.makeChoices(ability)) { if (!CharmEffect.makeChoices(ability)) {
game.clearTopLibsCast(ability); game.clearTopLibsCast(ability);
@@ -236,7 +235,7 @@ public class HumanPlaySpellAbility {
// Announcing Requirements like Choosing X or Multikicker // Announcing Requirements like Choosing X or Multikicker
// SA Params as comma delimited list // SA Params as comma delimited list
final String announce = ability.getParam("Announce"); final String announce = ability.getParam("Announce");
if (announce != null) { if (announce != null && needX) {
for (final String aVar : announce.split(",")) { for (final String aVar : announce.split(",")) {
final String varName = aVar.trim(); final String varName = aVar.trim();