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

- Improve Combat Panel for banding and blockers that have been removed

Browse Source
This commit is contained in:
Sol
2013-06-18 00:10:57 +00:00
parent 7073eb5494
commit 7819893f81
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/forge/gui/match/controllers/CCombat.java
View File

@@ -89,17 +89,28 @@ public enum CCombat implements ICDoc {
// Associate Bands, Attackers Blockers // Associate Bands, Attackers Blockers
for(AttackingBand band : bands) { for(AttackingBand band : bands) {
display.append(" BAND"); boolean isBand = band.getAttackers().size() > 1;
if (band.getBlocked()) { if (isBand) {
display.append(" (blocked)"); // Only print Band data if it's actually a band
display.append(" BAND");
if (band.getBlocked()) {
display.append(" (blocked)");
}
display.append("\n");
} }
display.append("\n");
for (final Card c : band.getAttackers()) { for (final Card c : band.getAttackers()) {
display.append(" > "); display.append(" > ");
display.append(combatantToString(c)).append("\n"); display.append(combatantToString(c)).append("\n");
} }
if (!isBand && band.getBlockers().isEmpty()) {
// if single creature is blocked, but no longer has blockers, tell the user!
if (band.getBlocked()) {
display.append(" (blocked) ");
}
}
for (final Card element : band.getBlockers()) { for (final Card element : band.getBlockers()) {
display.append(" < ").append(combatantToString(element)).append("\n"); display.append(" < ").append(combatantToString(element)).append("\n");
} }