From 49f050655c87f8f8992553602185225300f3a0ba Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Sun, 18 Mar 2018 15:21:15 -0600 Subject: [PATCH] improve the generated stack text for Brainstorm Fixes: core-developers/forge#350 Signed-off-by: Jamin W. Collins --- .../game/ability/effects/ChangeZoneEffect.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 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 8abb1a34816..f77769eeb67 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 @@ -107,7 +107,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { String fetchPlayer = fetcherNames; if (chooserNames.equals(fetcherNames)) { - fetchPlayer = fetchers.size() > 1 ? "their" : "his/her"; + fetchPlayer = "their"; } String origin = ""; @@ -179,8 +179,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect { sb.append(num).append(" of those ").append(type).append(" card(s)"); } else { sb.append(destination.equals("Exile") ? " exiles " : " puts "); - sb.append(num).append(" ").append(type).append(" card(s) from"); - sb.append(fetchPlayer).append(" hand"); + if (type == "Card") { + sb.append(num); + } else { + sb.append(num).append(" ").append(type); + } + sb.append(" card(s) from ").append(fetchPlayer).append(" hand"); } if (destination.equals("Battlefield")) { @@ -202,7 +206,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect { 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(".");