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

Refactor description

Browse Source
This commit is contained in:
Anthony Calosa
2020-03-31 14:44:37 +08:00
parent faf8c57907
commit ec463b414f
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -78,8 +78,9 @@ public class CountersPutEffect extends SpellAbilityEffect {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility); final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility);
for(int i = 0; i < targetCards.size(); i++) { for(int i = 0; i < targetCards.size(); i++) {
Card targetCard = targetCards.get(i); Card targetCard = targetCards.get(i);
if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) { // fix null counter stack description stringBuilder.append(targetCard);
stringBuilder.append(targetCard).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" counter)"); 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) { if(i == targetCards.size() - 2) {
stringBuilder.append(" and "); stringBuilder.append(" and ");
@@ -88,7 +89,6 @@ public class CountersPutEffect extends SpellAbilityEffect {
stringBuilder.append(", "); stringBuilder.append(", ");
} }
} }
}
} else { } else {
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility); final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility);
final Iterator<Card> it = targetCards.iterator(); final Iterator<Card> it = targetCards.iterator();
@@ -105,8 +105,8 @@ public class CountersPutEffect extends SpellAbilityEffect {
} }
} }
} }
//stringBuilder.append("."); stringBuilder.append(".");
return stringBuilder.toString().trim() + "."; return stringBuilder.toString();
} }
@Override @Override

15
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
View File

@@ -58,7 +58,8 @@ public class DamageDealEffect extends DamageBaseEffect {
stringBuilder.append("divided evenly (rounded down) to\n"); stringBuilder.append("divided evenly (rounded down) to\n");
} else if (spellAbility.hasParam("DividedAsYouChoose")) { } else if (spellAbility.hasParam("DividedAsYouChoose")) {
stringBuilder.append("divided to\n"); stringBuilder.append("divided to\n");
} } else
stringBuilder.append(" to ");
final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility); final List<Card> targetCards = SpellAbilityEffect.getTargetCards(spellAbility);
final List<Player> players = SpellAbilityEffect.getTargetPlayers(spellAbility); final List<Player> players = SpellAbilityEffect.getTargetPlayers(spellAbility);
@@ -68,8 +69,9 @@ public class DamageDealEffect extends DamageBaseEffect {
// target cards // target cards
for (int i = 0; i < targetCards.size(); i++) { for (int i = 0; i < targetCards.size(); i++) {
Card targetCard = targetCards.get(i); Card targetCard = targetCards.get(i);
if (spellAbility.getTargetRestrictions().getDividedMap().get(targetCard) != null) { //fix null damage stack description stringBuilder.append(targetCard);
stringBuilder.append(targetCard).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetCard)).append(" damage)"); 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) { if (i == targetCount - 2) {
stringBuilder.append(" and "); stringBuilder.append(" and ");
@@ -77,13 +79,13 @@ public class DamageDealEffect extends DamageBaseEffect {
stringBuilder.append(", "); stringBuilder.append(", ");
} }
} }
}
// target players // target players
for (int i = 0; i < players.size(); i++) { for (int i = 0; i < players.size(); i++) {
Player targetPlayer = players.get(i); Player targetPlayer = players.get(i);
if (spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer) != null) { //fix null damage stack description stringBuilder.append(targetPlayer);
stringBuilder.append(targetPlayer).append(" (").append(spellAbility.getTargetRestrictions().getDividedMap().get(targetPlayer)).append(" damage)"); 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) { if (i == players.size() - 2) {
stringBuilder.append(" and "); stringBuilder.append(" and ");
@@ -91,7 +93,6 @@ public class DamageDealEffect extends DamageBaseEffect {
stringBuilder.append(", "); stringBuilder.append(", ");
} }
} }
}
} else { } else {
if (spellAbility.hasParam("DivideEvenly")) { if (spellAbility.hasParam("DivideEvenly")) {