diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java index ea0408e32db..6a5d65dc9a8 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java +++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java @@ -259,7 +259,7 @@ public class MapStage extends GameStage { image.setWidth(70); image.setHeight(100); image.setPosition(0, 15); - TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck))+"\n[%]"+deck.getName()); + TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck)).toUpperCase()+"\n[%]"+deck.getName()); label.skipToTheEnd(); label.setAlignment(Align.center); label.setPosition(34, 20); @@ -270,7 +270,7 @@ public class MapStage extends GameStage { dialog.getContentTable().add(group).height(100).width(65).center(); dialog.getContentTable().add().row(); } else { - TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck))+"\n[%]"+deck.getName()); + TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck)).toUpperCase()+"\n[%]"+deck.getName()); label.skipToTheEnd(); label.setAlignment(Align.center); dialog.getContentTable().add(label).align(Align.center); diff --git a/forge-gui-mobile/src/forge/adventure/util/Controls.java b/forge-gui-mobile/src/forge/adventure/util/Controls.java index 617f92a5775..7b32d8506fd 100644 --- a/forge-gui-mobile/src/forge/adventure/util/Controls.java +++ b/forge-gui-mobile/src/forge/adventure/util/Controls.java @@ -362,6 +362,7 @@ public class Controls { public static String colorIdToTypingString(ColorSet color) { + //NOTE converting to uppercase will use pixelmana.atlas, higher quality pixel mana symbol. String colorId=""; if(color.hasWhite()) colorId+="[+w]"; @@ -408,6 +409,7 @@ public class Controls { { textraFont=new Font(getSkin().getFont("default"), 0f, 1.5f, 0f, 0f); textraFont.addAtlas(Config.instance().getAtlas(Paths.ITEMS_ATLAS)); + textraFont.addAtlas(Config.instance().getAtlas(Paths.PIXELMANA_ATLAS)); } return textraFont; } diff --git a/forge-gui-mobile/src/forge/adventure/util/Paths.java b/forge-gui-mobile/src/forge/adventure/util/Paths.java index 5207ab20353..b997c1747a1 100644 --- a/forge-gui-mobile/src/forge/adventure/util/Paths.java +++ b/forge-gui-mobile/src/forge/adventure/util/Paths.java @@ -13,6 +13,7 @@ public class Paths { public static final String SKIN = "skin/ui_skin.json"; public static final String ITEMS_EQUIP = "skin/equip.png"; public static final String ITEMS_ATLAS = "sprites/items.atlas"; + public static final String PIXELMANA_ATLAS = "sprites/pixelmana.atlas"; public static final String KEYS_ATLAS = "skin/keys.atlas"; public static final String COLOR_FRAME_ATLAS = "ui/color_frames.atlas"; public static final String ARENA_ATLAS = "ui/arena.atlas"; diff --git a/forge-gui/res/adventure/Shandalar/config.json b/forge-gui/res/adventure/Shandalar/config.json index ca2f0f4518c..d0bf57d7681 100644 --- a/forge-gui/res/adventure/Shandalar/config.json +++ b/forge-gui/res/adventure/Shandalar/config.json @@ -5,7 +5,7 @@ "playerBaseSpeed": 32, "minDeckSize": 40, "colorIds":["W","U","B","R","G"], - "colorIdNames":["tr(lblWhite) [+w]","tr(lblBlue) [+u]","tr(lblBlack) [+b]","tr(lblRed) [+r]","tr(lblGreen) [+g]"], + "colorIdNames":["tr(lblWhite) [+W]","tr(lblBlue) [+U]","tr(lblBlack) [+B]","tr(lblRed) [+R]","tr(lblGreen) [+G]"], "restrictedCards": [ "Black Lotus", "Mox Emerald", diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixelmana.atlas b/forge-gui/res/adventure/Shandalar/sprites/pixelmana.atlas index 1bb8dbb4040..eed2782daee 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/pixelmana.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/pixelmana.atlas @@ -3,42 +3,42 @@ size: 374,64 format: RGBA8888 filter: Nearest,Nearest repeat: none -pixB +B rotate: false xy: 2, 2 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -pixC +C rotate: false xy: 64, 2 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -pixG +G rotate: false xy: 126, 2 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -pixR +R rotate: false xy: 188, 2 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -pixU +U rotate: false xy: 250, 2 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -pixW +W rotate: false xy: 312, 2 size: 60, 60 diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixelmana.png b/forge-gui/res/adventure/Shandalar/sprites/pixelmana.png index 106b5277e6d..b5debd9f195 100644 Binary files a/forge-gui/res/adventure/Shandalar/sprites/pixelmana.png and b/forge-gui/res/adventure/Shandalar/sprites/pixelmana.png differ diff --git a/forge-gui/res/adventure/Shandalar/ui/spellsmith.json b/forge-gui/res/adventure/Shandalar/ui/spellsmith.json index 87a1bac9e15..31c662476ca 100644 --- a/forge-gui/res/adventure/Shandalar/ui/spellsmith.json +++ b/forge-gui/res/adventure/Shandalar/ui/spellsmith.json @@ -74,7 +74,7 @@ "type": "TextButton", "selectable": true, "name": "BBlack", - "text": "[+b]", + "text": "[+B]", "x": 15, "y": 120, "width": 45, @@ -84,7 +84,7 @@ "type": "TextButton", "selectable": true, "name": "BBlue", - "text": "[+u]", + "text": "[+U]", "x": 65, "y": 120, "width": 45, @@ -94,7 +94,7 @@ "type": "TextButton", "selectable": true, "name": "BGreen", - "text": "[+g]", + "text": "[+G]", "x": 115, "y": 120, "width": 45, @@ -104,7 +104,7 @@ "type": "TextButton", "selectable": true, "name": "BRed", - "text": "[+r]", + "text": "[+R]", "x": 165, "y": 120, "width": 45, @@ -114,7 +114,7 @@ "type": "TextButton", "selectable": true, "name": "BWhite", - "text": "[+w]", + "text": "[+W]", "x": 215, "y": 120, "width": 45, @@ -124,7 +124,7 @@ "type": "TextButton", "selectable": true, "name": "BColorless", - "text": "[+c]", + "text": "[+C]", "x": 265, "y": 120, "width": 45, diff --git a/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json b/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json index 04f3e1ec83f..d7d5a633fc3 100644 --- a/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json @@ -74,7 +74,7 @@ "type": "TextButton", "selectable": true, "name": "BBlack", - "text": "[+b]", + "text": "[+B]", "x": 58, "y": 290, "width": 45, @@ -84,7 +84,7 @@ "type": "TextButton", "selectable": true, "name": "BBlue", - "text": "[+u]", + "text": "[+U]", "x": 113, "y": 290, "width": 45, @@ -94,7 +94,7 @@ "type": "TextButton", "selectable": true, "name": "BGreen", - "text": "[+g]", + "text": "[+G]", "x": 168, "y": 290, "width": 45, @@ -104,7 +104,7 @@ "type": "TextButton", "selectable": true, "name": "BRed", - "text": "[+r]", + "text": "[+R]", "x": 58, "y": 320, "width": 45, @@ -114,7 +114,7 @@ "type": "TextButton", "selectable": true, "name": "BWhite", - "text": "[+w]", + "text": "[+W]", "x": 113, "y": 320, "width": 45, @@ -124,7 +124,7 @@ "type": "TextButton", "selectable": true, "name": "BColorless", - "text": "[+c]", + "text": "[+C]", "x": 168, "y": 320, "width": 45,