Merge branch 'Card-Forge:master' into master

jjayers99 · Jan 5, 2024 · 99e175d · 99e175d
2 parents 0d1ca3a + 7ee7937
commit 99e175d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
@@ -4405,7 +4405,7 @@ public final void executePerpetual(Map<String, Object> p) {
                 p.get("Timestamp"), (long) 0);
         } else if (category.equals("Keywords")) {
             addChangedCardKeywords((List<String>) p.get("AddKeywords"), Lists.newArrayList(), 
-                (boolean) p.get("RemoveAll"), (long) p.get("Timestamp"), (long) 0);        
+                (boolean) p.getOrDefault("RemoveAll", false), (long) p.get("Timestamp"), (long) 0);        
         } else if (category.equals("Types")) {
             addChangedCardTypes((CardType) p.get("AddTypes"), (CardType) p.get("RemoveTypes"), 
                 false, (Set<RemoveType>) p.get("RemoveXTypes"), 

diff --git a/forge-gui/res/cardsfolder/l/lita_mechanical_engineer.txt b/forge-gui/res/cardsfolder/l/lita_mechanical_engineer.txt
@@ -3,9 +3,9 @@ ManaCost:2 W
 Types:Legendary Artifact Creature Artificer
 PT:3/3
 K:Vigilance
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your end step, untap all artifact creatures you control.
-SVar:TrigUntap:DB$ UntapAll | ValidCards$ Artifact.Creature+YouCtrl
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your end step, untap each other artifact creature you control.
+SVar:TrigUntap:DB$ UntapAll | ValidCards$ Artifact.Creature+YouCtrl+Other
 A:AB$ Token | Cost$ 3 W T | TokenScript$ zeppelin | SpellDescription$ Create a 5/5 colorless Vehicle artifact token named Zeppelin with flying and crew 3.
 DeckHas:Type$Vehicle & Ability$Token & Keyword$Flying
 DeckHints:Type$Artifact
-Oracle:Vigilance\nAt the beginning of your end step, untap all artifact creatures you control.\n{3}{W}, {T}: Create a 5/5 colorless Vehicle artifact token named Zeppelin with flying and crew 3.
+Oracle:Vigilance\nAt the beginning of your end step, untap each other artifact creature you control.\n{3}{W}, {T}: Create a 5/5 colorless Vehicle artifact token named Zeppelin with flying and crew 3.
diff --git a/forge-gui/res/cardsfolder/m/marwyn_the_nurturer.txt b/forge-gui/res/cardsfolder/m/marwyn_the_nurturer.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Elf Druid
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Elf.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Elf enters the battlefield under your control, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | SpellDescription$ Add an amount of {G} equal to CARDNAME's power.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | SpellDescription$ Add an amount of {G} equal to NICKNAME's power.
 SVar:X:Count$CardPower
 DeckHints:Type$Elf
 DeckHas:Ability$Counters