mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 03:08:02 +00:00
- Improve Combat Panel for banding and blockers that have been removed
This commit is contained in:
@@ -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) {
|
||||||
|
boolean isBand = band.getAttackers().size() > 1;
|
||||||
|
if (isBand) {
|
||||||
|
// Only print Band data if it's actually a band
|
||||||
display.append(" BAND");
|
display.append(" BAND");
|
||||||
if (band.getBlocked()) {
|
if (band.getBlocked()) {
|
||||||
display.append(" (blocked)");
|
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");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user