From 1dcb9b00ff50d7004f993f8c210ab081e8abfc93 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 21 Apr 2022 14:10:28 -0400 Subject: [PATCH 1/2] PeekAndRevealEffect > getStackDescription() fix NPE --- .../forge/game/ability/effects/PeekAndRevealEffect.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java index ecd91e7cddd..8723fcd16e1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java @@ -32,11 +32,12 @@ public class PeekAndRevealEffect extends SpellAbilityEffect { final int numPeek = sa.hasParam("PeekAmount") ? AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("PeekAmount"), sa) : 1; - final String verb = sa.hasParam("NoReveal") ? " looks at " : " reveals "; - final String defined = sa.getParam("Defined"); + final String verb = sa.hasParam("NoReveal") || sa.hasParam("RevealOptional") ? " looks at " : + " reveals "; + final String defined = sa.getParamOrDefault("Defined", "their"); String whose; if (defined.equals("Player")) { - whose = "each player's "; + whose = "each player's"; } else { // other else ifs for specific defined can be added above as needs arise whose = Lang.joinHomogenous(getTargetPlayers(sa)); } From eb7a2a85c3513dfdacf9f293bb994da3f81e4157 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 21 Apr 2022 14:10:44 -0400 Subject: [PATCH 2/2] frost_augur.txt StackDesc --- forge-gui/res/cardsfolder/f/frost_augur.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/f/frost_augur.txt b/forge-gui/res/cardsfolder/f/frost_augur.txt index c98c3d9e1dd..46efc004589 100644 --- a/forge-gui/res/cardsfolder/f/frost_augur.txt +++ b/forge-gui/res/cardsfolder/f/frost_augur.txt @@ -3,7 +3,7 @@ ManaCost:U Types:Snow Creature Human Wizard PT:1/2 A:AB$ PeekAndReveal | Cost$ S T | PeekAmount$ 1 | RevealValid$ Snow | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBChangeZone | SpellDescription$ Look at the top card of your library. If it's a snow card, you may reveal it and put it into your hand. -SVar:DBChangeZone:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Snow | ConditionCompare$ EQ1 | SubAbility$ DBCleanup +SVar:DBChangeZone:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Snow | ConditionCompare$ EQ1 | SubAbility$ DBCleanup | StackDescription$ If it's a snow card, {p:You} may reveal it and put it into their hand. SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True DeckNeeds:Type$Snow Oracle:{S}, {T}: Look at the top card of your library. If it's a snow card, you may reveal it and put it into your hand. ({S} can be paid with one mana from a snow source.)