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

enable pixelmana atlas

Browse Source
This commit is contained in:
Anthony Calosa
2023-02-23 15:33:32 +08:00
parent 201ef72585
commit 52271e151a
8 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/adventure/stage/MapStage.java
View File

@@ -259,7 +259,7 @@ public class MapStage extends GameStage {
image.setWidth(70); image.setWidth(70);
image.setHeight(100); image.setHeight(100);
image.setPosition(0, 15); 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.skipToTheEnd();
label.setAlignment(Align.center); label.setAlignment(Align.center);
label.setPosition(34, 20); 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(group).height(100).width(65).center();
dialog.getContentTable().add().row(); dialog.getContentTable().add().row();
} else { } 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.skipToTheEnd();
label.setAlignment(Align.center); label.setAlignment(Align.center);
dialog.getContentTable().add(label).align(Align.center); dialog.getContentTable().add(label).align(Align.center);

2
forge-gui-mobile/src/forge/adventure/util/Controls.java
View File

@@ -362,6 +362,7 @@ public class Controls {
public static String colorIdToTypingString(ColorSet color) public static String colorIdToTypingString(ColorSet color)
{ {
//NOTE converting to uppercase will use pixelmana.atlas, higher quality pixel mana symbol.
String colorId=""; String colorId="";
if(color.hasWhite()) if(color.hasWhite())
colorId+="[+w]"; colorId+="[+w]";
@@ -408,6 +409,7 @@ public class Controls {
{ {
textraFont=new Font(getSkin().getFont("default"), 0f, 1.5f, 0f, 0f); 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.ITEMS_ATLAS));
textraFont.addAtlas(Config.instance().getAtlas(Paths.PIXELMANA_ATLAS));
} }
return textraFont; return textraFont;
} }

1
forge-gui-mobile/src/forge/adventure/util/Paths.java
View File

@@ -13,6 +13,7 @@ public class Paths {
public static final String SKIN = "skin/ui_skin.json"; public static final String SKIN = "skin/ui_skin.json";
public static final String ITEMS_EQUIP = "skin/equip.png"; public static final String ITEMS_EQUIP = "skin/equip.png";
public static final String ITEMS_ATLAS = "sprites/items.atlas"; 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 KEYS_ATLAS = "skin/keys.atlas";
public static final String COLOR_FRAME_ATLAS = "ui/color_frames.atlas"; public static final String COLOR_FRAME_ATLAS = "ui/color_frames.atlas";
public static final String ARENA_ATLAS = "ui/arena.atlas"; public static final String ARENA_ATLAS = "ui/arena.atlas";

2
forge-gui/res/adventure/Shandalar/config.json
View File

@@ -5,7 +5,7 @@
"playerBaseSpeed": 32, "playerBaseSpeed": 32,
"minDeckSize": 40, "minDeckSize": 40,
"colorIds":["W","U","B","R","G"], "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": [ "restrictedCards": [
"Black Lotus", "Black Lotus",
"Mox Emerald", "Mox Emerald",

12
forge-gui/res/adventure/Shandalar/sprites/pixelmana.atlas
View File

@@ -3,42 +3,42 @@ size: 374,64
format: RGBA8888 format: RGBA8888
filter: Nearest,Nearest filter: Nearest,Nearest
repeat: none repeat: none
pixB B
rotate: false rotate: false
xy: 2, 2 xy: 2, 2
size: 60, 60 size: 60, 60
orig: 60, 60 orig: 60, 60
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pixC C
rotate: false rotate: false
xy: 64, 2 xy: 64, 2
size: 60, 60 size: 60, 60
orig: 60, 60 orig: 60, 60
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pixG G
rotate: false rotate: false
xy: 126, 2 xy: 126, 2
size: 60, 60 size: 60, 60
orig: 60, 60 orig: 60, 60
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pixR R
rotate: false rotate: false
xy: 188, 2 xy: 188, 2
size: 60, 60 size: 60, 60
orig: 60, 60 orig: 60, 60
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pixU U
rotate: false rotate: false
xy: 250, 2 xy: 250, 2
size: 60, 60 size: 60, 60
orig: 60, 60 orig: 60, 60
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pixW W
rotate: false rotate: false
xy: 312, 2 xy: 312, 2
size: 60, 60 size: 60, 60

BIN
forge-gui/res/adventure/Shandalar/sprites/pixelmana.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 27 KiB

12
forge-gui/res/adventure/Shandalar/ui/spellsmith.json
View File

@@ -74,7 +74,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BBlack", "name": "BBlack",
"text": "[+b]", "text": "[+B]",
"x": 15, "x": 15,
"y": 120, "y": 120,
"width": 45, "width": 45,
@@ -84,7 +84,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BBlue", "name": "BBlue",
"text": "[+u]", "text": "[+U]",
"x": 65, "x": 65,
"y": 120, "y": 120,
"width": 45, "width": 45,
@@ -94,7 +94,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BGreen", "name": "BGreen",
"text": "[+g]", "text": "[+G]",
"x": 115, "x": 115,
"y": 120, "y": 120,
"width": 45, "width": 45,
@@ -104,7 +104,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BRed", "name": "BRed",
"text": "[+r]", "text": "[+R]",
"x": 165, "x": 165,
"y": 120, "y": 120,
"width": 45, "width": 45,
@@ -114,7 +114,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BWhite", "name": "BWhite",
"text": "[+w]", "text": "[+W]",
"x": 215, "x": 215,
"y": 120, "y": 120,
"width": 45, "width": 45,
@@ -124,7 +124,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BColorless", "name": "BColorless",
"text": "[+c]", "text": "[+C]",
"x": 265, "x": 265,
"y": 120, "y": 120,
"width": 45, "width": 45,

12
forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json
View File

@@ -74,7 +74,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BBlack", "name": "BBlack",
"text": "[+b]", "text": "[+B]",
"x": 58, "x": 58,
"y": 290, "y": 290,
"width": 45, "width": 45,
@@ -84,7 +84,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BBlue", "name": "BBlue",
"text": "[+u]", "text": "[+U]",
"x": 113, "x": 113,
"y": 290, "y": 290,
"width": 45, "width": 45,
@@ -94,7 +94,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BGreen", "name": "BGreen",
"text": "[+g]", "text": "[+G]",
"x": 168, "x": 168,
"y": 290, "y": 290,
"width": 45, "width": 45,
@@ -104,7 +104,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BRed", "name": "BRed",
"text": "[+r]", "text": "[+R]",
"x": 58, "x": 58,
"y": 320, "y": 320,
"width": 45, "width": 45,
@@ -114,7 +114,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BWhite", "name": "BWhite",
"text": "[+w]", "text": "[+W]",
"x": 113, "x": 113,
"y": 320, "y": 320,
"width": 45, "width": 45,
@@ -124,7 +124,7 @@
"type": "TextButton", "type": "TextButton",
"selectable": true, "selectable": true,
"name": "BColorless", "name": "BColorless",
"text": "[+c]", "text": "[+C]",
"x": 168, "x": 168,
"y": 320, "y": 320,
"width": 45, "width": 45,