From ff5d9b7ce94e20e52162f283b2d6e232de3f5b89 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 2 Nov 2020 16:54:25 -0500
Subject: [PATCH] gor_muldrak_amphinologist.txt and support

---
 .../main/java/forge/game/player/PlayerProperty.java   |  3 +--
 .../upcoming/gor_muldrak_amphinologist.txt            | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt

diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
index 7509becc161..be408467898 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
@@ -227,8 +227,7 @@ public class PlayerProperty {
             final String[] type = property.substring(8).split("_");
             final CardCollectionView list = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), type[0], sourceController, source);
             String comparator = type[1];
-            String compareTo = comparator.substring(2);
-            int y = StringUtils.isNumeric(compareTo) ? Integer.parseInt(compareTo) : 0;
+            int y = AbilityUtils.calculateAmount(source, comparator.substring(2), null);
             if (!Expressions.compare(list.size(), comparator, y)) {
                 return false;
             }
diff --git a/forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt b/forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt
new file mode 100755
index 00000000000..22d13c5a8d5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt
@@ -0,0 +1,11 @@
+Name:Gor Muldrak, Amphinologist
+ManaCost:1 G U
+Types:Legendary Creature Human Scout
+PT:3/2
+S:Mode$ Continuous | Affected$ You,Permanent.YouCtrl | AddKeyword$ Protection from Salamanders | Description$ You and permanents you control have protection from Salamanders.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRepeat | TriggerDescription$ At the beginning of your end step, each player who controls the fewest creatures creates a 4/3 blue Salamander Warrior creature token.
+SVar:TrigRepeat:DB$ RepeatEach | RepeatSubAbility$ TrigToken | RepeatPlayers$ Player.controlsCreature_EQX | References$ X
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_4_3_salamander_warrior | TokenOwner$ Player.IsRemembered
+SVar:X:PlayerCountPlayers$LowestValid Creature.YouCtrl
+AI:RemoveDeck:All
+Oracle:You and permanents you control have protection from Salamanders.\nAt the beginning of your end step, each player who controls the fewest creatures creates a 4/3 blue Salamander Warrior creature token.