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

- Some improvements to the Jhoira AI algorithm in MoJhoSto: don't rely on an AI logic (since it's mode-specific).

Browse Source 
- Fixed a crash related to the AI playing MoJhoSto.
This commit is contained in:
Agetian
2018-04-20 06:46:13 +03:00
parent d623119eac
commit d073fb9417
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
View File

@@ -1115,7 +1115,9 @@ public class ComputerUtilMana {
final String xSvar = card.getSVar("X").startsWith("Count$xPaid") ? "PayX" : "X";
if (!sa.getSVar(xSvar).isEmpty() || card.hasSVar(xSvar)) {
if (xSvar.equals("PayX") && card.hasSVar(xSvar)) {
manaToAdd = Integer.parseInt(card.getSVar(xSvar)) * cost.getXcounter(); // X
// X SVar may end up being an empty string when copying a spell with no cost (e.g. Jhoira Avatar)
String xValue = card.getSVar(xSvar);
manaToAdd = xValue.isEmpty() ? 0 : Integer.parseInt(card.getSVar(xSvar)) * cost.getXcounter(); // X
} else {
manaToAdd = AbilityUtils.calculateAmount(card, xSvar, sa) * cost.getXcounter();
}

3
forge-ai/src/main/java/forge/ai/SpecialCardAi.java
View File

@@ -783,7 +783,8 @@ public class SpecialCardAi {
// In MoJhoSto, prefer Jhoira sorcery ability from time to time
if (source.getGame().getRules().hasAppliedVariant(GameType.MoJhoSto)
&& ai.getLandsInPlay().size() >= 3 && MyRandom.percentTrue(50)) {
&& CardLists.filter(ai.getLandsInPlay(), CardPredicates.Presets.UNTAPPED).size() >= 3
&& MyRandom.percentTrue(50)) {
return false;
}

18
forge-ai/src/main/java/forge/ai/ability/PlayAi.java
View File

@@ -53,17 +53,17 @@ public class PlayAi extends SpellAbilityAi {
return false;
}
}
if (game.getRules().hasAppliedVariant(GameType.MoJhoSto) && source.getName().equals("Jhoira of the Ghitu Avatar")) {
// Some additional logic for MoJhoSto: don't spam activate the Instant copying ability all the time
// Can probably be improved, but as random as MoJhoSto already is, probably not a huge deal for now
if ("Instant".equals(sa.getParam("AnySupportedCard")) && MyRandom.percentTrue(80)) {
return false;
}
}
if ("ReplaySpell".equals(logic)) {
return ComputerUtil.targetPlayableSpellCard(ai, cards, sa, sa.hasParam("WithoutManaCost"));
} else if ("JhoiraAvatarInstant".equals(logic)) {
if (game.getRules().hasAppliedVariant(GameType.MoJhoSto)) {
// Some additional logic for MoJhoSto: don't spam activate the Instant copying ability all the time
// Can probably be improved, but as random as MoJhoSto already is, probably not a huge deal for now
if (MyRandom.percentTrue(80)) {
return false;
}
}
}
if (source != null && source.hasKeyword("Hideaway") && source.hasRemembered()) {