From bdb43026fb585e0da4e37c1614f6ffaa0dfdd17c Mon Sep 17 00:00:00 2001 From: Tim Mocny Date: Wed, 16 Mar 2022 15:00:09 +0000 Subject: [PATCH] ChangeZoneEffect changeHiddenOriginStackDescription tweaks --- .../java/forge/game/ability/effects/ChangeZoneEffect.java | 5 +++-- forge-gui/res/cardsfolder/b/basris_aegis.txt | 4 ++-- forge-gui/res/cardsfolder/w/wargate.txt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index 664d4ff960f..f5773dcd227 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -160,8 +160,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect { sb.append(chooserNames); sb.append(" search").append(choosers.size() > 1 ? " " : "es "); sb.append(fetchPlayer).append(fetchPlayer.equals(chooserNames) ? "'s " : " "); - sb.append("library for ").append(Lang.nounWithNumeralExceptOne(num, type + " card")).append(", "); - if (!sa.hasParam("NoReveal")) { + final String cardTag = type.contains("card") ? "" : " card"; + sb.append("library for ").append(Lang.nounWithNumeralExceptOne(num, type + cardTag)).append(", "); + if (!sa.hasParam("NoReveal") || !destination.equals("Battlefield")) { if (choosers.size() == 1) { sb.append(num > 1 ? "reveals them, " : "reveals it, "); } else { diff --git a/forge-gui/res/cardsfolder/b/basris_aegis.txt b/forge-gui/res/cardsfolder/b/basris_aegis.txt index 3004b515691..f565570e30d 100644 --- a/forge-gui/res/cardsfolder/b/basris_aegis.txt +++ b/forge-gui/res/cardsfolder/b/basris_aegis.txt @@ -1,8 +1,8 @@ Name:Basri's Aegis ManaCost:2 W W Types:Sorcery -A:SP$ PutCounter | Cost$ 2 W W | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBSearch | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures. You may search your library and/or graveyard for a card named Basri, Devoted Paladin, reveal it, and put it into your hand. If you search your library this way, shuffle. -SVar:DBSearch:DB$ ChangeZone | Optional$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Hand | ChangeType$ Card.namedBasri; Devoted Paladin | ChangeNum$ 1 +A:SP$ PutCounter | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBSearch | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures. You may search your library and/or graveyard for a card named Basri, Devoted Paladin, reveal it, and put it into your hand. If you search your library this way, shuffle. +SVar:DBSearch:DB$ ChangeZone | Optional$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Hand | ChangeType$ Card.namedBasri; Devoted Paladin | ChangeTypeDesc$ card named Basri, Devoted Paladin | ChangeNum$ 1 DeckHints:Name$Basri, Devoted Paladin DeckHas:Ability$Counters Oracle:Put a +1/+1 counter on each of up to two target creatures. You may search your library and/or graveyard for a card named Basri, Devoted Paladin, reveal it, and put it into your hand. If you search your library this way, shuffle. diff --git a/forge-gui/res/cardsfolder/w/wargate.txt b/forge-gui/res/cardsfolder/w/wargate.txt index 55b38920dd6..1a2fbe2a9fa 100644 --- a/forge-gui/res/cardsfolder/w/wargate.txt +++ b/forge-gui/res/cardsfolder/w/wargate.txt @@ -1,6 +1,6 @@ Name:Wargate ManaCost:X G W U Types:Sorcery -A:SP$ ChangeZone | Cost$ X G W U | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.cmcLEX | ChangeNum$ 1 | SpellDescription$ Search your library for a permanent card with mana value X or less, put it onto the battlefield, then shuffle. +A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.cmcLEX | ChangeTypeDesc$ permanent card with mana value X or less | ChangeNum$ 1 | SpellDescription$ Search your library for a permanent card with mana value X or less, put it onto the battlefield, then shuffle. SVar:X:Count$xPaid Oracle:Search your library for a permanent card with mana value X or less, put it onto the battlefield, then shuffle.