From b1908219ffdcdb385c64e6f4e4ca5ae04687f3d9 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail.com>
Date: Wed, 30 Jul 2014 19:36:17 +0400
Subject: [PATCH] Test and fix for prev commit
---
.../test/java/org/mage/test/utils/ManaUtilTest.java | 10 +++++-----
Mage/src/mage/util/ManaUtil.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java b/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java
index e499847ea0..aea37ae344 100644
--- a/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/utils/ManaUtilTest.java
@@ -3,10 +3,7 @@ package org.mage.test.utils;
import mage.abilities.Ability;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.mana.BasicManaAbility;
-import mage.abilities.mana.ManaAbility;
-import mage.abilities.mana.RedManaAbility;
-import mage.abilities.mana.WhiteManaAbility;
+import mage.abilities.mana.*;
import mage.cards.Card;
import mage.cards.repository.CardRepository;
import mage.util.ManaUtil;
@@ -42,7 +39,9 @@ public class ManaUtilTest extends CardTestPlayerBase {
testManaToPayVsLand("{R}{R}{G}{W}{W}", "Steam Vents", 2, 1); // should use {R}
testManaToPayVsLand("{R}{R}{G}{B}{U}", "Temple Garden", 2, 1); // should use {G}
testManaToPayVsLand("{W}{W}{G}{B}{U}", "Sacred Foundry", 2, 1); // should use {W}
- testManaToPayVsLand("{W}{W}{R}{B}{U}", "Overgrown Tomb", 2, 1); // should use {B}
+ testManaToPayVsLand("{W}{W}{R}{B}{U}", "Overgrown Tomb", 2, BlackManaAbility.class); // should use {B}
+ testManaToPayVsLand("{W}{W}{R}{B}{U}", "Swamp", 1, BlackManaAbility.class);
+ testManaToPayVsLand("{W}{W}{R}{B}{U}", "Plains", 1, WhiteManaAbility.class);
testManaToPayVsLand("{1}{R}", "Cavern of Souls", 2, 2); // can't auto choose to pay
testManaToPayVsLand("{2}", "Cavern of Souls", 2, 2); // can't auto choose to pay
@@ -52,6 +51,7 @@ public class ManaUtilTest extends CardTestPlayerBase {
testManaToPayVsLand("{R}{W/R}", "Sacred Foundry", 2, RedManaAbility.class); // auto choose for hybrid mana: we should choose {R}
testManaToPayVsLand("{G}{W/R}", "Sacred Foundry", 2, 1); // auto choose for hybrid mana: choose any
testManaToPayVsLand("{G}{W/R}{W}", "Sacred Foundry", 2, WhiteManaAbility.class); // auto choose for hybrid mana: choose {W}
+ testManaToPayVsLand("{W/B}{W/B}", "Swamp", 1, BlackManaAbility.class);
// we can't auto choose here:
// let say we auto choose {R}, then we have to use it to pay for {R} not {W/R} (as {W/R} is more generic cost)
diff --git a/Mage/src/mage/util/ManaUtil.java b/Mage/src/mage/util/ManaUtil.java
index 8b3f8e133b..7dcb73a38b 100644
--- a/Mage/src/mage/util/ManaUtil.java
+++ b/Mage/src/mage/util/ManaUtil.java
@@ -75,13 +75,13 @@ public class ManaUtil {
chosenManaAbilityForHybrid = checkRedMana(symbols, countColored, ability);
chosenManaAbility = chosenManaAbilityForHybrid != null ? chosenManaAbilityForHybrid : chosenManaAbility;
- checkBlackMana(symbols, countColored, ability);
+ chosenManaAbilityForHybrid = checkBlackMana(symbols, countColored, ability);
chosenManaAbility = chosenManaAbilityForHybrid != null ? chosenManaAbilityForHybrid : chosenManaAbility;
- checkBlueMana(symbols, countColored, ability);
+ chosenManaAbilityForHybrid = checkBlueMana(symbols, countColored, ability);
chosenManaAbility = chosenManaAbilityForHybrid != null ? chosenManaAbilityForHybrid : chosenManaAbility;
- checkWhiteMana(symbols, countColored, ability);
+ chosenManaAbilityForHybrid = checkWhiteMana(symbols, countColored, ability);
chosenManaAbility = chosenManaAbilityForHybrid != null ? chosenManaAbilityForHybrid : chosenManaAbility;
- checkGreenMana(symbols, countColored, ability);
+ chosenManaAbilityForHybrid = checkGreenMana(symbols, countColored, ability);
chosenManaAbility = chosenManaAbilityForHybrid != null ? chosenManaAbilityForHybrid : chosenManaAbility;
}