* Images: fixed wrong Wurm token image for some sets (#5604);

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java

@@ -186,6 +186,9 @@ public class ScryfallImageSupportTokens {
             put("BFZ/Octopus", "https://api.scryfall.com/cards/tbfz/7/en?format=image");
             put("BFZ/Plant", "https://api.scryfall.com/cards/tbfz/10/en?format=image");
 
+            // C17
+            
+
             // WAR
             put("WAR/Angel", "https://api.scryfall.com/cards/twar/2/en?format=image");
             put("WAR/Assassin", "https://api.scryfall.com/cards/twar/6/en?format=image");

Mage.Client/src/main/resources/card-pictures-tok.txt

@@ -174,7 +174,7 @@
 |Generate|TOK:AKH|Hippo|||HippoToken2|
 |Generate|TOK:AKH|Snake|||DeathtouchSnakeToken|
 |Generate|TOK:AKH|Warrior|||WarriorVigilantToken|
-|Generate|TOK:AKH|Wurm|||WurmToken3|
+|Generate|TOK:AKH|Wurm|||Wurm55Token|
 |Generate|TOK:AKH|Zombie|||ZombieToken
 #TOK:AKH - some tokens from real cards (see Embalm ability)
 #|Generate|TOK:AKH|Angel of Sanctions||
@@ -319,8 +319,8 @@
 |Generate|TOK:C14|Treefolk|||SylvanOfferingTreefolkToken|
 |Generate|TOK:C14|Whale|||ReefWormWhaleToken|
 |Generate|TOK:C14|Wolf|||WolfToken|
-|Generate|TOK:C14|Wurm|1||Wurm1Token|
-|Generate|TOK:C14|Wurm|2||Wurm2Token|
+|Generate|TOK:C14|Wurm|1||WurmWithDeathtouchToken|
+|Generate|TOK:C14|Wurm|2||WurmWithLifelinkToken|
 |Generate|TOK:C14|Zombie|1||ZombieToken|
 |Generate|TOK:C14|Zombie|2||StitcherGeralfZombieToken|
 |Generate|TOK:C15|Angel|||AngelToken|
@@ -567,8 +567,8 @@
 |Generate|TOK:DGM|Rhino|||RhinoToken|
 |Generate|TOK:DGM|Soldier|||SoldierTokenWithHaste|
 |Generate|TOK:DGM|Spirit|||TeysaEnvoyOfGhostsToken|
-|Generate|TOK:DGM|Wurm|||WurmToken2|
-|Generate|TOK:DGM|Wurm|||WurmToken3|
+|Generate|TOK:DGM|Wurm|1||WurmWithTrampleToken|
+|Generate|TOK:DGM|Wurm|2||Wurm55Token|
 |Generate|TOK:DIS|Bird|||DovescapeToken|
 |Generate|TOK:DIS|Drake|||LeafdrakeRoostDrakeToken|
 |Generate|TOK:DIS|Elemental|||ResearchDevelopmentToken|
@@ -1070,7 +1070,7 @@
 |Generate|TOK:RTR|Rhino|||RhinoToken|
 |Generate|TOK:RTR|Saproling|||SaprolingToken|
 |Generate|TOK:RTR|Soldier|||SoldierToken|
-|Generate|TOK:RTR|Wurm|||WurmToken2|
+|Generate|TOK:RTR|Wurm|||WurmWithTrampleToken|
 |Generate|TOK:SCG|Angel|||AngelToken|
 |Generate|TOK:SCG|Beast|||BeastToken2|
 |Generate|TOK:SCG|Dragon|||DragonToken2|
@@ -1118,8 +1118,8 @@
 |Generate|TOK:SOM|Myr|||MyrToken|
 |Generate|TOK:SOM|Soldier|||SoldierToken|
 |Generate|TOK:SOM|Wolf|||WolfToken|
-|Generate|TOK:SOM|Wurm|1||Wurm1Token|
-|Generate|TOK:SOM|Wurm|2||Wurm2Token|
+|Generate|TOK:SOM|Wurm|1||WurmWithDeathtouchToken|
+|Generate|TOK:SOM|Wurm|2||WurmWithLifelinkToken|
 |Generate|TOK:STH|Goblin|||GoblinToken|
 |Generate|TOK:STH|Insect|||HornetToken|
 |Generate|TOK:STH|Insect|||WaspToken|
@@ -1214,8 +1214,8 @@
 |Generate|TOK:VMA|Spirit|||SpiritWhiteToken|
 |Generate|TOK:VMA|Squirrel|||SquirrelToken|
 |Generate|TOK:VMA|Thopter|||ThopterColorlessToken|
-|Generate|TOK:VMA|Wurm|||PenumbraWurmToken|
-|Generate|TOK:VMA|Wurm|||WurmToken|
+|Generate|TOK:VMA|Wurm|1||PenumbraWurmToken|
+|Generate|TOK:VMA|Wurm|2||WurmToken|
 |Generate|TOK:VMA|Zombie|||ZombieToken|
 |Generate|TOK:WTH|Squirrel|||SquirrelToken|
 |Generate|TOK:WWK|Construct|||StoneTrapIdolToken|

Mage.Sets/src/mage/cards/a/AdventOfTheWurm.java

@@ -1,16 +1,14 @@
-
-
 package mage.cards.a;
 
-import java.util.UUID;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.WurmToken2;
+import mage.game.permanent.token.WurmWithTrampleToken;
+
+import java.util.UUID;
 
 /**
- *
  * @author LevelX2
  */
 
@@ -18,10 +16,10 @@ import mage.game.permanent.token.WurmToken2;
 public final class AdventOfTheWurm extends CardImpl {
 
     public AdventOfTheWurm(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}{G}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}{G}{W}");
 
         // Create a 5/5 green Wurm creature token with trample.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmToken2()));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new WurmWithTrampleToken()));
     }
 
     public AdventOfTheWurm(final AdventOfTheWurm card) {

Mage.Sets/src/mage/cards/a/ArmadaWurm.java

@@ -1,7 +1,5 @@
-
 package mage.cards.a;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
@@ -10,10 +8,11 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.WurmToken2;
+import mage.game.permanent.token.WurmWithTrampleToken;
+
+import java.util.UUID;
 
 /**
- *
  * @author LevelX2
  */
 public final class ArmadaWurm extends CardImpl {
@@ -29,7 +28,7 @@ public final class ArmadaWurm extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // When Armada Wurm enters the battlefield, create a 5/5 green Wurm creature token with trample.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WurmToken2()), false));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WurmWithTrampleToken()), false));
 
     }
 

Mage.Sets/src/mage/cards/s/SandwurmConvergence.java

@@ -1,7 +1,5 @@
-
 package mage.cards.s;
 
-import java.util.UUID;
 import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.Effect;
@@ -16,10 +14,11 @@ import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.AbilityPredicate;
-import mage.game.permanent.token.WurmToken3;
+import mage.game.permanent.token.Wurm55Token;
+
+import java.util.UUID;
 
 /**
- *
  * @author fireshoes
  */
 public final class SandwurmConvergence extends CardImpl {
@@ -39,7 +38,7 @@ public final class SandwurmConvergence extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
 
         // At the beginning of your end step, create a 5/5 green Wurm creature token.
-        this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new WurmToken3()), TargetController.YOU, false));
+        this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new Wurm55Token()), TargetController.YOU, false));
     }
 
     public SandwurmConvergence(final SandwurmConvergence card) {

Mage.Sets/src/mage/cards/w/WorldspineWurm.java

@@ -1,7 +1,5 @@
-
 package mage.cards.w;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility;
@@ -12,16 +10,17 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.WurmToken2;
+import mage.game.permanent.token.WurmWithTrampleToken;
+
+import java.util.UUID;
 
 /**
- *
  * @author Plopman
  */
 public final class WorldspineWurm extends CardImpl {
 
     public WorldspineWurm(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{8}{G}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{8}{G}{G}{G}");
         this.subtype.add(SubType.WURM);
 
         this.power = new MageInt(15);
@@ -31,7 +30,7 @@ public final class WorldspineWurm extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // When Worldspine Wurm dies, create three 5/5 green Wurm creature tokens with trample.
-        this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new WurmToken2(), 3)));
+        this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new WurmWithTrampleToken(), 3)));
 
         // When Worldspine Wurm is put into a graveyard from anywhere, shuffle it into its owner's library.
         this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect()));

