github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

ObjectColor objects are mutable, so let's not assign the 'constant' ones to variables

Browse source
This commit is contained in:
Alex W. Jackson 2021-10-29 13:56:48 -04:00
parent 096a2868a9
commit 91176a19dd
13 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/basiclands/Forest.java
View file

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
public class Forest extends BasicLand { public class Forest extends BasicLand {
public Forest(UUID ownerId, CardSetInfo setInfo) { public Forest(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new GreenManaAbility()); super(ownerId, setInfo, new GreenManaAbility());
this.frameColor = ObjectColor.GREEN; this.frameColor.setGreen(true);
} }
public Forest(final Forest land) { public Forest(final Forest land) {

2
Mage/src/main/java/mage/cards/basiclands/Island.java
View file

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
public class Island extends BasicLand { public class Island extends BasicLand {
public Island(UUID ownerId, CardSetInfo setInfo) { public Island(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new BlueManaAbility()); super(ownerId, setInfo, new BlueManaAbility());
this.frameColor = ObjectColor.BLUE; this.frameColor.setBlue(true);
} }
public Island(Island land) { public Island(Island land) {

2
Mage/src/main/java/mage/cards/basiclands/Mountain.java
View file

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
public class Mountain extends BasicLand { public class Mountain extends BasicLand {
public Mountain(UUID ownerId, CardSetInfo setInfo) { public Mountain(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new RedManaAbility()); super(ownerId, setInfo, new RedManaAbility());
this.frameColor = ObjectColor.RED; this.frameColor.setRed(true);
} }
public Mountain(Mountain land) { public Mountain(Mountain land) {

2
Mage/src/main/java/mage/cards/basiclands/Plains.java
View file

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
public class Plains extends BasicLand { public class Plains extends BasicLand {
public Plains(UUID ownerId, CardSetInfo setInfo) { public Plains(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new WhiteManaAbility()); super(ownerId, setInfo, new WhiteManaAbility());
this.frameColor = ObjectColor.WHITE; this.frameColor.setWhite(true);
} }
public Plains(Plains land) { public Plains(Plains land) {

2
Mage/src/main/java/mage/cards/basiclands/Swamp.java
View file

@ -15,7 +15,7 @@ import mage.cards.CardSetInfo;
public class Swamp extends BasicLand { public class Swamp extends BasicLand {
public Swamp(UUID ownerId, CardSetInfo setInfo) { public Swamp(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new BlackManaAbility()); super(ownerId, setInfo, new BlackManaAbility());
this.frameColor = ObjectColor.BLACK; this.frameColor.setBlack(true);
} }
public Swamp(Swamp land) { public Swamp(Swamp land) {

2
Mage/src/main/java/mage/game/permanent/token/DrakeToken.java
View file

@ -18,7 +18,7 @@ public final class DrakeToken extends TokenImpl {
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.subtype.add(SubType.DRAKE); this.subtype.add(SubType.DRAKE);
this.color = ObjectColor.BLUE; this.color.setBlue(true);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);

2
Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java
View file

@ -26,7 +26,7 @@ public final class ElfDruidToken extends TokenImpl {
public ElfDruidToken(String setCode, int tokenType) { public ElfDruidToken(String setCode, int tokenType) {
super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\""); super("Elf Druid", "1/1 green Elf Druid creature token with \"{T}: Add {G}.\"");
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.color = ObjectColor.GREEN; this.color.setGreen(true);
this.subtype.add(SubType.ELF); this.subtype.add(SubType.ELF);
this.subtype.add(SubType.DRUID); this.subtype.add(SubType.DRUID);

5
Mage/src/main/java/mage/game/permanent/token/KrakenHexproofToken.java
View file

@ -16,7 +16,7 @@ public final class KrakenHexproofToken extends TokenImpl {
super("Kraken", "8/8 blue Kraken creature token with hexproof"); super("Kraken", "8/8 blue Kraken creature token with hexproof");
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.subtype.add(SubType.KRAKEN); this.subtype.add(SubType.KRAKEN);
this.color = ObjectColor.BLUE; this.color.setBlue(true);
this.power = new MageInt(8); this.power = new MageInt(8);
this.toughness = new MageInt(8); this.toughness = new MageInt(8);
this.addAbility(HexproofAbility.getInstance()); this.addAbility(HexproofAbility.getInstance());
@ -29,5 +29,4 @@ public final class KrakenHexproofToken extends TokenImpl {
public KrakenHexproofToken copy() { public KrakenHexproofToken copy() {
return new KrakenHexproofToken(this); return new KrakenHexproofToken(this);
} }
}
}

5
Mage/src/main/java/mage/game/permanent/token/KrakenToken.java
View file

@ -15,7 +15,7 @@ public final class KrakenToken extends TokenImpl {
super("Kraken", "8/8 blue Kraken creature token"); super("Kraken", "8/8 blue Kraken creature token");
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.subtype.add(SubType.KRAKEN); this.subtype.add(SubType.KRAKEN);
this.color = ObjectColor.BLUE; this.color.setBlue(true);
this.power = new MageInt(8); this.power = new MageInt(8);
this.toughness = new MageInt(8); this.toughness = new MageInt(8);
} }
@ -27,5 +27,4 @@ public final class KrakenToken extends TokenImpl {
public KrakenToken copy() { public KrakenToken copy() {
return new KrakenToken(this); return new KrakenToken(this);
} }
}
}

5
Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java
View file

@ -17,7 +17,7 @@ public final class MerfolkHexproofToken extends TokenImpl {
super("Merfolk", "1/1 blue Merfolk creature token with hexproof"); super("Merfolk", "1/1 blue Merfolk creature token with hexproof");
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.subtype.add(SubType.MERFOLK); this.subtype.add(SubType.MERFOLK);
this.color = ObjectColor.BLUE; this.color.setBlue(true);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
this.addAbility(HexproofAbility.getInstance()); this.addAbility(HexproofAbility.getInstance());
@ -30,5 +30,4 @@ public final class MerfolkHexproofToken extends TokenImpl {
public MerfolkHexproofToken copy() { public MerfolkHexproofToken copy() {
return new MerfolkHexproofToken(this); return new MerfolkHexproofToken(this);
} }
}
}

2
Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java
View file

@ -17,7 +17,7 @@ public final class RedHumanToken extends TokenImpl {
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.color = ObjectColor.RED; this.color.setRed(true);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
} }

2
Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java
View file

@ -19,7 +19,7 @@ public final class ThatcherHumanToken extends TokenImpl {
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
addAbility(HasteAbility.getInstance()); addAbility(HasteAbility.getInstance());
this.color = ObjectColor.RED; this.color.setRed(true);
this.power = new MageInt(1); this.power = new MageInt(1);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
} }

2
Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java
View file

@ -15,7 +15,7 @@ public final class TitaniaProtectorOfArgothElementalToken extends TokenImpl {
public TitaniaProtectorOfArgothElementalToken() { public TitaniaProtectorOfArgothElementalToken() {
super("Elemental", "5/3 green Elemental creature token"); super("Elemental", "5/3 green Elemental creature token");
this.cardType.add(CardType.CREATURE); this.cardType.add(CardType.CREATURE);
this.color = ObjectColor.GREEN; this.color.setGreen(true);
this.subtype.add(SubType.ELEMENTAL); this.subtype.add(SubType.ELEMENTAL);
this.power = new MageInt(5); this.power = new MageInt(5);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);