From 70ada910be6f2b0c6e2ec7da4d03567dd0123fa8 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 4 Jan 2017 14:35:18 +0000 Subject: [PATCH] - Improved mana source detection for Nykthos, Shrine to Nyx AI. --- forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java index 6fe6112da7e..116f86884ae 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java @@ -57,9 +57,7 @@ public class ChooseColorAi extends SpellAbilityAi { final CardCollectionView cards = ai.getCardsIn(new ZoneType[] {ZoneType.Hand, ZoneType.Battlefield, ZoneType.Command}); List all = ComputerUtilAbility.getSpellAbilities(cards, ai); - // TODO: this is inexact for the purpose, assuming that each land can serve as at least some form of mana source. - // Improve somehow to only account for mana-producing lands and also possibly for other (non-land) mana sources. - int numLands = CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), Predicates.and(CardPredicates.Presets.LANDS, CardPredicates.Presets.UNTAPPED)).size(); + int numLands = CardLists.filter(ComputerUtilMana.getAvailableMana(ai, true), CardPredicates.Presets.UNTAPPED).size(); for (final SpellAbility testSa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, ai)) { ManaCost cost = testSa.getPayCosts().getTotalMana();