From 08dfda42f484bfec66ceb11c7158aae8c9154eff Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 13:47:34 +0000 Subject: [PATCH] - Added an attack symbol. --- .gitattributes | 1 + res/images/symbols-13/attack.png | Bin 0 -> 4830 bytes src/arcane/ui/CardPanel.java | 2 ++ src/arcane/ui/util/ManaSymbols.java | 7 ++++++- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 res/images/symbols-13/attack.png diff --git a/.gitattributes b/.gitattributes index 6c6131eebbe..ccf248f337b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5743,6 +5743,7 @@ res/images/symbols-13/WU.png -text svneol=unset#image/png res/images/symbols-13/X.png -text svneol=unset#image/png res/images/symbols-13/Y.png -text svneol=unset#image/png res/images/symbols-13/Z.png -text svneol=unset#image/png +res/images/symbols-13/attack.png -text svneol=unset#image/png res/images/symbols-13/slash.png -text svneol=unset#image/png res/lang/de.properties svneol=native#text/plain res/lang/en.properties svneol=native#text/plain diff --git a/res/images/symbols-13/attack.png b/res/images/symbols-13/attack.png new file mode 100644 index 0000000000000000000000000000000000000000..486cba978303f267c6a18e277a14cff2d66be2e0 GIT binary patch literal 4830 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 Ef@PjGX#fBK literal 0 HcmV?d00001 diff --git a/src/arcane/ui/CardPanel.java b/src/arcane/ui/CardPanel.java index 48234dde999..f4647084cd1 100644 --- a/src/arcane/ui/CardPanel.java +++ b/src/arcane/ui/CardPanel.java @@ -185,6 +185,8 @@ public class CardPanel extends JPanel implements CardContainer{ int width = ManaSymbols.getWidth(gameCard.getManaCost()); ManaSymbols.draw(g, gameCard.getManaCost(), cardXOffset + cardWidth / 2 - width / 2, cardYOffset + cardHeight / 2); } + if (showCastingCost && !isAnimationPanel && cardWidth < 200 && getCard().isAttacking() ) + ManaSymbols.drawAttack(g, cardXOffset + cardWidth / 2 - 12, cardYOffset +1); } public void layout () { diff --git a/src/arcane/ui/util/ManaSymbols.java b/src/arcane/ui/util/ManaSymbols.java index 5a83a84e91c..a4686749d30 100644 --- a/src/arcane/ui/util/ManaSymbols.java +++ b/src/arcane/ui/util/ManaSymbols.java @@ -18,7 +18,7 @@ public class ManaSymbols { static public void loadImages () { String[] symbols = new String[] {"0", "1", "10", "11", "12", "15", "16", "2", "20", "2W", "2U", "2R", "2G", "2B", "3", "4", "5", "6", "7", "8", "9", "B", "BG", "BR", "G", "GU", "GW", "R", "RG", "RW", "S", "T", "U", "UB", - "UR", "W", "WB", "WU", "X", "Y", "Z", "slash"}; + "UR", "W", "WB", "WU", "X", "Y", "Z", "slash", "attack"}; for (String symbol : symbols) manaImages.put(symbol, UI.getImageIcon("res/images/symbols-13/" + symbol + ".png").getImage()); } @@ -38,6 +38,11 @@ public class ManaSymbols { x += symbol.length() > 2 ? 10 : 14; // slash.png is only 10 pixels wide. } } + + static public void drawAttack (Graphics g, int x, int y) { + Image image = manaImages.get("attack"); + g.drawImage(image, x, y, null); + } static public int getWidth (String manaCost) { int width = 0;