external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed payment for cards with 2/Color (eg Reaper King)

Browse Source
This commit is contained in:
Maxmtg
2013-01-25 00:56:35 +00:00
parent 17cb6393ac
commit 04e6bdd69a
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/forge/card/mana/ManaCostBeingPaid.java
View File

@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import forge.Constant; import forge.Constant;
import forge.card.MagicColor;
import forge.card.SpellManaCost; import forge.card.SpellManaCost;
import forge.control.input.InputPayManaCostUtil; import forge.control.input.InputPayManaCostUtil;
@@ -392,7 +393,7 @@ public class ManaCostBeingPaid {
System.out.println("ManaCost : addMana() error, mana not needed - " + mana); System.out.println("ManaCost : addMana() error, mana not needed - " + mana);
//throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana); //throw new RuntimeException("ManaCost : addMana() error, mana not needed - " + mana);
} }
byte colorMask = MagicColor.fromName(mana);
ManaCostShard choice = null; ManaCostShard choice = null;
for (ManaCostShard toPay : unpaidShards.keySet()) { for (ManaCostShard toPay : unpaidShards.keySet()) {
if (canBePaidWith(toPay, mana)) { if (canBePaidWith(toPay, mana)) {
@@ -401,7 +402,7 @@ public class ManaCostBeingPaid {
choice = toPay; choice = toPay;
continue; continue;
} }
if (isFirstChoiceBetter(toPay, choice)) { if (isFirstChoiceBetter(toPay, choice, colorMask)) {
choice = toPay; choice = toPay;
} }
} }
@@ -411,7 +412,7 @@ public class ManaCostBeingPaid {
} }
decreaseShard(choice, 1); decreaseShard(choice, 1);
if (choice.isOr2Colorless() && !this.isColor(mana)) { if (choice.isOr2Colorless() && choice.getColorMask() != colorMask ) {
this.increaseColorlessMana(1); this.increaseColorlessMana(1);
} }
@@ -425,20 +426,20 @@ public class ManaCostBeingPaid {
return true; return true;
} }
private boolean isFirstChoiceBetter(ManaCostShard s1, ManaCostShard s2) { private boolean isFirstChoiceBetter(ManaCostShard s1, ManaCostShard s2, byte b) {
return getPayPriority(s1) > getPayPriority(s2); return getPayPriority(s1, b) > getPayPriority(s2, b);
} }
private int getPayPriority(ManaCostShard s1) { private int getPayPriority(ManaCostShard bill, byte paymentColor) {
if (s1 == ManaCostShard.COLORLESS) { if (bill == ManaCostShard.COLORLESS) {
return 0; return 0;
} }
if (s1.isMonoColor()) { if (bill.isMonoColor()) {
if (s1.isOr2Colorless()) { if (bill.isOr2Colorless()) {
return 9; return bill.getColorMask() == paymentColor ? 9 : 4;
} }
if (!s1.isPhyrexian()) { if (!bill.isPhyrexian()) {
return 10; return 10;
} }
return 8; return 8;
@@ -486,7 +487,7 @@ public class ManaCostBeingPaid {
choice = toPay; choice = toPay;
continue; continue;
} }
if (isFirstChoiceBetter(toPay, choice)) { if (isFirstChoiceBetter(toPay, choice, mana.getColorCode())) {
choice = toPay; choice = toPay;
} }
} }
@@ -497,10 +498,10 @@ public class ManaCostBeingPaid {
String manaColor = mana.getColor(); String manaColor = mana.getColor();
if (choice.isOr2Colorless() && !this.isColor(InputPayManaCostUtil.getShortColorString(manaColor))) { decreaseShard(choice, 1);
if (choice.isOr2Colorless() && choice.getColorMask() != mana.getColorCode() ) {
this.increaseColorlessMana(1); this.increaseColorlessMana(1);
} }
decreaseShard(choice, 1);
if (!mana.isColor(Constant.Color.COLORLESS)) { if (!mana.isColor(Constant.Color.COLORLESS)) {
if (this.sunburstMap.containsKey(manaColor)) { if (this.sunburstMap.containsKey(manaColor)) {