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

- Fixing some overzealous changes in Card overlays that could place the Blocking icon underneath the Sickness icon

Browse Source
This commit is contained in:
Sol
2013-04-17 22:49:13 +00:00
parent 5a7874f758
commit 01f88df772
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -387,12 +387,13 @@ public class CardPanel extends JPanel implements CardContainer {
} }
} }
if (this.getCard() == null) { Card card = this.getCard();
if (card == null) {
return; return;
} }
int number = 0; int number = 0;
for (final Integer i : this.getCard().getCounters().values()) { for (final Integer i : card.getCounters().values()) {
number += i.intValue(); number += i.intValue();
} }
@@ -409,30 +410,31 @@ public class CardPanel extends JPanel implements CardContainer {
CardFaceSymbols.drawSymbol("countersMulti", g, this.cardXOffset - 15, yCounters); CardFaceSymbols.drawSymbol("countersMulti", g, this.cardXOffset - 15, yCounters);
} }
final int xSymbols = (this.cardXOffset + (this.cardWidth / 4)) - 16; final int combatXSymbols = (this.cardXOffset + (this.cardWidth / 4)) - 16;
final int stateXSymbols = (this.cardXOffset + (this.cardWidth / 2)) - 16;
final int ySymbols = (this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16; final int ySymbols = (this.cardYOffset + this.cardHeight) - (this.cardHeight / 8) - 16;
// int yOff = (cardHeight/4) + 2; // int yOff = (cardHeight/4) + 2;
if (this.getCard().isAttacking()) { if (card.isAttacking()) {
CardFaceSymbols.drawSymbol("attack", g, xSymbols, ySymbols); CardFaceSymbols.drawSymbol("attack", g, combatXSymbols, ySymbols);
} else if (this.getCard().isBlocking()) { } else if (card.isBlocking()) {
CardFaceSymbols.drawSymbol("defend", g, xSymbols, ySymbols); CardFaceSymbols.drawSymbol("defend", g, combatXSymbols, ySymbols);
} }
if (this.getCard().isSick() && this.getCard().isInPlay()) { if (card.isSick() && card.isInPlay()) {
CardFaceSymbols.drawSymbol("summonsick", g, xSymbols, ySymbols); CardFaceSymbols.drawSymbol("summonsick", g, stateXSymbols, ySymbols);
} }
if (this.getCard().isPhasedOut()) { if (card.isPhasedOut()) {
CardFaceSymbols.drawSymbol("phasing", g, xSymbols, ySymbols); CardFaceSymbols.drawSymbol("phasing", g, stateXSymbols, ySymbols);
} }
if (this.getCard().isUsedToPay()) { if (card.isUsedToPay()) {
CardFaceSymbols.drawSymbol("sacrifice", g, (this.cardXOffset + (this.cardWidth / 2)) - 20, CardFaceSymbols.drawSymbol("sacrifice", g, (this.cardXOffset + (this.cardWidth / 2)) - 20,
(this.cardYOffset + (this.cardHeight / 2)) - 20); (this.cardYOffset + (this.cardHeight / 2)) - 20);
} }
if (this.getCard() != null && this.getGameCard().getFoil() > 0) { if (this.getGameCard().getFoil() > 0) {
final String fl = String.format("foil%02d", this.getCard().getFoil()); final String fl = String.format("foil%02d", card.getFoil());
final int z = Math.round(this.cardWidth * CardPanel.BLACK_BORDER_SIZE); final int z = Math.round(this.cardWidth * CardPanel.BLACK_BORDER_SIZE);
CardFaceSymbols.drawOther(g, fl, this.cardXOffset + z, this.cardYOffset + z, this.cardWidth - (2 * z), CardFaceSymbols.drawOther(g, fl, this.cardXOffset + z, this.cardYOffset + z, this.cardWidth - (2 * z),
this.cardHeight - (2 * z)); this.cardHeight - (2 * z));