Mage.Sets/src/mage/cards/w/WurmcoilEngine.java

@@ -1,7 +1,5 @@
-
 package mage.cards.w;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
@@ -12,11 +10,12 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.Wurm1Token;
-import mage.game.permanent.token.Wurm2Token;
+import mage.game.permanent.token.WurmWithDeathtouchToken;
+import mage.game.permanent.token.WurmWithLifelinkToken;
+
+import java.util.UUID;
 
 /**
- *
  * @author Loki
  */
 public final class WurmcoilEngine extends CardImpl {
@@ -32,8 +31,8 @@ public final class WurmcoilEngine extends CardImpl {
         this.addAbility(LifelinkAbility.getInstance());
 
         // When Wurmcoil Engine dies, create a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink.
-        Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new Wurm1Token(expansionSetCode)), false);
-        ability.addEffect(new CreateTokenEffect(new Wurm2Token(expansionSetCode)));
+        Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new WurmWithDeathtouchToken()), false);
+        ability.addEffect(new CreateTokenEffect(new WurmWithLifelinkToken()));
         this.addAbility(ability);
     }
 

Mage/src/main/java/mage/game/permanent/token/GreenAndWhiteElementalToken.java

@@ -5,21 +5,13 @@ import mage.abilities.keyword.VigilanceAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * @author JayDi85
  */
 public final class GreenAndWhiteElementalToken extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("GK1", "PTC", "RTR"));
