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

Merge branch 'generated-stack-text' into 'master'

Browse Source 
improve the generated stack text for Brainstorm

Closes #350

See merge request core-developers/forge!303
This commit is contained in:
Michael Kamensky
2018-03-19 06:04:58 +00:00
parent c680df8738 49f050655c
commit 8a41f8f476
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
String fetchPlayer = fetcherNames; String fetchPlayer = fetcherNames;
if (chooserNames.equals(fetcherNames)) { if (chooserNames.equals(fetcherNames)) {
fetchPlayer = fetchers.size() > 1 ? "their" : "his/her"; fetchPlayer = "their";
} }
String origin = ""; String origin = "";
@@ -179,8 +179,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
sb.append(num).append(" of those ").append(type).append(" card(s)"); sb.append(num).append(" of those ").append(type).append(" card(s)");
} else { } else {
sb.append(destination.equals("Exile") ? " exiles " : " puts "); sb.append(destination.equals("Exile") ? " exiles " : " puts ");
sb.append(num).append(" ").append(type).append(" card(s) from"); if (type == "Card") {
sb.append(fetchPlayer).append(" hand"); sb.append(num);
} else {
sb.append(num).append(" ").append(type);
}
sb.append(" card(s) from ").append(fetchPlayer).append(" hand");
} }
if (destination.equals("Battlefield")) { if (destination.equals("Battlefield")) {
@@ -202,7 +206,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
sb.append(" on the bottom"); sb.append(" on the bottom");
} }
sb.append(" of ").append(fetchPlayer).append("'s library"); sb.append(" of ").append(fetchPlayer);
if (fetchPlayer != "their") {
sb.append("'s");
}
sb.append(" library");
} }
sb.append("."); sb.append(".");