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 00000000000..486cba97830 Binary files /dev/null and b/res/images/symbols-13/attack.png differ 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;