From ec463b414f93de8ed979ca46ea5faaa7c7bde392 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 31 Mar 2020 14:44:37 +0800
Subject: [PATCH] Refactor description

---
 .../ability/effects/CountersPutEffect.java    | 20 ++++++------
 .../ability/effects/DamageDealEffect.java     | 31 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index 9a1048d83fb..76c8ed3b6a8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -78,15 +78,15 @@ public class CountersPutEffect extends SpellAbilityEffect {
             final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility);
             for(int i = 0; i < targetCards.size(); i++) {
                 Card targetCard = targetCards.get(i);
-                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) { // fix null counter stack description
-                    stringBuilder.append(targetCard).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" counter)");
+                stringBuilder.append(targetCard);
+                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) // fix null counter stack description
+                    stringBuilder.append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" counter)");
 
-                    if(i == targetCards.size() - 2) {
-                        stringBuilder.append(" and ");
-                    }
-                    else if(i + 1 < targetCards.size()) {
-                        stringBuilder.append(", ");
-                    }
+                if(i == targetCards.size() - 2) {
+                    stringBuilder.append(" and ");
+                }
+                else if(i + 1 < targetCards.size()) {
+                    stringBuilder.append(", ");
                 }
             }
         } else {
@@ -105,8 +105,8 @@ public class CountersPutEffect extends SpellAbilityEffect {
                 }
             }
         }
-        //stringBuilder.append(".");
-        return stringBuilder.toString().trim() + ".";
+        stringBuilder.append(".");
+        return stringBuilder.toString();
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
index 8e123ccab94..304ad563c05 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
@@ -58,7 +58,8 @@ public class DamageDealEffect extends DamageBaseEffect {
                 stringBuilder.append("divided evenly (rounded down) to\n");
             } else if (spellAbility.hasParam("DividedAsYouChoose")) {
                 stringBuilder.append("divided to\n");
-            }
+            } else
+                stringBuilder.append(" to ");
 
             final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility);
             final List<Player> players = SpellAbilityEffect.getTargetPlayers(spellAbility);
@@ -68,28 +69,28 @@ public class DamageDealEffect extends DamageBaseEffect {
             // target cards
             for (int i = 0; i < targetCards.size(); i++) {
                 Card targetCard = targetCards.get(i);
-                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) { //fix null damage stack description
-                    stringBuilder.append(targetCard).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" damage)");
+                stringBuilder.append(targetCard);
+                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) //fix null damage stack description
+                    stringBuilder.append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" damage)");
 
-                    if (i == targetCount - 2) {
-                        stringBuilder.append(" and ");
-                    } else if (i + 1 < targetCount) {
-                        stringBuilder.append(", ");
-                    }
+                if (i == targetCount - 2) {
+                    stringBuilder.append(" and ");
+                } else if (i + 1 < targetCount) {
+                    stringBuilder.append(", ");
                 }
             }
 
             // target players
             for (int i = 0; i < players.size(); i++) {
                 Player targetPlayer = players.get(i);
-                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer) != null) { //fix null damage stack description
-                    stringBuilder.append(targetPlayer).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer)).append(" damage)");
+                stringBuilder.append(targetPlayer);
+                if (spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer) != null) //fix null damage stack description
+                    stringBuilder.append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer)).append(" damage)");
 
-                    if (i == players.size() - 2) {
-                        stringBuilder.append(" and ");
-                    } else if (i + 1 < players.size()) {
-                        stringBuilder.append(", ");
-                    }
+                if (i == players.size() - 2) {
+                    stringBuilder.append(" and ");
+                } else if (i + 1 < players.size()) {
+                    stringBuilder.append(", ");
                 }
             }