Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

This commit is contained in:
Agetian
2019-05-04 15:23:29 +03:00
2 changed files with 7 additions and 1 deletions

View File

@@ -152,10 +152,16 @@ public class CardFactoryUtil {
if (mega) { if (mega) {
sb.append(" | Mega$ True"); sb.append(" | Mega$ True");
} }
sb.append(" | Mode$ TurnFace | SpellDescription$ (Turn this face up any time for its morph cost.)"); sb.append(" | Mode$ TurnFace | SpellDescription$ (Turn this face up any time for its morph cost.)");
final SpellAbility morphUp = AbilityFactory.getAbility(sb.toString(), sourceCard); 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(); final StringBuilder sbStack = new StringBuilder();
sbStack.append(sourceCard.getName()).append(" - turn this card face up."); sbStack.append(sourceCard.getName()).append(" - turn this card face up.");
morphUp.setStackDescription(sbStack.toString()); morphUp.setStackDescription(sbStack.toString());

View File

@@ -11,4 +11,4 @@ SVar:CntLife:PlayerCountRemembered$LifeTotal/ThirdUp
SVar:NeedsToPlayVar:MyLife GT1 SVar:NeedsToPlayVar:MyLife GT1
SVar:MyLife:Count$YourLifeTotal SVar:MyLife:Count$YourLifeTotal
SVar:Picture:http://www.wizards.com/global/images/magic/general/dire_fleet_ravager.jpg 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.