-    }
-
     public GreenAndWhiteElementalToken() {
         super("Elemental", "8/8 green and white Elemental creature token with vigilance");
         cardType.add(CardType.CREATURE);
@@ -29,6 +21,8 @@ public final class GreenAndWhiteElementalToken extends TokenImpl {
         power = new MageInt(8);
         toughness = new MageInt(8);
         this.addAbility(VigilanceAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("GK1", "PTC", "RTR");
     }
 
     public GreenAndWhiteElementalToken(final GreenAndWhiteElementalToken token) {

Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java

@@ -1,39 +0,0 @@
-
-package mage.game.permanent.token;
-
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.MageInt;
-import mage.abilities.keyword.LifelinkAbility;
-
-/**
- *
- * @author spjspj
- */
-public final class Wurm2Token extends TokenImpl {
-
-    public Wurm2Token() {
-        this("MBS");
-    }
-
-    public Wurm2Token(String setCode) {
-        super("Wurm", "3/3 colorless Wurm artifact creature token with lifelink");
-        setOriginalExpansionSetCode(setCode);
-        cardType.add(CardType.ARTIFACT);
-        cardType.add(CardType.CREATURE);
-        subtype.add(SubType.WURM);
-        power = new MageInt(3);
-        toughness = new MageInt(3);
-        this.addAbility(LifelinkAbility.getInstance());
-
-        setTokenType(2); // for image
-    }
-
-    public Wurm2Token(final Wurm2Token token) {
-        super(token);
-    }
-
-    public Wurm2Token copy() {
-        return new Wurm2Token(this);
-    }
-}

Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java

@@ -0,0 +1,41 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.Arrays;
+
+/**
+ * @author fireshoes
+ */
+public final class Wurm55Token extends TokenImpl {
+
+    public Wurm55Token() {
+        super("Wurm", "5/5 green Wurm creature token");
+        cardType.add(CardType.CREATURE);
+        color.setGreen(true);
+        subtype.add(SubType.WURM);
+        power = new MageInt(5);
+        toughness = new MageInt(5);
+
+        availableImageSetCodes = Arrays.asList("AKH", "DGM");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode().equals("DGM")) {
+            this.setTokenType(2);
+        }
+    }
+
+    public Wurm55Token(final Wurm55Token token) {
+        super(token);
+    }
+
+    public Wurm55Token copy() {
+        return new Wurm55Token(this);
+    }
+}

Mage/src/main/java/mage/game/permanent/token/WurmToken.java

@@ -1,10 +1,11 @@
-
 package mage.game.permanent.token;
 
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
  * @author magenoxx_at_gmail.com
  */
@@ -17,6 +18,17 @@ public final class WurmToken extends TokenImpl {
         subtype.add(SubType.WURM);
         power = new MageInt(6);
         toughness = new MageInt(6);
+
+        availableImageSetCodes = Arrays.asList("C19", "EMA", "GPT", "JUD", "M12", "M13", "MM3", "ODY", "VMA");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode().equals("VMA")) {
+            this.setTokenType(2);
+        }
     }
 
     public WurmToken(final WurmToken token) {

Mage/src/main/java/mage/game/permanent/token/WurmToken3.java

@@ -1,40 +0,0 @@
-
-
-package mage.game.permanent.token;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.MageInt;
-
-/**
- *
- * @author fireshoes
- */
-public final class WurmToken3 extends TokenImpl {
-
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("AKH"));
-    }
-
-    public WurmToken3() {
-        super("Wurm", "5/5 green Wurm creature token");
-        cardType.add(CardType.CREATURE);
-        color.setGreen(true);
-        subtype.add(SubType.WURM);
-        power = new MageInt(5);
-        toughness = new MageInt(5);
-    }
-
-    public WurmToken3(final WurmToken3 token) {
-        super(token);
-    }
-
-    public WurmToken3 copy() {
-        return new WurmToken3(this);
-    }
-}

