- Moved the representation of counters to the left and made attack/block/phasing icons appear on top.

This commit is contained in:
Sloth
2011-10-04 18:07:43 +00:00
parent 40e5f042d0
commit c0ff8dabc3

View File

@@ -275,6 +275,18 @@ public class CardPanel extends JPanel implements CardContainer {
int width = ManaSymbols.getWidth(gameCard.getManaCost()); int width = ManaSymbols.getWidth(gameCard.getManaCost());
ManaSymbols.draw(g, gameCard.getManaCost(), cardXOffset + cardWidth / 2 - width / 2, cardYOffset + cardHeight / 2); ManaSymbols.draw(g, gameCard.getManaCost(), cardXOffset + cardWidth / 2 - width / 2, cardYOffset + cardHeight / 2);
int counters = getCard().getNumberOfCounters();
if(counters == 1) {
ManaSymbols.drawSymbol("counters1", g, cardXOffset - 15, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters == 2) {
ManaSymbols.drawSymbol("counters2", g, cardXOffset - 15, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters == 3) {
ManaSymbols.drawSymbol("counters3", g, cardXOffset - 15, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters > 3) {
ManaSymbols.drawSymbol("countersMulti", g, cardXOffset - 15, cardYOffset + cardHeight - (cardHeight / 3) - 40);
}
//int yOff = (cardHeight/4) + 2; //int yOff = (cardHeight/4) + 2;
if (getCard().isAttacking()) { if (getCard().isAttacking()) {
ManaSymbols.drawSymbol("attack", g, cardXOffset + cardWidth / 4 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16); ManaSymbols.drawSymbol("attack", g, cardXOffset + cardWidth / 4 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16);
@@ -288,18 +300,6 @@ public class CardPanel extends JPanel implements CardContainer {
if (getCard().isPhasedOut()) if (getCard().isPhasedOut())
ManaSymbols.drawSymbol("phasing", g, cardXOffset + cardWidth / 2 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16); ManaSymbols.drawSymbol("phasing", g, cardXOffset + cardWidth / 2 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16);
int counters = getCard().getNumberOfCounters();
if(counters == 1) {
ManaSymbols.drawSymbol("counters1", g, cardXOffset + cardWidth - 65, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters == 2) {
ManaSymbols.drawSymbol("counters2", g, cardXOffset + cardWidth - 65, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters == 3) {
ManaSymbols.drawSymbol("counters3", g, cardXOffset + cardWidth - 65, cardYOffset + cardHeight - (cardHeight / 3) - 40);
} else if(counters > 3) {
ManaSymbols.drawSymbol("countersMulti", g, cardXOffset + cardWidth - 65, cardYOffset + cardHeight - (cardHeight / 3) - 40);
}
if (getCard() != null) { if (getCard() != null) {
if (this.gameCard.getFoil() > 0) { if (this.gameCard.getFoil() > 0) {
String fl = String.format("foil%02d", getCard().getFoil()); String fl = String.format("foil%02d", getCard().getFoil());