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

Fix AI cheating with Evoke

Browse Source
This commit is contained in:
TRT
2023-02-15 17:23:10 +01:00
parent 08804d7827
commit be39a3b35c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -211,10 +211,14 @@ public class AiController {
} }
public boolean checkETBEffects(final Card card, final SpellAbility sa, final ApiType api) { public boolean checkETBEffects(final Card card, final SpellAbility sa, final ApiType api) {
final Player activatingPlayer = sa.getActivatingPlayer();
// for xPaid stuff // for xPaid stuff
card.setCastSA(sa); card.setCastSA(sa);
boolean result = checkETBEffectsPreparedCard(card, sa, api);
card.setCastSA(null);
return result;
}
private boolean checkETBEffectsPreparedCard(final Card card, final SpellAbility sa, final ApiType api) {
final Player activator = sa.getActivatingPlayer();
// Replacement effects // Replacement effects
for (final ReplacementEffect re : card.getReplacementEffects()) { for (final ReplacementEffect re : card.getReplacementEffects()) {
@@ -253,7 +257,7 @@ public class AiController {
SpellAbility exSA = re.getOverridingAbility(); SpellAbility exSA = re.getOverridingAbility();
if (exSA != null) { if (exSA != null) {
exSA = exSA.copy(activatingPlayer); exSA = exSA.copy(activator);
// ETBReplacement uses overriding abilities. // ETBReplacement uses overriding abilities.
// These checks only work if the Executing SpellAbility is an Ability_Sub. // These checks only work if the Executing SpellAbility is an Ability_Sub.
@@ -312,17 +316,15 @@ public class AiController {
continue; continue;
} }
SpellAbility exSA = tr.ensureAbility().copy(activatingPlayer); SpellAbility exSA = tr.ensureAbility().copy(activator);
if (api != null) { if (api != null) {
if (exSA.getApi() != api) { if (exSA.getApi() != api) {
continue; continue;
} }
rightapi = true; rightapi = true;
if (!(exSA instanceof AbilitySub)) { if (!(exSA instanceof AbilitySub) && !ComputerUtilCost.canPayCost(exSA, player, true)) {
if (!ComputerUtilCost.canPayCost(exSA, player, true)) { return false;
return false;
}
} }
} }
@@ -344,7 +346,7 @@ public class AiController {
if (exSA instanceof AbilitySub && !doTrigger(exSA, false)) { if (exSA instanceof AbilitySub && !doTrigger(exSA, false)) {
// AI would not run this trigger if given the chance // AI would not run this trigger if given the chance
if (api == null && card.isCreature() && !ComputerUtilAbility.isFullyTargetable(exSA) && if (api == null && card.isCreature() && !ComputerUtilAbility.isFullyTargetable(exSA) &&
(ComputerUtil.aiLifeInDanger(activatingPlayer, true, 0) || "BadETB".equals(tr.getParam("AILogic")))) { (ComputerUtil.aiLifeInDanger(activator, true, 0) || "BadETB".equals(tr.getParam("AILogic")))) {
// trigger will not run due to lack of targets and we 1. desperately need a creature or 2. are happy about that // trigger will not run due to lack of targets and we 1. desperately need a creature or 2. are happy about that
continue; continue;
} }