diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 8ada8dad3c4..eab6414574f 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -73,6 +73,7 @@ public class Forge implements ApplicationListener { public static KeyInputAdapter keyInputAdapter; private static boolean exited; public boolean needsUpdate = false; + public static boolean advStartup = false; public static boolean safeToClose = true; public static boolean magnify = false; public static boolean magnifyToggle = true; diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index 7cbd4e75445..3e7b671ddc7 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java @@ -42,9 +42,9 @@ import java.util.Map; public static FSkinImage MAIN_DECK_ICON = Forge.hdbuttons ? FSkinImage.HDLIBRARY :FSkinImage.DECKLIST; public static FSkinImage SIDEBOARD_ICON = Forge.hdbuttons ? FSkinImage.HDSIDEBOARD : FSkinImage.FLASHBACK; private static final float HEADER_HEIGHT = Math.round(Utils.AVG_FINGER_HEIGHT * 0.8f); - private static final FileHandle tomeIcon = Config.instance().getFile("ui/tome.png"); - private static Texture tomeIconTexture = tomeIcon.exists() ? new Texture(tomeIcon) : null; - private static FImage CATALOG_ICON = tomeIcon.exists() ? new FImage() { + private static final FileHandle binderIcon = Config.instance().getFile("ui/binder.png"); + private static Texture binderTexture = binderIcon.exists() ? new Texture(binderIcon) : null; + private static FImage CATALOG_ICON = binderIcon.exists() ? new FImage() { @Override public float getWidth() { return 100f; @@ -55,7 +55,7 @@ import java.util.Map; } @Override public void draw(Graphics g, float x, float y, float w, float h) { - g.drawImage(tomeIconTexture, x, y, w, h); + g.drawImage(binderTexture, x, y, w, h); } } : FSkinImage.QUEST_BOX; private static final FileHandle sellIcon = Config.instance().getFile("ui/sell.png"); diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java index d6c930b7877..03b29869492 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java +++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java @@ -111,12 +111,12 @@ public class GameHUD extends Stage { lifePoints = ui.findActor("lifePoints"); mana = ui.findActor("mana"); money = ui.findActor("money"); - mana.setText("0/0"); - lifePoints.setText("20/20"); - AdventurePlayer.current().onLifeChange(() -> lifePoints.setText(AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife())); - AdventurePlayer.current().onManaChange(() -> mana.setText(AdventurePlayer.current().getMana() + "/" + AdventurePlayer.current().getMaxMana())); + mana.setText("{Scale=80%}0/0"); + lifePoints.setText("{Scale=80%}20/20"); + AdventurePlayer.current().onLifeChange(() -> lifePoints.setText("{Scale=80%}"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife())); + AdventurePlayer.current().onManaChange(() -> mana.setText("{Scale=80%}"+AdventurePlayer.current().getMana() + "/" + AdventurePlayer.current().getMaxMana())); - WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText(String.valueOf(AdventurePlayer.current().getGold()))); + WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("{Scale=80%}"+String.valueOf(AdventurePlayer.current().getGold()))); addActor(ui); addActor(miniMapPlayer); console = new Console(); diff --git a/forge-gui-mobile/src/forge/screens/ClosingScreen.java b/forge-gui-mobile/src/forge/screens/ClosingScreen.java index 229adc5463b..f99f301a4ad 100644 --- a/forge-gui-mobile/src/forge/screens/ClosingScreen.java +++ b/forge-gui-mobile/src/forge/screens/ClosingScreen.java @@ -1,6 +1,9 @@ package forge.screens; - +import static forge.assets.FSkin.getDefaultSkinFile; +import static forge.assets.FSkin.getSkinFile; +import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.Texture; import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; @@ -16,6 +19,9 @@ public class ClosingScreen extends FContainer { private StaticAnimation staticAnimation; private boolean restart = false; private boolean drawStatic = false; + private FileHandle adv_logo = getSkinFile("adv_logo.png"); + private FileHandle existingLogo = adv_logo.exists() ? adv_logo : getDefaultSkinFile("adv_logo.png"); + private Texture logo = existingLogo.exists() && Forge.advStartup ? new Texture(existingLogo) : FSkin.getLogo(); public ClosingScreen(boolean restart0) { bgAnimation = new BGAnimation(); @@ -48,13 +54,14 @@ public class ClosingScreen extends FContainer { } g.fillRect(Color.BLACK, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); g.setAlphaComposite(1-percentage); - g.drawImage(Forge.isMobileAdventureMode ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); + g.drawImage(Forge.isMobileAdventureMode || Forge.advStartup ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); g.setAlphaComposite(oldAlpha); float xmod = Forge.getScreenHeight() > 2000 ? 1.5f : 1f; - if (FSkin.getLogo() != null) { - g.drawImage(FSkin.getLogo(), Forge.getScreenWidth()/2 - (FSkin.getLogo().getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (FSkin.getLogo().getHeight()*xmod)/2, FSkin.getLogo().getWidth()*xmod, FSkin.getLogo().getHeight()*xmod); + + if (logo != null) { + g.drawImage(logo, Forge.getScreenWidth()/2 - (logo.getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (logo.getHeight()*xmod)/2, logo.getWidth()*xmod, logo.getHeight()*xmod); } else { - g.drawImage(FSkinImage.LOGO,Forge.getScreenWidth()/2 - (FSkinImage.LOGO.getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (FSkinImage.LOGO.getHeight()*xmod)/1.5f, FSkinImage.LOGO.getWidth()*xmod, FSkinImage.LOGO.getHeight()*xmod); + g.drawImage(FSkinImage.LOGO, Forge.getScreenWidth()/2 - (FSkinImage.LOGO.getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (FSkinImage.LOGO.getHeight()*xmod)/1.5f, FSkinImage.LOGO.getWidth()*xmod, FSkinImage.LOGO.getHeight()*xmod); } } @@ -87,12 +94,12 @@ public class ClosingScreen extends FContainer { } g.fillRect(Color.BLACK, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); g.setAlphaComposite(percentage); - g.drawImage(Forge.isMobileAdventureMode ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); + g.drawImage(Forge.isMobileAdventureMode || Forge.advStartup ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); g.setAlphaComposite(oldAlpha); float xmod = Forge.getScreenHeight() > 2000 ? 1.5f : 1f; xmod *= 21-(20*percentage); - if (FSkin.getLogo() != null) { - g.drawImage(FSkin.getLogo(), Forge.getScreenWidth()/2 - (FSkin.getLogo().getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (FSkin.getLogo().getHeight()*xmod)/2, FSkin.getLogo().getWidth()*xmod, FSkin.getLogo().getHeight()*xmod); + if (logo != null) { + g.drawImage(logo, Forge.getScreenWidth()/2 - (logo.getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (logo.getHeight()*xmod)/2, logo.getWidth()*xmod, logo.getHeight()*xmod); } else { g.drawImage(FSkinImage.LOGO,Forge.getScreenWidth()/2 - (FSkinImage.LOGO.getWidth()*xmod)/2, Forge.getScreenHeight()/2 - (FSkinImage.LOGO.getHeight()*xmod)/1.5f, FSkinImage.LOGO.getWidth()*xmod, FSkinImage.LOGO.getHeight()*xmod); } diff --git a/forge-gui-mobile/src/forge/screens/TransitionScreen.java b/forge-gui-mobile/src/forge/screens/TransitionScreen.java index e8f7af7bed5..72ac3eeaed8 100644 --- a/forge-gui-mobile/src/forge/screens/TransitionScreen.java +++ b/forge-gui-mobile/src/forge/screens/TransitionScreen.java @@ -19,7 +19,7 @@ public class TransitionScreen extends FContainer { Runnable runnable; TextureRegion textureRegion; private String message = ""; - boolean matchTransition, isloading, isIntro, isFadeMusic, advStartup; + boolean matchTransition, isloading, isIntro, isFadeMusic; public TransitionScreen(Runnable proc, TextureRegion screen, boolean enterMatch, boolean loading) { this(proc, screen, enterMatch, loading, false, false); @@ -43,7 +43,7 @@ public class TransitionScreen extends FContainer { isIntro = intro; isFadeMusic = fadeMusic; message = loadingMessage; - advStartup = Forge.selector.equals("Adventure"); + Forge.advStartup = Forge.selector.equals("Adventure"); } public FProgressBar getProgressBar() { @@ -111,7 +111,7 @@ public class TransitionScreen extends FContainer { g.drawWarpImage(textureRegion, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight(), percentage); } else if (isIntro) { if (textureRegion != null) { - if (advStartup) { + if (Forge.advStartup) { g.drawGrayTransitionImage(Forge.getAssets().fallback_skins().get(0), 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight(), false, percentage); g.setAlphaComposite(1-percentage); g.drawImage(textureRegion, 0, 0, Forge.getScreenWidth(), Forge.getScreenHeight()); diff --git a/forge-gui/res/adventure/Shandalar/ui/binder.png b/forge-gui/res/adventure/Shandalar/ui/binder.png new file mode 100644 index 00000000000..2a0c82c9188 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/ui/binder.png differ