From b37d695c8b01238497590b886b084089886048a7 Mon Sep 17 00:00:00 2001
From: Hythonia <mm3snake@gmail.com>
Date: Sun, 4 Apr 2021 15:06:50 +0200
Subject: [PATCH] Minor card fixes

---
 .../src/main/java/forge/game/combat/CombatUtil.java       | 5 -----
 .../main/java/forge/game/staticability/StaticAbility.java | 4 ++++
 forge-gui/res/cardsfolder/l/leonin_vanguard.txt           | 8 ++++----
 forge-gui/res/cardsfolder/m/medomai_the_ageless.txt       | 3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index e03eb011077..0a6e50c06d5 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -257,11 +257,6 @@ public class CombatUtil {
                     return false;
                 }
                 break;
-            case "CARDNAME can't attack during extra turns.":
-                if (game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
-                    return false;
-                }
-                break;
             }
         }
 
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index 7b20550252a..8ce094bed9b 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -533,6 +533,10 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
                 if (ph.isPlayerTurn(controller)) {
                     return false;
                 }
+            } else if (condition.equals("ExtraTurn")) {
+                if (!game.getPhaseHandler().getPlayerTurn().isExtraTurn()) {
+                    return false;
+                }
             } else if (condition.equals("PermanentOfEachColor")) {
                 if ((controller.getColoredCardsInPlay(MagicColor.Constant.BLACK).isEmpty()
                         || controller.getColoredCardsInPlay(MagicColor.Constant.BLUE).isEmpty()
diff --git a/forge-gui/res/cardsfolder/l/leonin_vanguard.txt b/forge-gui/res/cardsfolder/l/leonin_vanguard.txt
index 80945d56fdf..ea9bbe3cded 100644
--- a/forge-gui/res/cardsfolder/l/leonin_vanguard.txt
+++ b/forge-gui/res/cardsfolder/l/leonin_vanguard.txt
@@ -1,9 +1,9 @@
 Name:Leonin Vanguard
 ManaCost:W
 Types:Creature Cat Soldier
-T:Mode$ Phase | TriggerZones$ Battlefield | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
-SVar:TrigPump:DB$ Pump | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE3 | ValidCard$ Card.Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | ConditionPresent$ Creature.YouCtrl | ConditionCompare$ GE3 | LifeAmount$ 1
+PT:1/1
+T:Mode$ Phase | TriggerZones$ Battlefield | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | IsPresent$ Creature.YouCtrl | PresentCompare$ GE3 | TriggerDescription$ At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
+SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
 DeckHas:Ability$LifeGain
 Oracle:At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life.
-PT:1/1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/medomai_the_ageless.txt b/forge-gui/res/cardsfolder/m/medomai_the_ageless.txt
index bf09a6832e1..a1d01c55e43 100644
--- a/forge-gui/res/cardsfolder/m/medomai_the_ageless.txt
+++ b/forge-gui/res/cardsfolder/m/medomai_the_ageless.txt
@@ -3,9 +3,8 @@ ManaCost:4 W U
 Types:Legendary Creature Sphinx
 PT:4/4
 K:Flying
-K:CARDNAME can't attack during extra turns.
+S:Mode$ CantAttack | ValidCard$ Card.Self | Condition$ ExtraTurn | Description$ CARDNAME can't attack during extra turns.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigAddTurn | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, take an extra turn after this one.
 SVar:TrigAddTurn:DB$ AddTurn | NumTurns$ 1
 SVar:MustBeBlocked:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/medomai_the_ageless.jpg
 Oracle:Flying\nWhenever Medomai the Ageless deals combat damage to a player, take an extra turn after this one.\nMedomai the Ageless can't attack during extra turns.