From c72f099e7b40d5433b7fbed9efa3924339c36687 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sat, 9 Jan 2021 09:32:11 +0300 Subject: [PATCH] - Fix the SpellApiToAi assignment for ImmediateTrigger --- forge-ai/src/main/java/forge/ai/SpellApiToAi.java | 2 +- forge-gui-mobile-dev/src/forge/app/Main.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/SpellApiToAi.java b/forge-ai/src/main/java/forge/ai/SpellApiToAi.java index 7991dbd62ab..b0f70e96b60 100644 --- a/forge-ai/src/main/java/forge/ai/SpellApiToAi.java +++ b/forge-ai/src/main/java/forge/ai/SpellApiToAi.java @@ -91,7 +91,7 @@ public enum SpellApiToAi { .put(ApiType.GenericChoice, ChooseGenericEffectAi.class) .put(ApiType.Goad, GoadAi.class) .put(ApiType.Haunt, HauntAi.class) - .put(ApiType.ImmediateTrigger, DelayedTriggerAi.class) + .put(ApiType.ImmediateTrigger, ImmediateTriggerAi.class) .put(ApiType.Investigate, InvestigateAi.class) .put(ApiType.LoseLife, LifeLoseAi.class) .put(ApiType.LosesGame, GameLossAi.class) diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index ce513cb5f5c..2eb97dc4947 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -43,12 +43,12 @@ public class Main { } // Set this to "true" to make the mobile game port run as a full-screen desktop application - boolean desktopMode = cmd.hasOption("fullscreen"); + boolean desktopMode = true; // cmd.hasOption("fullscreen"); // Set this to the location where you want the mobile game port to look for assets when working as a full-screen desktop application // (uncomment the bottom version and comment the top one to load the res folder from the current folder the .jar is in if you would // like to make the game load from a desktop game folder configuration). - String desktopModeAssetsDir = "../forge-gui/"; - //String desktopModeAssetsDir = "./"; + //String desktopModeAssetsDir = "../forge-gui/"; + String desktopModeAssetsDir = "./"; // Assets directory used when the game fully emulates smartphone/tablet mode (desktopMode = false), useful when debugging from IDE String assetsDir = AssetsDownloader.SHARE_DESKTOP_ASSETS ? "../forge-gui/" : "testAssets/";