From 05fa2bb7bedaf4282ef1696ef42e9cbc3b4b5b3b Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 9 Aug 2021 19:04:10 -0400 Subject: [PATCH 1/2] king_narfis_betrayal.txt v 2.0 --- forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt index 3509af6e916..0932dc5546e 100644 --- a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt +++ b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt @@ -3,8 +3,10 @@ ManaCost:1 U B Types:Enchantment Saga K:Saga:3:DBMill,DBEffect,DBEffect SVar:DBMill:DB$ Mill | NumCards$ 4 | Defined$ Player | SubAbility$ DBRepeatEach | SpellDescription$ Each player mills four cards. Then you may exile a creature or planeswalker card from each graveyard. -SVar:DBRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBExile -SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChangeNum$ 1 | Chooser$ You | SelectPrompt$ Select a creature or planeswalker | Hidden$ True +SVar:DBRepeatEach:DB$ RepeatEach | Optional$ True | OptionPrompt$ Do you want to exile a creature or planeswalker card from each graveyard? | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCard | SubAbility$ DBExile +SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChoiceZone$ Graveyard | ChoiceTitle$ Select a creature or planeswalker | Mandatory$ True | RememberChosen$ True +SVar:DBExile:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.IsRemembered +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayExile | SpellDescription$ Until end of turn, you may cast spells from among cards exiled with CARDNAME, and you may spend mana as though it were mana of any color to cast those spells. SVar:PlayExile:Mode$ Continuous | MayPlayIgnoreType$ True | MayPlayIgnoreColor$ True | MayPlay$ True | Affected$ Card.ExiledWithEffectSource | AffectedZone$ Exile | Description$ You may play cards exiled with EFFECTSOURCE, and you may spend mana as though it were mana of any color to cast those spells. DeckHas:Ability$Mill From 9c47e7fd365f3341823735415b5885f2b1b5ebb0 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 9 Aug 2021 19:04:50 -0400 Subject: [PATCH 2/2] support "Optional"/"OptionPrompt" in RepeatEachEffect --- .../java/forge/game/ability/effects/RepeatEachEffect.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java index f15c6f5991c..0853ba03dbc 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java @@ -46,6 +46,10 @@ public class RepeatEachEffect extends SpellAbilityEffect { final Player player = sa.getActivatingPlayer(); final Game game = player.getGame(); + if (sa.hasParam("Optional") && sa.hasParam("OptionPrompt") && //for now, OptionPrompt is needed + !player.getController().confirmAction(sa, null, sa.getParam("OptionPrompt"))) { + return; + } boolean useImprinted = sa.hasParam("UseImprinted");