Mage/src/main/java/mage/game/permanent/token/WurmWithDeathtouchToken.java

@@ -1,22 +1,19 @@
 package mage.game.permanent.token;
 
-import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.DeathtouchAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.Arrays;
 
 /**
- *
  * @author spjspj
  */
-public final class Wurm1Token extends TokenImpl {
+public final class WurmWithDeathtouchToken extends TokenImpl {
 
-    public Wurm1Token() {
-        this("MBS");
-    }
-    public Wurm1Token(String setCode) {
+    public WurmWithDeathtouchToken() {
         super("Wurm", "3/3 colorless Wurm artifact creature token with deathtouch");
-        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);
         subtype.add(SubType.WURM);
@@ -24,14 +21,19 @@ public final class Wurm1Token extends TokenImpl {
         toughness = new MageInt(3);
         this.addAbility(DeathtouchAbility.getInstance());
 
-        setTokenType(1); // for image
+        availableImageSetCodes = Arrays.asList("C14", "SOM");
     }
 
-    public Wurm1Token(final Wurm1Token token) {
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+    }
+
+    public WurmWithDeathtouchToken(final WurmWithDeathtouchToken token) {
         super(token);
     }
 
-    public Wurm1Token copy() {
-        return new Wurm1Token(this);
+    public WurmWithDeathtouchToken copy() {
+        return new WurmWithDeathtouchToken(this);
     }
 }

Mage/src/main/java/mage/game/permanent/token/WurmWithLifelinkToken.java

@@ -0,0 +1,47 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.Arrays;
+
+/**
+ * @author spjspj
+ */
+public final class WurmWithLifelinkToken extends TokenImpl {
+
+    public WurmWithLifelinkToken() {
+        super("Wurm", "3/3 colorless Wurm artifact creature token with lifelink");
+        cardType.add(CardType.ARTIFACT);
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.WURM);
+        power = new MageInt(3);
+        toughness = new MageInt(3);
+        this.addAbility(LifelinkAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("C14", "SOM");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode().equals("C14")) {
+            this.setTokenType(2);
+        }
+
+        if (getOriginalExpansionSetCode().equals("SOM")) {
+            this.setTokenType(2);
+        }
+    }
+
+    public WurmWithLifelinkToken(final WurmWithLifelinkToken token) {
+        super(token);
+    }
+
+    public WurmWithLifelinkToken copy() {
+        return new WurmWithLifelinkToken(this);
+    }
+}

Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java

@@ -1,28 +1,18 @@
-
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.TrampleAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.Arrays;
 
 /**
- *
  * @author LoneFox
  */
-public final class WurmToken2 extends TokenImpl {
+public final class WurmWithTrampleToken extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("RTR", "MM3"));
-    }
-
-    public WurmToken2() {
+    public WurmWithTrampleToken() {
         super("Wurm", "5/5 green Wurm creature token with trample");
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
@@ -30,13 +20,15 @@ public final class WurmToken2 extends TokenImpl {
         power = new MageInt(5);
         toughness = new MageInt(5);
         addAbility(TrampleAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("DGM", "RTR");
     }
 
-    public WurmToken2(final WurmToken2 token) {
+    public WurmWithTrampleToken(final WurmWithTrampleToken token) {
         super(token);
     }
 
-    public WurmToken2 copy() {
-        return new WurmToken2(this);
+    public WurmWithTrampleToken copy() {
+        return new WurmWithTrampleToken(this);
     }
 }