diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java index 6a5d65dc9a8..3ab5b87c351 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java +++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java @@ -40,6 +40,7 @@ import forge.adventure.util.*; import forge.adventure.world.WorldSave; import forge.assets.FImageComplex; import forge.assets.FSkin; +import forge.assets.FSkinImage; import forge.card.CardRenderer; import forge.deck.Deck; import forge.deck.DeckProxy; @@ -254,11 +255,11 @@ public class MapStage extends GameStage { Image art = new Image(cardArt.getTextureRegion()); art.setWidth(50); art.setHeight(40); - art.setPosition(10, 43); - Image image = new Image(FSkin.getDeckbox().get(1)); - image.setWidth(70); - image.setHeight(100); - image.setPosition(0, 15); + art.setPosition(8, 40); + Image image = new Image(FSkinImage.ADV_DECKBOX.getTextureRegion()); + image.setWidth(59); + image.setHeight(80); + image.setPosition(4, 7); TypingLabel label = Controls.newTypingLabel("[%125]"+Controls.colorIdToTypingString(DeckProxy.getColorIdentity(deck)).toUpperCase()+"\n[%]"+deck.getName()); label.skipToTheEnd(); label.setAlignment(Align.center); diff --git a/forge-gui-mobile/src/forge/adventure/util/AdventureModes.java b/forge-gui-mobile/src/forge/adventure/util/AdventureModes.java index 2f2231e23bf..fe70d6ed685 100644 --- a/forge-gui-mobile/src/forge/adventure/util/AdventureModes.java +++ b/forge-gui-mobile/src/forge/adventure/util/AdventureModes.java @@ -5,7 +5,7 @@ import com.badlogic.gdx.utils.Array; public enum AdventureModes { Standard("Standard"), Constructed("Constructed"), - Chaos("[RED]Chaos"), + Chaos("[GOLD]Chaos"), Pile("Pile"), Custom("Custom"); diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 49034f19a6c..af04e7142ec 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -233,6 +233,7 @@ public enum FSkinImage implements FImage { //adventure MANASHARD (FSkinProp.ICO_MANASHARD, SourceFile.ADVENTURE), MENU_ADVLOGO (FSkinProp.ICO_ADVLOGO, SourceFile.ADVENTURE), + ADV_DECKBOX (FSkinProp.ICO_ADVDECKBOX, SourceFile.ADVENTURE), //menu icon MENU_GALAXY (FSkinProp.ICO_MENU_GALAXY, SourceFile.ICONS), diff --git a/forge-gui/res/skins/default/sprite_adventure.png b/forge-gui/res/skins/default/sprite_adventure.png index 2b70e44b68d..dbeb82f579d 100644 Binary files a/forge-gui/res/skins/default/sprite_adventure.png and b/forge-gui/res/skins/default/sprite_adventure.png differ diff --git a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java index cd3f65384d6..53e103eab7f 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -270,6 +270,7 @@ public enum FSkinProp { //adventure icons ICO_MANASHARD (new int[] {2, 304, 100, 100}, PropType.ADVENTURE), ICO_ADVLOGO (new int[] {2, 2, 300, 300}, PropType.ADVENTURE), + ICO_ADVDECKBOX (new int[] {108, 356, 189, 242}, PropType.ADVENTURE), //menu icon ICO_MENU_GALAXY (new int[] {0, 1520, 80, 80}, PropType.ICON),