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

Merge branch 'master' into 'master'

Browse Source 
Fix the SpellApiToAi assignment for ImmediateTrigger

See merge request core-developers/forge!3572
This commit is contained in:
Michael Kamensky
2021-01-09 06:33:26 +00:00
parent 04e38e0609 c72f099e7b
commit a6f10974c9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/SpellApiToAi.java
View File

@@ -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)

6
forge-gui-mobile-dev/src/forge/app/Main.java
View File

@@ -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/";