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

Merge branch 'chosd' into 'master'

Browse Source 
More changeHiddenOriginStackDescription tweaks

See merge request core-developers/forge!6407
This commit is contained in:
Michael Kamensky
2022-03-17 08:20:25 +00:00
parent ddc00f68fe 661a1ff43a
commit 6027d060ea
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -76,6 +76,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final Card host = sa.getHostCard(); final Card host = sa.getHostCard();
if (sa.hasParam("Optional")) { // TODO make boolean and handle verb reconjugation throughout
sb.append("(OPTIONAL) ");
}
// Player whose cards will change zones // Player whose cards will change zones
List<Player> fetchers = null; List<Player> fetchers = null;
if (sa.hasParam("DefinedPlayer")) { if (sa.hasParam("DefinedPlayer")) {
@@ -157,11 +161,17 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
sb.append("."); sb.append(".");
} else if (origin.equals("Library")) { } else if (origin.equals("Library")) {
sb.append(chooserNames); final boolean originAlt = sa.hasParam("OriginAlternative");
sb.append(" search").append(choosers.size() > 1 ? " " : "es "); sb.append(chooserNames).append(" search").append(choosers.size() > 1 ? " " : "es ");
sb.append(fetchPlayer).append(fetchPlayer.equals(chooserNames) ? "'s " : " "); sb.append(fetchPlayer).append(fetchPlayer.equals(chooserNames) ? "'s " : " ").append("library");
if (originAlt) {
sb.append(sa.getParam("OriginAlternative").contains("Hand") ? ", hand, and/or graveyard for " :
" and/or graveyard for ");
} else {
sb.append(" for ");
}
final String cardTag = type.contains("card") ? "" : " card"; final String cardTag = type.contains("card") ? "" : " card";
sb.append("library for ").append(Lang.nounWithNumeralExceptOne(num, type + cardTag)).append(", "); sb.append(Lang.nounWithNumeralExceptOne(num, type + cardTag)).append(", ");
if (!sa.hasParam("NoReveal") || !destination.equals("Battlefield")) { if (!sa.hasParam("NoReveal") || !destination.equals("Battlefield")) {
if (choosers.size() == 1) { if (choosers.size() == 1) {
sb.append(num > 1 ? "reveals them, " : "reveals it, "); sb.append(num > 1 ? "reveals them, " : "reveals it, ");
@@ -194,7 +204,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
if (destination.equals("Hand")) { if (destination.equals("Hand")) {
if (num == 1) { if (num == 1) {
sb.append("into its owner's hand"); sb.append("into their hand");
} else { } else {
sb.append("into their owner's hand"); sb.append("into their owner's hand");
} }
@@ -207,7 +217,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
} }
sb.append(", then shuffles."); sb.append(", then shuffles").append(originAlt ? " if they searched their library." : ".");
} else if (origin.equals("Sideboard")) { } else if (origin.equals("Sideboard")) {
sb.append(chooserNames); sb.append(chooserNames);
//currently Reveal is always True in ChangeZone //currently Reveal is always True in ChangeZone