From cc050430552171defe55b5d4960bcdddd51186e7 Mon Sep 17 00:00:00 2001 From: Computica Date: Sat, 4 May 2019 10:40:42 +0000 Subject: [PATCH 1/2] Update dire_fleet_ravager.txt (Oracle Text had wrong name) --- forge-gui/res/cardsfolder/d/dire_fleet_ravager.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/d/dire_fleet_ravager.txt b/forge-gui/res/cardsfolder/d/dire_fleet_ravager.txt index 8b7a8b955bb..01c26de6eca 100644 --- a/forge-gui/res/cardsfolder/d/dire_fleet_ravager.txt +++ b/forge-gui/res/cardsfolder/d/dire_fleet_ravager.txt @@ -11,4 +11,4 @@ SVar:CntLife:PlayerCountRemembered$LifeTotal/ThirdUp SVar:NeedsToPlayVar:MyLife GT1 SVar:MyLife:Count$YourLifeTotal SVar:Picture:http://www.wizards.com/global/images/magic/general/dire_fleet_ravager.jpg -Oracle:Menace, deathtouch\nWhen Ogre Hand Ravager enters the battlefield, each player loses a third of their life, rounded up. +Oracle:Menace, deathtouch\nWhen Dire Fleet Ravager enters the battlefield, each player loses a third of their life, rounded up. From 7687ed591a18c85548f3d61dc83a8f40ad15011f Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Sat, 4 May 2019 12:20:12 +0000 Subject: [PATCH 2/2] CardFactoryUtil: fix X in Morph cost --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 4ebd026e31d..42a83b7af8c 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -152,10 +152,16 @@ public class CardFactoryUtil { if (mega) { sb.append(" | Mega$ True"); } + sb.append(" | Mode$ TurnFace | SpellDescription$ (Turn this face up any time for its morph cost.)"); final SpellAbility morphUp = AbilityFactory.getAbility(sb.toString(), sourceCard); + // if Cost has X in cost, need to check source for an SVar for this + if (cost.hasXInAnyCostPart() && sourceCard.hasSVar("X")) { + morphUp.setSVar("X", sourceCard.getSVar("X")); + } + final StringBuilder sbStack = new StringBuilder(); sbStack.append(sourceCard.getName()).append(" - turn this card face up."); morphUp.setStackDescription(sbStack.toString());