From c4b421afe043bcd2e390748e9e3f647f76081220 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 8 Feb 2022 09:57:40 -0500
Subject: [PATCH 1/2] move Enchantment up in CoreType enum

---
 forge-core/src/main/java/forge/card/CardType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index a4553741cc6..ce6ca332de6 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -54,9 +54,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
     public enum CoreType {
         Artifact(true, "artifacts"),
         Conspiracy(false, "conspiracies"),
+        Enchantment(true, "enchantments"),
         Creature(true, "creatures"),
         Dungeon(false, "dungeons"),
-        Enchantment(true, "enchantments"),
         Instant(false, "instants"),
         Land(true, "lands"),
         Phenomenon(false, "phenomenons"),

From b44530d296764bce83372bd53581adca1caa661a Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Tue, 8 Feb 2022 17:38:46 +0100
Subject: [PATCH 2/2] Vigor Mortis counters

---
 forge-gui/res/cardsfolder/v/vigor_mortis.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/v/vigor_mortis.txt b/forge-gui/res/cardsfolder/v/vigor_mortis.txt
index a6d87fb1f05..046fe159a7a 100644
--- a/forge-gui/res/cardsfolder/v/vigor_mortis.txt
+++ b/forge-gui/res/cardsfolder/v/vigor_mortis.txt
@@ -1,9 +1,8 @@
 Name:Vigor Mortis
 ManaCost:2 B B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 B B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | Origin$ Graveyard | Destination$ Battlefield | RememberTargets$ True | SubAbility$ DBCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield. If {G} was spent to cast this spell, that creature enters the battlefield with an additional +1/+1 counter on it.
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | Static$ True | ConditionManaSpent$ G | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 2 B B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCounter | ConditionManaNotSpent$ G | SpellDescription$ Return target creature card from your graveyard to the battlefield. If {G} was spent to cast this spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+SVar:DBCounter:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | ConditionManaSpent$ G | StackDescription$ None
 SVar:ManaNeededToAvoidNegativeEffect:green
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green