diff --git a/.gitattributes b/.gitattributes index 76b7b5588e5..6c7bd931d84 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7707,6 +7707,7 @@ res/cardsfolder/p/planeswalkers_favor.txt -text res/cardsfolder/p/planeswalkers_fury.txt -text svneol=unset#text/plain res/cardsfolder/p/planeswalkers_mirth.txt -text res/cardsfolder/p/planeswalkers_scorn.txt -text +res/cardsfolder/p/planewide_disaster.txt -text res/cardsfolder/p/plant_elemental.txt -text res/cardsfolder/p/plasma_elemental.txt svneol=native#text/plain res/cardsfolder/p/plateau.txt svneol=native#text/plain diff --git a/res/cardsfolder/p/planewide_disaster.txt b/res/cardsfolder/p/planewide_disaster.txt new file mode 100644 index 00000000000..106825e9b2f --- /dev/null +++ b/res/cardsfolder/p/planewide_disaster.txt @@ -0,0 +1,11 @@ +Name:Planewide Disaster +ManaCost:no cost +Types:Phenomenon +Text:no text +T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ Disaster | TriggerDescription$ When you encounter CARDNAME, destroy all creatures. (Then planeswalk away from this phenomenon) +SVar:Disaster:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature | SubAbility$ PWAway +SVar:PWAway:DB$ Planeswalk | Cost$ 0 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/planewide_disaster.jpg +SetInfo:PC2|Common|http://magiccards.info/extras/phenomenon/planechase-2012-edition/planewide-disaster.jpg +End \ No newline at end of file diff --git a/src/main/java/forge/game/GlobalRuleChange.java b/src/main/java/forge/game/GlobalRuleChange.java index 8e4a25a957e..0110a4f09c6 100644 --- a/src/main/java/forge/game/GlobalRuleChange.java +++ b/src/main/java/forge/game/GlobalRuleChange.java @@ -31,8 +31,9 @@ public enum GlobalRuleChange { onlyOneAttackerATurn ("No more than one creature can attack each turn."), onlyOneAttackerACombat ("No more than one creature can attack each combat."), onlyOneBlocker ("No more than one creature can block each combat."), - toughnessAssignsDamage ("Each creature assigns combat damage equal to its toughness rather than its power."); - + toughnessAssignsDamage ("Each creature assigns combat damage equal to its toughness rather than its power."), + blankIsChaos("Each blank roll of the planar dice is a {C} roll."); + private final String ruleText; private GlobalRuleChange(String text) { diff --git a/src/main/java/forge/game/PlanarDice.java b/src/main/java/forge/game/PlanarDice.java index bb696cd80ce..47498c49951 100644 --- a/src/main/java/forge/game/PlanarDice.java +++ b/src/main/java/forge/game/PlanarDice.java @@ -23,9 +23,17 @@ public enum PlanarDice { if (i == 1) res = Chaos; + PlanarDice trigRes = res; + + if(Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.blankIsChaos) + && res == Blank) + { + trigRes = Chaos; + } + HashMap runParams = new HashMap(); runParams.put("Player", roller); - runParams.put("Result", res); + runParams.put("Result", trigRes); Singletons.getModel().getGame().getTriggerHandler().runTrigger(TriggerType.PlanarDice, runParams,false);