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

Fix colorless mana symbols

Browse Source
This commit is contained in:
drdev
2016-01-14 17:07:27 +00:00
parent d8a1ac4f27
commit aa3730a690
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/assets/TextRenderer.java
View File

@@ -19,6 +19,7 @@ import forge.properties.ForgePreferences.FPref;
public class TextRenderer { public class TextRenderer {
private static final Map<String, FSkinImage> symbolLookup = new HashMap<String, FSkinImage>(); private static final Map<String, FSkinImage> symbolLookup = new HashMap<String, FSkinImage>();
static { static {
symbolLookup.put("C", FSkinImage.MANA_COLORLESS);
symbolLookup.put("W", FSkinImage.MANA_W); symbolLookup.put("W", FSkinImage.MANA_W);
symbolLookup.put("U", FSkinImage.MANA_U); symbolLookup.put("U", FSkinImage.MANA_U);
symbolLookup.put("B", FSkinImage.MANA_B); symbolLookup.put("B", FSkinImage.MANA_B);
@@ -50,7 +51,7 @@ public class TextRenderer {
symbolLookup.put("X", FSkinImage.MANA_X); symbolLookup.put("X", FSkinImage.MANA_X);
symbolLookup.put("Y", FSkinImage.MANA_Y); symbolLookup.put("Y", FSkinImage.MANA_Y);
symbolLookup.put("Z", FSkinImage.MANA_Z); symbolLookup.put("Z", FSkinImage.MANA_Z);
symbolLookup.put("C", FSkinImage.CHAOS); symbolLookup.put("CHAOS", FSkinImage.CHAOS);
symbolLookup.put("Q", FSkinImage.UNTAP); symbolLookup.put("Q", FSkinImage.UNTAP);
symbolLookup.put("S", FSkinImage.MANA_SNOW); symbolLookup.put("S", FSkinImage.MANA_SNOW);
symbolLookup.put("T", FSkinImage.TAP); symbolLookup.put("T", FSkinImage.TAP);

3
forge-gui-mobile/src/forge/card/CardFaceSymbols.java
View File

@@ -40,6 +40,7 @@ public class CardFaceSymbols {
MANA_IMAGES.put("Y", FSkinImage.MANA_Y); MANA_IMAGES.put("Y", FSkinImage.MANA_Y);
MANA_IMAGES.put("Z", FSkinImage.MANA_Z); MANA_IMAGES.put("Z", FSkinImage.MANA_Z);
MANA_IMAGES.put("C", FSkinImage.MANA_COLORLESS);
MANA_IMAGES.put("B", FSkinImage.MANA_B); MANA_IMAGES.put("B", FSkinImage.MANA_B);
MANA_IMAGES.put("BG", FSkinImage.MANA_HYBRID_BG); MANA_IMAGES.put("BG", FSkinImage.MANA_HYBRID_BG);
MANA_IMAGES.put("BR", FSkinImage.MANA_HYBRID_BR); MANA_IMAGES.put("BR", FSkinImage.MANA_HYBRID_BR);
@@ -140,7 +141,7 @@ public class CardFaceSymbols {
public static void drawColorSet(Graphics g, ColorSet colorSet, float x, float y, final float imageSize) { public static void drawColorSet(Graphics g, ColorSet colorSet, float x, float y, final float imageSize) {
if (colorSet.isColorless()) { if (colorSet.isColorless()) {
CardFaceSymbols.drawSymbol(ManaCostShard.X.getImageKey(), g, x, y, imageSize, imageSize); CardFaceSymbols.drawSymbol(ManaCostShard.COLORLESS.getImageKey(), g, x, y, imageSize, imageSize);
return; return;
} }

5
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -278,9 +278,12 @@ public class CardImageRenderer {
case "Mountain": case "Mountain":
image = FSkinImage.MANA_R; image = FSkinImage.MANA_R;
break; break;
default: case "Forest":
image = FSkinImage.MANA_G; image = FSkinImage.MANA_G;
break; break;
default:
image = FSkinImage.MANA_COLORLESS;
break;
} }
float iconSize = h * 0.75f; float iconSize = h * 0.75f;
g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize); g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize);