Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fix omniscience effect for colorless mana.

Browse source 
Also unified the tests for omniscience into a single file, and
put the effect into a single class so that Tamiyo and Omniscience
can share implementations.
This commit is contained in:
Nathaniel Brandes 2017-03-04 23:04:11 -08:00
parent be82f3bf33
commit 1d3ebb749d
6 changed files with 179 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -31,6 +31,9 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.function.Supplier;
import mage.MageObject;
import mage.Mana;
import mage.ObjectColor;
@ -271,12 +274,12 @@ public final class CardUtil {
reduceMana.add(manaCost.getMana());
}
}
ManaCosts<ManaCost> manaCostToCheckForColorless = new ManaCostsImpl<>();
// subtract colored mana
ManaCosts<ManaCost> manaCostToCheckForGeneric = new ManaCostsImpl<>();
// subtract non-generic mana
for (ManaCost newManaCost : previousCost) {
Mana mana = newManaCost.getMana();
if (!(newManaCost instanceof MonoHybridManaCost) && mana.getGeneric() > 0) {
manaCostToCheckForColorless.add(newManaCost);
manaCostToCheckForGeneric.add(newManaCost);
continue;
}
boolean hybridMana = newManaCost instanceof HybridManaCost;
@ -340,6 +343,17 @@ public final class CardUtil {
continue;
}
}
if(mana.getColorless() > 0 && reduceMana.getColorless() > 0) {
if(reduceMana.getColorless() > mana.getColorless()) {
reduceMana.setColorless(reduceMana.getColorless() - mana.getColorless());
mana.setColorless(0);
} else {
mana.setColorless(mana.getColorless() - reduceMana.getColorless());
reduceMana.setColorless(0);
}
}
if (mana.count() > 0) {
if (newManaCost instanceof MonoHybridManaCost) {
if (mana.count() == 2) {
@ -347,7 +361,7 @@ public final class CardUtil {
continue;
}
}
manaCostToCheckForColorless.add(newManaCost);
manaCostToCheckForGeneric.add(newManaCost);
}
}
@ -360,7 +374,7 @@ public final class CardUtil {
reduceAmount = reduceMana.getGeneric();
}
if (reduceAmount > 0) {
for (ManaCost newManaCost : manaCostToCheckForColorless) {
for (ManaCost newManaCost : manaCostToCheckForGeneric) {
Mana mana = newManaCost.getMana();
if (mana.getGeneric() == 0 || reduceAmount == 0) {
adjustedCost.add(newManaCost);
@ -387,7 +401,7 @@ public final class CardUtil {
}
}
} else {
adjustedCost.addAll(manaCostToCheckForColorless);
adjustedCost.addAll(manaCostToCheckForGeneric);
}
if (adjustedCost.isEmpty()) {
adjustedCost.add(new GenericManaCost(0)); // neede to check if cost was reduced to 0
@ -397,6 +411,10 @@ public final class CardUtil {
spellAbility.getManaCostsToPay().addAll(adjustedCost);
}
private void reduceMana(Mana mana, Mana reduceMana, Supplier<Integer> manaAmountSupplier, Consumer<Integer> manaAmountConsumer) {
}
/**
* Returns function that copies params\abilities from one card to
* {@link Token}.