diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java index 14ece56096..a73ed21c14 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java @@ -358,7 +358,9 @@ public class ScryfallImageSupportTokens { put("IKO/Dinosaur Beast", "https://api.scryfall.com/cards/tiko/11/en?format=image"); put("IKO/Dinosaur", "https://api.scryfall.com/cards/tiko/8/en?format=image"); put("IKO/Feather", "https://api.scryfall.com/cards/tiko/9/en?format=image"); - put("IKO/Human Soldier", "https://api.scryfall.com/cards/tiko/4/en?format=image"); + put("IKO/Human Soldier/1", "https://api.scryfall.com/cards/tiko/3/en?format=image"); + put("IKO/Human Soldier/2", "https://api.scryfall.com/cards/tiko/4/en?format=image"); + put("IKO/Human Soldier/3", "https://api.scryfall.com/cards/tiko/5/en?format=image"); put("IKO/Kraken", "https://api.scryfall.com/cards/tiko/6/en?format=image"); put("IKO/Shark", "https://api.scryfall.com/cards/tiko/7/en?format=image"); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index b327471863..dd753ba0cf 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1365,6 +1365,8 @@ |Generate|TOK:IKO|Dinosaur Beast|||DinosaurBeastToken| |Generate|TOK:IKO|Dinosaur|||DinosaurHasteToken| |Generate|TOK:IKO|Feather|||FeatherToken| -|Generate|TOK:IKO|Human Soldier|||HumanSoldierToken| +|Generate|TOK:IKO|Human Soldier|1||HumanSoldierToken| +|Generate|TOK:IKO|Human Soldier|2||HumanSoldierToken| +|Generate|TOK:IKO|Human Soldier|3||HumanSoldierToken| |Generate|TOK:IKO|Kraken|||KrakenToken| -|Generate|TOK:IKO|Shark|||SharkToken| +|Generate|TOK:IKO|Shark|||SharkToken| \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java b/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java index aa00632951..bc7cd43eac 100644 --- a/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java +++ b/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java @@ -12,7 +12,6 @@ import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.permanent.token.BeastXToken; import mage.game.permanent.token.DinosaurBeastToken; import mage.target.targetpointer.FixedTarget; import mage.watchers.Watcher; diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastXToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastXToken.java deleted file mode 100644 index 8d8ea05429..0000000000 --- a/Mage/src/main/java/mage/game/permanent/token/BeastXToken.java +++ /dev/null @@ -1,31 +0,0 @@ -package mage.game.permanent.token; - -import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; -import mage.constants.CardType; -import mage.constants.SubType; - -/** - * @author TheElk801 - */ -public final class BeastXToken extends TokenImpl { - - public BeastXToken(int xValue) { - super("Beast", "X/X green Beast creature token"); - cardType.add(CardType.CREATURE); - color.setGreen(true); - subtype.add(SubType.BEAST); - power = new MageInt(xValue); - toughness = new MageInt(xValue); - addAbility(TrampleAbility.getInstance()); - } - - private BeastXToken(final BeastXToken token) { - super(token); - } - - @Override - public BeastXToken copy() { - return new BeastXToken(this); - } -} 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 6c0ab5730b..ad0026141e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java @@ -1,13 +1,11 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.MageInt; -import mage.abilities.keyword.TrampleAbility; -import mage.constants.SubType; + import mage.MageInt; + import mage.abilities.keyword.TrampleAbility; + import mage.constants.CardType; + import mage.constants.SubType; /** - * * @author TheElk801 */ public final class DinosaurBeastToken extends TokenImpl { @@ -23,10 +21,11 @@ public final class DinosaurBeastToken extends TokenImpl { addAbility(TrampleAbility.getInstance()); } - public DinosaurBeastToken(final DinosaurBeastToken token) { + private DinosaurBeastToken(final DinosaurBeastToken token) { super(token); } + @Override public DinosaurBeastToken copy() { return new DinosaurBeastToken(this); } diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java index 1d99d2328c..d331b634d5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import mage.util.RandomUtil; public final class HumanSoldierToken extends TokenImpl { @@ -16,6 +17,15 @@ public final class HumanSoldierToken extends TokenImpl { toughness = new MageInt(1); } + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IKO")) { + setTokenType(RandomUtil.nextInt(3) + 1); // 1...3 + } + } + public HumanSoldierToken(final HumanSoldierToken token) { super(token); }