diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 0f032461e1c..20201a7e306 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -1122,6 +1122,18 @@ public class ComputerPlayer extends PlayerImpl implements Player { } } } + // pay snow covered mana + for (ActivatedManaAbilityImpl manaAbility : mageObject.getAbilities().getAvailableActivatedManaAbilities(Zone.BATTLEFIELD, game)) { + if (cost instanceof SnowManaCost) { + for (Mana netMana : manaAbility.getNetMana(game)) { + if (cost.testPay(netMana) || spendAnyMana) { + if (activateAbility(manaAbility, game)) { + return true; + } + } + } + } + } // then pay hybrid for (ActivatedManaAbilityImpl manaAbility : mageObject.getAbilities().getAvailableActivatedManaAbilities(Zone.BATTLEFIELD, game)) { if (cost instanceof HybridManaCost) { diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/RimescaleDragonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/RimescaleDragonTest.java index e16d1a01c4b..b9f0a8b0471 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/RimescaleDragonTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/RimescaleDragonTest.java @@ -3,28 +3,25 @@ package org.mage.test.cards.single; import mage.constants.PhaseStep; import mage.constants.Zone; import mage.counters.CounterType; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; /** - * @author JRHerlehy - * Created on 7/27/17. + * @author JRHerlehy Created on 7/27/17. */ public class RimescaleDragonTest extends CardTestPlayerBase { + // Flying + // {2}{S}: Tap target creature and put an ice counter on it. + // Creatures with ice counters on them don't untap during their controllers' untap steps. private final String dragon = "Rimescale Dragon"; private final String snowMountain = "Snow-Covered Mountain"; - private final String thopter = "Ornithopter"; private final String terror = "Terror"; private final String ability = "{2}{S}: Tap target"; - //TODO: Remove ignore flags once snow mana payment is implemented for testing framework. - @Test - @Ignore public void testActivatedAbility() { this.setupTest(); @@ -36,7 +33,6 @@ public class RimescaleDragonTest extends CardTestPlayerBase { } @Test - @Ignore public void testStaticAbility() { this.setupTest(); @@ -48,7 +44,6 @@ public class RimescaleDragonTest extends CardTestPlayerBase { } @Test - @Ignore public void testStaticAbilityEnded() { this.setupTest();