From 1b093eced32ac12f3bbca49d71d816e8607d3257 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 18 Apr 2013 07:27:15 +0000 Subject: [PATCH] - Improved castPermanentInMain1 function. --- res/cardsfolder/t/threads_of_disloyalty.txt | 1 - src/main/java/forge/game/ai/ComputerUtil.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/t/threads_of_disloyalty.txt b/res/cardsfolder/t/threads_of_disloyalty.txt index 46f315de930..d8950e42e1a 100644 --- a/res/cardsfolder/t/threads_of_disloyalty.txt +++ b/res/cardsfolder/t/threads_of_disloyalty.txt @@ -4,7 +4,6 @@ Types:Enchantment Aura A:SP$ Attach | Cost$ 1 U U | ValidTgts$ Creature.cmcLE2 | TgtPrompt$ Select target creature with converted mana cost 2 or less | AILogic$ GainControl K:Enchant creature with converted mana cost 2 or less S:Mode$ Continuous | Affected$ Creature.EnchantedBy | GainControl$ You | Description$ You control enchanted creature. -SVar:PlayMain1:TRUE SVar:Picture:http://www.wizards.com/global/images/magic/general/threads_of_disloyalty.jpg Oracle:Enchant creature with converted mana cost 2 or less\nYou control enchanted creature. SetInfo:BOK Rare \ No newline at end of file diff --git a/src/main/java/forge/game/ai/ComputerUtil.java b/src/main/java/forge/game/ai/ComputerUtil.java index da18884b74c..d70ee984eed 100644 --- a/src/main/java/forge/game/ai/ComputerUtil.java +++ b/src/main/java/forge/game/ai/ComputerUtil.java @@ -826,7 +826,7 @@ public class ComputerUtil { if ("True".equals(card.getSVar("NonStackingEffect")) && card.getController().isCardInPlay(card.getName())) { return false; } - if (card.getSVar("PlayMain1").equals("TRUE")) { + if (card.getSVar("PlayMain1").equals("TRUE") && !card.getController().getCreaturesInPlay().isEmpty()) { return true; } if ((card.isCreature() && (ComputerUtil.hasACardGivingHaste(ai) @@ -837,7 +837,7 @@ public class ComputerUtil { if (card.isEquipment()) { boolean playNow = false; for (Card c : card.getController().getCardsIn(ZoneType.Battlefield)) { - if (c.isEquipment() && ! c.isEquipping()) { + if (c.isEquipment() && !c.isEquipping()) { playNow = false; break; }