From 3865c52974ca40f2f5295140e4610d5ae26d7cf9 Mon Sep 17 00:00:00 2001 From: gp66 Date: Wed, 13 May 2020 15:44:26 -0500 Subject: [PATCH 1/3] missing token images in thb and war --- .../mage/game/permanent/token/DinosaurBeastToken.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java index ad0026141ea..1dd4a66672e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java @@ -10,6 +10,17 @@ package mage.game.permanent.token; */ public final class DinosaurBeastToken extends TokenImpl { + public DinosaurBeastToken() { + super("Dinosaur Beast", "X/X green Dinosaur Beast creature token with trample"); + cardType.add(CardType.CREATURE); + color.setGreen(true); + subtype.add(SubType.DINOSAUR); + subtype.add(SubType.BEAST); + power = new MageInt(0); + toughness = new MageInt(0); + addAbility(TrampleAbility.getInstance()); + } + public DinosaurBeastToken(int xValue) { super("Dinosaur Beast", "X/X green Dinosaur Beast creature token with trample"); cardType.add(CardType.CREATURE); From 162907b9da234b2fd7f0ac764c16f8c14fc60497 Mon Sep 17 00:00:00 2001 From: gp66 Date: Wed, 13 May 2020 15:44:40 -0500 Subject: [PATCH 2/3] missing token images in thb and war --- .../permanent/token/PurphorossInterventionToken.java | 11 +++++++++++ .../java/mage/game/permanent/token/SharkToken.java | 10 ++++++++++ .../java/mage/game/permanent/token/TokenImpl.java | 2 ++ 3 files changed, 23 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java index 2934b37f99b..9c960e786b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java @@ -11,6 +11,17 @@ import mage.constants.SubType; */ public final class PurphorossInterventionToken extends TokenImpl { + public PurphorossInterventionToken() { + super("Elemental", "X/1 red Elemental creature token with trample and haste"); + this.cardType.add(CardType.CREATURE); + this.subtype.add(SubType.ELEMENTAL); + this.color.setRed(true); + this.power = new MageInt(0); + this.toughness = new MageInt(1); + this.addAbility(TrampleAbility.getInstance()); + this.addAbility(HasteAbility.getInstance()); + } + public PurphorossInterventionToken(int power) { super("Elemental", "X/1 red Elemental creature token with trample and haste"); this.cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java index d5c6f6e8182..d71978f0540 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java @@ -10,6 +10,16 @@ import mage.constants.SubType; */ public final class SharkToken extends TokenImpl { + public SharkToken() { + super("Shark", "X/X blue Shark creature token with flying"); + cardType.add(CardType.CREATURE); + color.setBlue(true); + subtype.add(SubType.SHARK); + power = new MageInt(0); + toughness = new MageInt(0); + addAbility(FlyingAbility.getInstance()); + } + public SharkToken(int xValue) { super("Shark", "X/X blue Shark creature token with flying"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 61d10a484fa..922d5893db4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -53,6 +53,8 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { } } + public TokenImpl() { } + public TokenImpl(String name, String description) { this.name = name; this.description = description; From 877abe087a260d0f5a8942ac819eee9cb62579ec Mon Sep 17 00:00:00 2001 From: gp66 Date: Fri, 15 May 2020 12:57:28 -0500 Subject: [PATCH 3/3] removed copy/paste code --- .../mage/game/permanent/token/DinosaurBeastToken.java | 10 +--------- .../permanent/token/PurphorossInterventionToken.java | 10 +--------- .../java/mage/game/permanent/token/SharkToken.java | 9 +-------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java index 1dd4a66672e..17f93178ef6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java @@ -11,16 +11,8 @@ package mage.game.permanent.token; public final class DinosaurBeastToken extends TokenImpl { public DinosaurBeastToken() { - super("Dinosaur Beast", "X/X green Dinosaur Beast creature token with trample"); - cardType.add(CardType.CREATURE); - color.setGreen(true); - subtype.add(SubType.DINOSAUR); - subtype.add(SubType.BEAST); - power = new MageInt(0); - toughness = new MageInt(0); - addAbility(TrampleAbility.getInstance()); + this(0); } - public DinosaurBeastToken(int xValue) { super("Dinosaur Beast", "X/X green Dinosaur Beast creature token with trample"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java index 9c960e786b5..2517b79aa0a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PurphorossInterventionToken.java @@ -12,16 +12,8 @@ import mage.constants.SubType; public final class PurphorossInterventionToken extends TokenImpl { public PurphorossInterventionToken() { - super("Elemental", "X/1 red Elemental creature token with trample and haste"); - this.cardType.add(CardType.CREATURE); - this.subtype.add(SubType.ELEMENTAL); - this.color.setRed(true); - this.power = new MageInt(0); - this.toughness = new MageInt(1); - this.addAbility(TrampleAbility.getInstance()); - this.addAbility(HasteAbility.getInstance()); + this(0); } - public PurphorossInterventionToken(int power) { super("Elemental", "X/1 red Elemental creature token with trample and haste"); this.cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java index d71978f0540..0cbe1538b75 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SharkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SharkToken.java @@ -11,15 +11,8 @@ import mage.constants.SubType; public final class SharkToken extends TokenImpl { public SharkToken() { - super("Shark", "X/X blue Shark creature token with flying"); - cardType.add(CardType.CREATURE); - color.setBlue(true); - subtype.add(SubType.SHARK); - power = new MageInt(0); - toughness = new MageInt(0); - addAbility(FlyingAbility.getInstance()); + this(0); } - public SharkToken(int xValue) { super("Shark", "X/X blue Shark creature token with flying"); cardType.add(CardType.CREATURE);