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

Refactoring snow mana to allow tracking how much is spent (Ready for Review) (#7406)

Browse source 
* refactored mana methods to WUBRG order

* more WUBRG refactoring

* added new mana tracking object

* fixed code error

* fixed missing mana count

* fixed null pointer exception in tests

* fixed issue with equality

* more equality fixes

* some cosmetic changes to ManaTest

* added copy method to setToMana

* fixed some initialization issues

* fixed serialization issue

* [KHM] Implemented Search for Glory

* updated mana handling to track snow

* added tests for snow mana tracking

* updated implementation of setter methods

* updated paramater to use copy methods

* fixed snow mana test to ensure proper mana tapping

* replaced instances of getPayment with getUsedManaToPay

* updated tracking of snow mana

* reverted snow mana tracking removal

* finished reverting change
This commit is contained in:
Evan Kranzler 2021-01-21 18:13:51 -05:00 • committed by GitHub
parent 5e4b5239d8
commit e5344b7a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 1006 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Mage/src/main/java/mage/ConditionalMana.java
View file

@ -113,25 +113,25 @@ public class ConditionalMana extends Mana implements Serializable {
return;
}
if (filter.isBlack()) {
black = 0;
black.clear();
}
if (filter.isBlue()) {
blue = 0;
blue.clear();
}
if (filter.isWhite()) {
white = 0;
white.clear();
}
if (filter.isGreen()) {
green = 0;
green.clear();
}
if (filter.isRed()) {
red = 0;
red.clear();
}
if (filter.isColorless()) {
colorless = 0;
colorless.clear();
}
if (filter.isGeneric()) {
generic = 0;
generic.clear();
}
}
@ -154,25 +154,25 @@ public class ConditionalMana extends Mana implements Serializable {
public void clear(ManaType manaType) {
switch (manaType) {
case BLACK:
black = 0;
black.clear();
break;
case BLUE:
blue = 0;
blue.clear();
break;
case GREEN:
green = 0;
green.clear();
break;
case RED:
red = 0;
red.clear();
break;
case WHITE:
white = 0;
white.clear();
break;
case GENERIC:
generic = 0;
generic.clear();
break;
case COLORLESS:
colorless = 0;
colorless.clear();
break;
}
}
@ -186,7 +186,7 @@ public class ConditionalMana extends Mana implements Serializable {
}
super.add(mana);
}
public String getConditionString() {
String condStr = "[";
for (Condition condition : conditions) {
@ -198,25 +198,25 @@ public class ConditionalMana extends Mana implements Serializable {
public void add(ManaType manaType, int amount) {
switch (manaType) {
case BLACK:
black += amount;
black.incrementAmount(amount, false);
break;
case BLUE:
blue += amount;
blue.incrementAmount(amount, false);
break;
case GREEN:
green += amount;
green.incrementAmount(amount, false);
break;
case RED:
red += amount;
red.incrementAmount(amount, false);
break;
case WHITE:
white += amount;
white.incrementAmount(amount, false);
break;
case COLORLESS:
colorless += amount;
colorless.incrementAmount(amount, false);
break;
case GENERIC:
generic += amount;
generic.incrementAmount(amount, false);
break;
}
}