From 053726519c929029df1ad0cf4f04c6a24d7f10fa Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 27 May 2018 17:29:57 +0300 Subject: [PATCH] - Simple AI logic extension to make the Partner With commanders AI-playable. --- forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java | 4 +++- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java index 2eb6f30a6f2..ab2ef609098 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -152,7 +152,9 @@ public class ChangeZoneAi extends SpellAbilityAi { return doReturnCommanderLogic(sa, aiPlayer); } - if ("IfNotBuffed".equals(sa.getParam("AILogic"))) { + if ("Always".equals(sa.getParam("AILogic"))) { + return true; + } else if ("IfNotBuffed".equals(sa.getParam("AILogic"))) { if (ComputerUtilCard.isUselessCreature(aiPlayer, sa.getHostCard())) { return true; // debuffed by opponent's auras to the level that it becomes useless } diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 3e085aaad31..f75817ea098 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2722,7 +2722,7 @@ public class CardFactoryUtil { final String effect = "DB$ ChangeZone | ValidTgts$ Player | TgtPrompt$ Select target player" + " | Origin$ Library | Destination$ Hand | ChangeType$ Card.named" + k[1] + - " | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | Optional$ Targeted"; + " | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | Optional$ Targeted | AILogic$ Always"; final Trigger trigger = TriggerHandler.parseTrigger(trigStr, card, intrinsic); trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));