From b20110edb44333f4985e5f2834fee450b763c97e Mon Sep 17 00:00:00 2001 From: Chris H Date: Wed, 23 Jul 2025 20:44:15 -0400 Subject: [PATCH] Code review updatse --- forge-ai/src/main/java/forge/ai/ability/MillAi.java | 2 +- forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java | 7 ++----- .../src/main/java/forge/ai/ability/RollPlanarDiceAi.java | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/MillAi.java b/forge-ai/src/main/java/forge/ai/ability/MillAi.java index 5de87e1378e..55aa319e471 100644 --- a/forge-ai/src/main/java/forge/ai/ability/MillAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/MillAi.java @@ -163,7 +163,7 @@ public class MillAi extends SpellAbilityAi { @Override public AiAbilityDecision chkAIDrawback(SpellAbility sa, Player aiPlayer) { - return targetAI(aiPlayer, sa, true) ? new AiAbilityDecision(100, forge.ai.AiPlayDecision.WillPlay) : new AiAbilityDecision(0, forge.ai.AiPlayDecision.CantPlayAi); + return targetAI(aiPlayer, sa, true) ? new AiAbilityDecision(100, AiPlayDecision.WillPlay) : new AiAbilityDecision(0, AiPlayDecision.CantPlayAi); } @Override diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java index d5f8fb7bdf2..41f3ff02737 100644 --- a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java @@ -151,11 +151,8 @@ public class PumpAllAi extends PumpAiBase { // important to call canPlay first so targets are added if needed AiAbilityDecision decision = canPlayAI(ai, sa); - if (decision == null) { - return mandatory ? new AiAbilityDecision(100, AiPlayDecision.WillPlay) : new AiAbilityDecision(0, AiPlayDecision.CantPlayAi); - } - if (mandatory && decision.decision() != AiPlayDecision.WillPlay) { - return new AiAbilityDecision(100, AiPlayDecision.WillPlay); + if (mandatory && decision.decision().willingToPlay()) { + return new AiAbilityDecision(50, AiPlayDecision.MandatoryPlay); } return decision; } diff --git a/forge-ai/src/main/java/forge/ai/ability/RollPlanarDiceAi.java b/forge-ai/src/main/java/forge/ai/ability/RollPlanarDiceAi.java index 82bbc3a8b76..0d54eefd157 100644 --- a/forge-ai/src/main/java/forge/ai/ability/RollPlanarDiceAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/RollPlanarDiceAi.java @@ -23,8 +23,6 @@ public class RollPlanarDiceAi extends SpellAbilityAi { for (Card c : ai.getGame().getActivePlanes()) { if (willRollOnPlane(ai, c)) { return new AiAbilityDecision(100, AiPlayDecision.WillPlay); - } else { - return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi); } } return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);