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

- Added a method to add a color replacement to ManaPool.

Browse Source 
- Fixed a mistype in method name.
This commit is contained in:
Agetian
2014-02-08 16:04:54 +00:00
parent 4b8ed1df67
commit b221b7eaab
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ public class ManaCostBeingPaid {
} }
}; };
return tryPayMana(colorMask, Iterables.filter(unpaidShards.keySet(), predCanBePaid), pool.getPosibleColorUses(colorMask)); return tryPayMana(colorMask, Iterables.filter(unpaidShards.keySet(), predCanBePaid), pool.getPossibleColorUses(colorMask));
} }
/** /**
@@ -306,7 +306,7 @@ public class ManaCostBeingPaid {
}; };
byte inColor = mana.getColorCode(); byte inColor = mana.getColorCode();
byte outColor = pool.getPosibleColorUses(inColor); byte outColor = pool.getPossibleColorUses(inColor);
return tryPayMana(inColor, Iterables.filter(unpaidShards.keySet(), predCanBePaid), outColor); return tryPayMana(inColor, Iterables.filter(unpaidShards.keySet(), predCanBePaid), outColor);
} }

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

@@ -421,18 +421,23 @@ public class ManaPool {
private final byte[] colorConversionMatrix = new byte[6]; private final byte[] colorConversionMatrix = new byte[6];
private static final byte[] identityMatrix = { MagicColor.WHITE, MagicColor.BLUE, MagicColor.BLACK, MagicColor.RED, MagicColor.GREEN, 0 }; private static final byte[] identityMatrix = { MagicColor.WHITE, MagicColor.BLUE, MagicColor.BLACK, MagicColor.RED, MagicColor.GREEN, 0 };
public void addColorReplacement(byte originalColor, byte replacementColor) {
int rowIdx = MagicColor.getIndexOfFirstColor(originalColor);
colorConversionMatrix[rowIdx] |= replacementColor;
}
public void restoreColorReplacements() { public void restoreColorReplacements() {
for(int i = 0; i < colorConversionMatrix.length; i++) for(int i = 0; i < colorConversionMatrix.length; i++)
colorConversionMatrix[i] = identityMatrix[i]; colorConversionMatrix[i] = identityMatrix[i];
} }
public byte getPosibleColorUses(byte color) { public byte getPossibleColorUses(byte color) {
int rowIdx = MagicColor.getIndexOfFirstColor(color); int rowIdx = MagicColor.getIndexOfFirstColor(color);
return colorConversionMatrix[rowIdx < 0 ? identityMatrix.length - 1 : rowIdx]; return colorConversionMatrix[rowIdx < 0 ? identityMatrix.length - 1 : rowIdx];
} }
public boolean canPayForShardWithColor(ManaCostShard shard, byte color) { public boolean canPayForShardWithColor(ManaCostShard shard, byte color) {
byte line = getPosibleColorUses(color); byte line = getPossibleColorUses(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];
if (( line & outColor) != 0 && shard.canBePaidWithManaOfColor(outColor)) if (( line & outColor) != 0 && shard.canBePaidWithManaOfColor(outColor))