From 150a7897c4da8350bd3b766df461385ef7375e4f Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <loganreid47@hotmail.co.uk>
Date: Mon, 6 Jun 2022 00:26:03 +0100
Subject: [PATCH] Added GVL token images

---
 .../plugins/card/dl/sources/ScryfallImageSupportTokens.java | 6 ++++++
 Mage.Client/src/main/resources/card-pictures-tok.txt        | 5 ++---
 .../src/main/java/mage/game/permanent/token/BeastToken.java | 2 +-
 .../main/java/mage/game/permanent/token/BeastToken2.java    | 4 ++++
 .../java/mage/game/permanent/token/PongifyApeToken.java     | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

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 0e67a2320a..af08932bb8 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
@@ -1452,6 +1452,12 @@ public class ScryfallImageSupportTokens {
             put ("EVG/Elf Warrior", "https://api.scryfall.com/cards/tevg/2/en?format=image");
             put ("EVG/Goblin", "https://api.scryfall.com/cards/tevg/3/en?format=image");
 
+            // GVL
+            put ("GVL/Bat", "https://api.scryfall.com/cards/tgvl/11/en?format=image");
+            put ("GVL/Beast/1", "https://api.scryfall.com/cards/tgvl/8/en?format=image");
+            put ("GVL/Beast/2", "https://api.scryfall.com/cards/tgvl/9/en?format=image");
+            put ("GVL/Elephant", "https://api.scryfall.com/cards/tgvl/10/en?format=image");
+
             // generate supported sets
             supportedSets.clear();
             for (String cardName : this.keySet()) {
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 0b8500b7f6..15b31554d4 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -509,10 +509,9 @@
 |Generate|TOK:DVD|Spirit|||SpiritWhiteToken|
 |Generate|TOK:DVD|Thrull|||BreedingPitBlackInsectToken|
 |Generate|TOK:DD3D|Elemental Shaman||
-|Generate|TOK:GVL|Ape|||PongifyApeToken|
 |Generate|TOK:GVL|Bat|||BatToken|
-|Generate|TOK:GVL|Beast|1||BeastToken2|
-|Generate|TOK:GVL|Beast|2||BeastToken|
+|Generate|TOK:GVL|Beast|1||BeastToken|
+|Generate|TOK:GVL|Beast|2||BeastToken2|
 |Generate|TOK:GVL|Elephant|||ElephantToken|
 |Generate|TOK:JVC|Elemental Shaman|||ElementalShamanToken|
 |Generate|TOK:DDC|Demon|||DemonFlyingToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
index b942879181..ec9ea5a6e4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
@@ -36,7 +36,7 @@ public final class BeastToken extends TokenImpl {
             this.setTokenType(2);
         }
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) {
-            this.setTokenType(2);
+            this.setTokenType(1);
         }
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) {
             this.setTokenType(1);
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
index f7e838a97c..a6b9919705 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
@@ -67,5 +67,9 @@ public final class BeastToken2 extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C21")) {
             this.setTokenType(2);
         }
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) {
+            this.setTokenType(2);
+        }
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java
index 2c31446269..95f6b2f29f 100644
--- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java
@@ -21,7 +21,7 @@ public final class PongifyApeToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
 
-        availableImageSetCodes = Arrays.asList("C14", "GVL", "PLC", "ULG", "UNH", "TSR");
+        availableImageSetCodes = Arrays.asList("C14", "PLC", "ULG", "UNH", "TSR");
     }
 
     public PongifyApeToken(final PongifyApeToken token) {