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

- Minor change to the code.

Browse Source
This commit is contained in:
Michael Kamensky
2021-10-05 07:04:43 +03:00
parent 9ced0e0d76
commit baff2a5486
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/ability/FightAi.java
View File

@@ -60,13 +60,14 @@ public class FightAi extends SpellAbilityAi {
// assumes the triggered card belongs to the ai
if (sa.hasParam("Defined")) {
CardCollection fighter1List = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa);
if (fighter1List.isEmpty()) {
if ("ChosenAsTgt".equals(sa.getParam("AILogic")) && sa.getRootAbility().getTargetCard() != null) {
if (fighter1List.isEmpty()) {
fighter1List.add(sa.getRootAbility().getTargetCard());
} else {
return true; // FIXME: shouldn't this return "false" if nothing found?
}
}
if (fighter1List.isEmpty()) {
return true; // FIXME: shouldn't this return "false" if nothing found?
}
Card fighter1 = fighter1List.get(0);
for (Card humanCreature : humCreatures) {
if (ComputerUtilCombat.getDamageToKill(humanCreature) <= fighter1.getNetPower()

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

@@ -55,12 +55,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/";
@@ -154,12 +154,14 @@ public class Main {
public void restart() {
if (RestartUtil.prepareForRestart()) {
Gdx.app.exit();
System.exit(0);
}
}
@Override
public void exit() {
Gdx.app.exit(); //can just use Gdx.app.exit for desktop
System.exit(0);
}
@Override