diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index 99c82ed356b..885c9e477c0 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -64,6 +64,7 @@ -keep class io.sentry.android.core.SentryInitProvider -keep class io.sentry.android.core.SentryPerformanceProvider +-keep class com.github.tommyettinger.textra.** { *; } -keep class io.sentry.android.ndk.SentryNdk -keep class io.sentry.Sentry diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index 10d4b791795..0c4ef128e59 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -45,11 +45,6 @@ forge-gui ${project.version} - - com.github.tommyettinger - textratypist - 0.7.0 - com.badlogicgames.gdx gdx diff --git a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java index b291f4a02d0..68e85d2c90d 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java +++ b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java @@ -263,6 +263,12 @@ public class WorldStage extends GameStage implements SaveFileContent { background.setPlayerPos(player.getX(), player.getY()); //spriteGroup.setCullingArea(new Rectangle(player.getX()-getViewport().getWorldHeight()/2,player.getY()-getViewport().getWorldHeight()/2,getViewport().getWorldHeight(),getViewport().getWorldHeight())); super.draw(); + if (WorldSave.getCurrentSave().getPlayer().hasAnnounceFantasy()) { + MapStage.getInstance().showDeckAwardDialog("{BLINK=WHITE;RED}Chaos Mode!{ENDBLINK}\n"+ WorldSave.getCurrentSave().getPlayer().getName()+ "'s Deck: "+ + WorldSave.getCurrentSave().getPlayer().getSelectedDeck().getName()+ + "\nEnemy will use Preconstructed or Random Generated Decks. Genetic AI Decks will be available to some enemies on Hard difficulty.", WorldSave.getCurrentSave().getPlayer().getSelectedDeck()); + WorldSave.getCurrentSave().getPlayer().clearAnnounceFantasy(); + } } @Override @@ -280,12 +286,6 @@ public class WorldStage extends GameStage implements SaveFileContent { } setBounds(WorldSave.getCurrentSave().getWorld().getWidthInPixels(), WorldSave.getCurrentSave().getWorld().getHeightInPixels()); - if (WorldSave.getCurrentSave().getPlayer().hasAnnounceFantasy()) { - MapStage.getInstance().showDeckAwardDialog("{BLINK=WHITE;RED}Chaos Mode!{ENDBLINK}\n"+ WorldSave.getCurrentSave().getPlayer().getName()+ "'s Deck: "+ - WorldSave.getCurrentSave().getPlayer().getSelectedDeck().getName()+ - "\nEnemy will use Preconstructed or Random Generated Decks. Genetic AI Decks will be available to some enemies on Hard difficulty.", WorldSave.getCurrentSave().getPlayer().getSelectedDeck()); - WorldSave.getCurrentSave().getPlayer().clearAnnounceFantasy(); - } } @Override diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 43f21d8d837..8b6a752f2f7 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -40,6 +40,16 @@ forge-ai ${project.version} + + com.github.tommyettinger + textratypist + 2f773002a8 + + + com.github.tommyettinger + regexodus + 0.1.13 + com.thoughtworks.xstream xstream