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

trivial refactor in CardPanel (I was looking for a place to draw cards' counters)

Browse Source 
Level counters were given a name
This commit is contained in:
Maxmtg
2011-09-10 20:54:32 +00:00
parent d12bf3dc96
commit 0b7215b8a6
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/arcane/ui/CardPanel.java
View File

@@ -53,9 +53,6 @@ public class CardPanel extends JPanel implements CardContainer {
/** Constant <code>rotCenterToBottomCorner=0.7071067811865475244008443621048f</code> */ /** Constant <code>rotCenterToBottomCorner=0.7071067811865475244008443621048f</code> */
private static final float rotCenterToBottomCorner = 0.7071067811865475244008443621048f; private static final float rotCenterToBottomCorner = 0.7071067811865475244008443621048f;
/** Constant <code>beenHere=false</code> */
private static boolean beenHere = false;
public Card gameCard; public Card gameCard;
public CardPanel attachedToPanel; public CardPanel attachedToPanel;
public List<CardPanel> attachedPanels = new ArrayList<CardPanel>(); public List<CardPanel> attachedPanels = new ArrayList<CardPanel>();
@@ -271,22 +268,23 @@ public class CardPanel extends JPanel implements CardContainer {
protected void paintChildren(Graphics g) { protected void paintChildren(Graphics g) {
super.paintChildren(g); super.paintChildren(g);
if (showCastingCost && !isAnimationPanel && cardWidth < 200) { boolean canDrawOverCard = showCastingCost && !isAnimationPanel && cardWidth < 200;
if (canDrawOverCard) {
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);
beenHere = true;
} }
//int yOff = (cardHeight/4) + 2; //int yOff = (cardHeight/4) + 2;
if (showCastingCost && !isAnimationPanel && cardWidth < 200 && getCard().isAttacking()) if (canDrawOverCard && 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);
else if (showCastingCost && !isAnimationPanel && cardWidth < 200 && getCard().isBlocking()) } else if (canDrawOverCard && getCard().isBlocking()) {
ManaSymbols.drawSymbol("defend", g, cardXOffset + cardWidth / 4 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16); ManaSymbols.drawSymbol("defend", g, cardXOffset + cardWidth / 4 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16);
}
if (showCastingCost && !isAnimationPanel && cardWidth < 200 && getCard().isCreature() && getCard().hasSickness() && AllZoneUtil.isCardInPlay(getCard())) if (canDrawOverCard && getCard().isCreature() && getCard().hasSickness() && AllZoneUtil.isCardInPlay(getCard()))
ManaSymbols.drawSymbol("summonsick", g, cardXOffset + cardWidth / 2 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16); ManaSymbols.drawSymbol("summonsick", g, cardXOffset + cardWidth / 2 - 16, cardYOffset + cardHeight - (cardHeight / 8) - 16);
if (beenHere && getCard() != null) { if (canDrawOverCard && 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());
int z = Math.round(cardWidth * BLACK_BORDER_SIZE); int z = Math.round(cardWidth * BLACK_BORDER_SIZE);

2
src/main/java/forge/Counters.java
View File

@@ -50,7 +50,7 @@ public enum Counters {
INTERVENTION(), INTERVENTION(),
JAVELIN(), JAVELIN(),
KI(), KI(),
LEVEL(), LEVEL("Level"),
LORE(), LORE(),
LOYALTY(), LOYALTY(),
LUCK(), LUCK(),