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

renamed add/subtract methods, fixed bug with colorless payment

Browse Source
This commit is contained in:
Maxmtg
2014-02-08 12:56:54 +00:00
parent 715ee1f9ab
commit 676fee32c6
6 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/mana/ManaAtom.java
View File

@@ -4,7 +4,7 @@ import forge.card.MagicColor;
/** A bitmask to represent any mana symbol as an integer. */ /** A bitmask to represent any mana symbol as an integer. */
public abstract class ManaAtom { public abstract class ManaAtom {
public static final int COLORLESS = 1 << 7; public static final int COLORLESS = 1 << 6;
/** The Constant WHITE. */ /** The Constant WHITE. */
public static final int WHITE = MagicColor.WHITE; public static final int WHITE = MagicColor.WHITE;

2
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -697,7 +697,7 @@ public class Cost {
for (final CostPart part : cost1.getCostParts()) { for (final CostPart part : cost1.getCostParts()) {
if (part instanceof CostPartMana && costPart2 != null) { if (part instanceof CostPartMana && costPart2 != null) {
ManaCostBeingPaid oldManaCost = new ManaCostBeingPaid(((CostPartMana) part).getMana()); ManaCostBeingPaid oldManaCost = new ManaCostBeingPaid(((CostPartMana) part).getMana());
oldManaCost.combineManaCost(costPart2.getMana()); oldManaCost.addManaCost(costPart2.getMana());
String r2 = costPart2.getRestiction(); String r2 = costPart2.getRestiction();
String r1 = ((CostPartMana) part).getRestiction(); String r1 = ((CostPartMana) part).getRestiction();
String r = r1 == null ? r2 : ( r2 == null ? r1 : r1 + "." + r2); String r = r1 == null ? r2 : ( r2 == null ? r1 : r1 + "." + r2);

43
forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
View File

@@ -18,10 +18,12 @@
package forge.game.mana; package forge.game.mana;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@@ -279,7 +281,7 @@ public class ManaCostBeingPaid {
} }
}; };
return tryPayMana(colorMask, Iterables.filter(unpaidShards.keySet(), predCanBePaid)); return tryPayMana(colorMask, Iterables.filter(unpaidShards.keySet(), predCanBePaid), pool.getPosibleColorUses(colorMask));
} }
/** /**
@@ -303,27 +305,31 @@ public class ManaCostBeingPaid {
} }
}; };
return tryPayMana(mana.getColorCode(), Iterables.filter(unpaidShards.keySet(), predCanBePaid)); byte inColor = mana.getColorCode();
byte outColor = pool.getPosibleColorUses(inColor);
return tryPayMana(inColor, Iterables.filter(unpaidShards.keySet(), predCanBePaid), outColor);
} }
private boolean tryPayMana(final byte colorMask, Iterable<ManaCostShard> payableShards) { private boolean tryPayMana(final byte colorMask, Iterable<ManaCostShard> payableShards, byte possibleUses) {
ManaCostShard choice = null; Set<ManaCostShard> choice = EnumSet.noneOf(ManaCostShard.class);
int priority = Integer.MIN_VALUE;
for (ManaCostShard toPay : payableShards) { for (ManaCostShard toPay : payableShards) {
// if m is a better to pay than choice // if m is a better to pay than choice
if (choice == null) { int toPayPriority = getPayPriority(toPay, possibleUses);
choice = toPay; if (toPayPriority > priority) {
continue; priority = toPayPriority;
} choice.clear();
if (isFirstChoiceBetter(toPay, choice, colorMask)) {
choice = toPay;
} }
if ( toPayPriority == priority )
choice.add(toPay);
} // for } // for
if (choice == null) { if (choice.isEmpty()) {
return false; return false;
} }
decreaseShard(choice, 1); ManaCostShard chosenShard = Iterables.getFirst(choice, null);
if (choice.isOr2Colorless() && choice.getColorMask() != colorMask) { decreaseShard(chosenShard, 1);
if (chosenShard.isOr2Colorless() && ( 0 != (chosenShard.getColorMask() & possibleUses) )) {
this.increaseColorlessMana(1); this.increaseColorlessMana(1);
} }
@@ -331,9 +337,6 @@ public class ManaCostBeingPaid {
return true; return true;
} }
private boolean isFirstChoiceBetter(ManaCostShard s1, ManaCostShard s2, byte colorMask) {
return getPayPriority(s1, colorMask) > getPayPriority(s2, colorMask);
}
private int getPayPriority(ManaCostShard bill, byte paymentColor) { private int getPayPriority(ManaCostShard bill, byte paymentColor) {
if (bill == ManaCostShard.COLORLESS) { if (bill == ManaCostShard.COLORLESS) {
@@ -342,7 +345,7 @@ public class ManaCostBeingPaid {
if (bill.isMonoColor()) { if (bill.isMonoColor()) {
if (bill.isOr2Colorless()) { if (bill.isOr2Colorless()) {
return bill.getColorMask() == paymentColor ? 9 : 4; return (bill.getColorMask() & paymentColor & MagicColor.ALL_COLORS) != 0? 9 : 4;
} }
if (!bill.isPhyrexian()) { if (!bill.isPhyrexian()) {
return 10; return 10;
@@ -362,7 +365,7 @@ public class ManaCostBeingPaid {
} }
public final void combineManaCost(final ManaCost extra) { public final void addManaCost(final ManaCost extra) {
for (ManaCostShard shard : extra) { for (ManaCostShard shard : extra) {
if (shard == ManaCostShard.X) { if (shard == ManaCostShard.X) {
cntX++; cntX++;
@@ -374,7 +377,7 @@ public class ManaCostBeingPaid {
increaseColorlessMana(extra.getGenericCost()); increaseColorlessMana(extra.getGenericCost());
} }
public final void determineManaCostDifference(final ManaCost subThisManaCost) { public final void subtractManaCost(final ManaCost subThisManaCost) {
for (ManaCostShard shard : subThisManaCost) { for (ManaCostShard shard : subThisManaCost) {
if (shard == ManaCostShard.X) { if (shard == ManaCostShard.X) {
cntX--; cntX--;
@@ -607,7 +610,7 @@ public class ManaCostBeingPaid {
return; return;
} }
determineManaCostDifference(toSac.getManaCost()); subtractManaCost(toSac.getManaCost());
sa.setSacrificedAsOffering(toSac); sa.setSacrificedAsOffering(toSac);
toSac.setUsedToPay(true); //stop it from interfering with mana input toSac.setUsedToPay(true); //stop it from interfering with mana input

8
forge-game/src/main/java/forge/game/mana/ManaPool.java
View File

@@ -427,9 +427,13 @@ public class ManaPool {
colorConversionMatrix[i] = identityMatrix[i]; colorConversionMatrix[i] = identityMatrix[i];
} }
public boolean canPayForShardWithColor(ManaCostShard shard, byte color) { public byte getPosibleColorUses(byte color) {
int rowIdx = MagicColor.getIndexOfFirstColor(color); int rowIdx = MagicColor.getIndexOfFirstColor(color);
byte line = colorConversionMatrix[rowIdx < 0 ? identityMatrix.length - 1 : rowIdx]; return colorConversionMatrix[rowIdx < 0 ? identityMatrix.length - 1 : rowIdx];
}
public boolean canPayForShardWithColor(ManaCostShard shard, byte color) {
byte line = getPosibleColorUses(color);
for(int i = 0; i < MagicColor.NUMBER_OR_COLORS; i++) for(int i = 0; i < MagicColor.NUMBER_OR_COLORS; i++)
{ {
byte outColor = MagicColor.WUBRG[i]; byte outColor = MagicColor.WUBRG[i];

7
forge-gui/src/main/java/forge/gui/input/InputPayMana.java
View File

@@ -11,6 +11,7 @@ import forge.FThreads;
import forge.ai.ComputerUtilMana; import forge.ai.ComputerUtilMana;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
import forge.card.mana.ManaCostShard; import forge.card.mana.ManaCostShard;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.ApiType; import forge.game.ability.ApiType;
@@ -110,8 +111,8 @@ public abstract class InputPayMana extends InputSyncronizedBase {
if (manaCost.isAnyPartPayableWith(color, player.getManaPool())) { colorCanUse |= color; } if (manaCost.isAnyPartPayableWith(color, player.getManaPool())) { colorCanUse |= color; }
if (manaCost.needsColor(color, player.getManaPool())) { colorNeeded |= color; } if (manaCost.needsColor(color, player.getManaPool())) { colorNeeded |= color; }
} }
if (manaCost.isAnyPartPayableWith(MagicColor.COLORLESS, player.getManaPool())) if (manaCost.isAnyPartPayableWith((byte) ManaAtom.COLORLESS, player.getManaPool()))
colorCanUse |= MagicColor.COLORLESS; colorCanUse |= ManaAtom.COLORLESS;
if ( 0 == colorCanUse ) // no mana cost or something if ( 0 == colorCanUse ) // no mana cost or something
return; return;
@@ -266,6 +267,8 @@ public abstract class InputPayMana extends InputSyncronizedBase {
if (0 != (neededColor & MagicColor.fromName(color))) { if (0 != (neededColor & MagicColor.fromName(color))) {
return true; return true;
} }
if( (neededColor & ManaAtom.COLORLESS) != 0)
return true;
} }
} }
return false; return false;

2
forge-gui/src/main/java/forge/gui/player/HumanPlay.java
View File

@@ -726,7 +726,7 @@ public class HumanPlay {
if ( timesMultikicked > 0 && ability.isAnnouncing("Multikicker")) { if ( timesMultikicked > 0 && ability.isAnnouncing("Multikicker")) {
ManaCost mkCost = ability.getMultiKickerManaCost(); ManaCost mkCost = ability.getMultiKickerManaCost();
for(int i = 0; i < timesMultikicked; i++) for(int i = 0; i < timesMultikicked; i++)
toPay.combineManaCost(mkCost); toPay.addManaCost(mkCost);
} }
InputPayMana inpPayment; InputPayMana inpPayment;