Merge branch 'emblazoned_golem' into 'master'

Add Emblazoned Golem

See merge request core-developers/forge!4467
This commit is contained in:
Michael Kamensky
2021-04-12 04:17:33 +00:00
6 changed files with 88 additions and 19 deletions

View File

@@ -64,7 +64,10 @@ public enum ManaCostShard {
PR(ManaAtom.RED | ManaAtom.OR_2_LIFE, "P/R", "PR"),
PG(ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "P/G", "PG"),
X(ManaAtom.IS_X, "X");
X(ManaAtom.IS_X, "X"),
// Colored only X, each color can be used to pay for this only once (for Emblazoned Golem)
COLORED_X(ManaAtom.WHITE | ManaAtom.BLUE | ManaAtom.BLACK | ManaAtom.RED | ManaAtom.GREEN | ManaAtom.IS_X, "1");
private final int shard;
@@ -297,7 +300,7 @@ public enum ManaCostShard {
}
public boolean isColor(byte colorCode) {
return (colorCode & this.shard) > 0;
return (colorCode & this.shard) > 0;
}
public boolean canBePaidWithManaOfColor(byte colorCode) {