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

Make {X} appear before generic on card overlays

Browse Source
This commit is contained in:
drdev
2013-12-07 17:38:52 +00:00
parent 457ba444f1
commit b6b586a865
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-gui/src/main/java/forge/gui/toolbox/CardFaceSymbols.java
View File

@@ -149,21 +149,36 @@ public class CardFaceSymbols {
return; return;
} }
int xpos = x;
final int offset = 14;
final int genericManaCost = manaCost.getGenericCost(); final int genericManaCost = manaCost.getGenericCost();
final boolean hasGeneric = (genericManaCost > 0) || manaCost.isPureGeneric(); final boolean hasGeneric = (genericManaCost > 0) || manaCost.isPureGeneric();
final List<ManaCostShard> shards = manaCost.getShards(); final List<ManaCostShard> shards = manaCost.getShards();
int xpos = x;
final int offset = 14;
if (hasGeneric) { if (hasGeneric) {
for (final ManaCostShard s : shards) { //render X shards before generic
if (s == ManaCostShard.X) {
CardFaceSymbols.drawSymbol(s.getImageKey(), skin, g, xpos, y);
xpos += offset;
}
}
final String sGeneric = Integer.toString(genericManaCost); final String sGeneric = Integer.toString(genericManaCost);
CardFaceSymbols.drawSymbol(sGeneric, skin, g, xpos, y); CardFaceSymbols.drawSymbol(sGeneric, skin, g, xpos, y);
xpos += offset; xpos += offset;
}
for (final ManaCostShard s : shards) { for (final ManaCostShard s : shards) { //render non-X shards after generic
CardFaceSymbols.drawSymbol(s.getImageKey(), skin, g, xpos, y); if (s != ManaCostShard.X) {
xpos += offset; CardFaceSymbols.drawSymbol(s.getImageKey(), skin, g, xpos, y);
xpos += offset;
}
}
}
else { //if no generic, just render shards in order
for (final ManaCostShard s : shards) {
CardFaceSymbols.drawSymbol(s.getImageKey(), skin, g, xpos, y);
xpos += offset;
}
} }
} }