Merge branch 'master' into MAT2

forge-ai/src/main/java/forge/ai/SpellApiToAi.java

@@ -32,6 +32,7 @@ public enum SpellApiToAi {
             .put(ApiType.BecomeMonarch, AlwaysPlayAi.class)
             .put(ApiType.BecomesBlocked, BecomesBlockedAi.class)
             .put(ApiType.BidLife, BidLifeAi.class)
+            .put(ApiType.BlankLine, AlwaysPlayAi.class)
             .put(ApiType.Bond, BondAi.class)
             .put(ApiType.Branch, AlwaysPlayAi.class)
             .put(ApiType.Camouflage, ChooseCardAi.class)
@@ -40,6 +41,7 @@ public enum SpellApiToAi {
             .put(ApiType.ChangeX, AlwaysPlayAi.class)
             .put(ApiType.ChangeZone, ChangeZoneAi.class)
             .put(ApiType.ChangeZoneAll, ChangeZoneAllAi.class)
+            .put(ApiType.ChaosEnsues, AlwaysPlayAi.class)
             .put(ApiType.Charm, CharmAi.class)
             .put(ApiType.ChooseCard, ChooseCardAi.class)
             .put(ApiType.ChooseColor, ChooseColorAi.class)

forge-game/src/main/java/forge/game/GameAction.java

@@ -1439,6 +1439,8 @@ public class GameAction {
             }
             setHoldCheckingStaticAbilities(false);
 
+            // important to collect first otherwise if a static fires it will mess up registered ones from LKI
+            game.getTriggerHandler().collectTriggerForWaiting();
             if (game.getTriggerHandler().runWaitingTriggers()) {
                 checkAgain = true;
             }

forge-game/src/main/java/forge/game/ability/AbilityFactory.java

@@ -332,15 +332,21 @@ public final class AbilityFactory {
 
         // TgtPrompt should only be needed for more complicated ValidTgts
         String tgtWhat = mapParams.get("ValidTgts");
-        final String[] commonStuff = new String[] {
-                //list of common one word non-core type ValidTgts that should be lowercase in the target prompt
-                "Player", "Opponent", "Card", "Spell", "Permanent"
-        };
-        if (Arrays.asList(commonStuff).contains(tgtWhat) || CardType.CoreType.isValidEnum(tgtWhat)) {
-            tgtWhat = tgtWhat.toLowerCase();
+        final String prompt;
+        if (mapParams.containsKey("TgtPrompt")) {
+            prompt = mapParams.get("TgtPrompt");
+        } else if (tgtWhat.equals("Any")) {
+            prompt = "Select any target";
+        } else {
+            final String[] commonStuff = new String[] {
+                    //list of common one word non-core type ValidTgts that should be lowercase in the target prompt
+                    "Player", "Opponent", "Card", "Spell", "Permanent"
+            };
+            if (Arrays.asList(commonStuff).contains(tgtWhat) || CardType.CoreType.isValidEnum(tgtWhat)) {
+                tgtWhat = tgtWhat.toLowerCase();
+            }
+            prompt = "Select target " + tgtWhat;
         }
-        final String prompt = mapParams.containsKey("TgtPrompt") ? mapParams.get("TgtPrompt") :
-                "Select target " + tgtWhat;
 
         TargetRestrictions abTgt = new TargetRestrictions(prompt, mapParams.get("ValidTgts").split(","), min, max);
 

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -3580,6 +3580,18 @@ public class AbilityUtils {
             }
             return doXMath(amount, m, source, ctb);
         }
+        if (value.startsWith("PlaneswalkedToThisTurn")) {
+            int found = 0;
+            String name = value.split(" ")[1];
+            List<Card> pwTo = player.getPlaneswalkedToThisTurn();
+            for (Card c : pwTo) {
+                if (c.getName().equals(name)) {
+                    found++;
+                    break;
+                }
+            }
+            return doXMath(found, m, source, ctb);
+        }
 
         return doXMath(0, m, source, ctb);
     }

forge-game/src/main/java/forge/game/ability/ApiType.java

@@ -27,6 +27,7 @@ public enum ApiType {
     BecomeMonarch (BecomeMonarchEffect.class),
     BecomesBlocked (BecomesBlockedEffect.class),
     BidLife (BidLifeEffect.class),
+    BlankLine (BlankLineEffect.class),
     Block (BlockEffect.class),
     Bond (BondEffect.class),
     Branch (BranchEffect.class),
@@ -37,6 +38,7 @@ public enum ApiType {
     ChangeX (ChangeXEffect.class),
     ChangeZone (ChangeZoneEffect.class),
     ChangeZoneAll (ChangeZoneAllEffect.class),
+    ChaosEnsues (ChaosEnsuesEffect.class),
     Charm (CharmEffect.class),
     ChooseCard (ChooseCardEffect.class),
     ChooseColor (ChooseColorEffect.class),

forge-game/src/main/java/forge/game/ability/effects/BlankLineEffect.java

@@ -0,0 +1,16 @@
+package forge.game.ability.effects;
+
+import forge.game.ability.SpellAbilityEffect;
+import forge.game.spellability.SpellAbility;
+
+public class BlankLineEffect extends SpellAbilityEffect {
+    @Override
+    protected String getStackDescription(SpellAbility sa) {
+        return "\r\n";
+    }
+
+    @Override
+    public void resolve(SpellAbility sa) {
+        // this "effect" just allows spacing to look better for certain card displays
+    }
+}

forge-game/src/main/java/forge/game/ability/effects/ChaosEnsuesEffect.java

@@ -0,0 +1,74 @@
+package forge.game.ability.effects;
+
+import com.google.common.collect.Lists;
+import forge.game.Game;
+import forge.game.ability.AbilityKey;
+import forge.game.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityEffect;
+import forge.game.card.Card;
+import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.trigger.Trigger;
+import forge.game.trigger.TriggerType;
+import forge.game.zone.ZoneType;
+
+import java.util.*;
+
+public class ChaosEnsuesEffect extends SpellAbilityEffect {
+    /** 311.7. Each plane card has a triggered ability that triggers “Whenever chaos ensues.” These are called
+    chaos abilities. Each one is indicated by a chaos symbol to the left of the ability, though the symbol
+    itself has no special rules meaning. This ability triggers if the chaos symbol is rolled on the planar
+    die (see rule 901.9b), if a resolving spell or ability says that chaos ensues, or if a resolving spell or
+    ability states that chaos ensues for a particular object. In the last case, the chaos ability can trigger
+    even if that plane card is still in the planar deck but revealed. A chaos ability is controlled by the
+    current planar controller. **/
+
+    @Override
+    public void resolve(SpellAbility sa) {
+        final Card host = sa.getHostCard();
+        final Player activator = sa.getActivatingPlayer();
+        final Game game = activator.getGame();
+
+        if (game.getActivePlanes() == null) { // not a planechase game, nothing happens
+            return;
+        }
+
+        Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(activator);
+        Map<Integer, EnumSet<ZoneType>> tweakedTrigs = new HashMap<>();
+
+        List<Card> affected = Lists.newArrayList();
+        if (sa.hasParam("Defined")) {
+            for (final Card c : AbilityUtils.getDefinedCards(host, sa.getParam("Defined"), sa)) {
+                for (Trigger t : c.getTriggers()) {
+                    if (t.getMode() == TriggerType.ChaosEnsues) { // also allow current zone for any Defined
+                        //String zones = t.getParam("TriggerZones");
+                        //t.putParam("TriggerZones", zones + "," + c.getZone().getZoneType().toString());
+                        EnumSet<ZoneType> zones = (EnumSet<ZoneType>) t.getActiveZone();
+                        tweakedTrigs.put(t.getId(), zones);
+                        zones.add(c.getZone().getZoneType());
+                        t.setActiveZone(zones);
+                        affected.add(c);
+                        game.getTriggerHandler().registerOneTrigger(t);
+                    }
+                }
+            }
+            runParams.put(AbilityKey.Affected, affected);
+            if (affected.isEmpty()) { // if no Defined has chaos ability, don't trigger non Defined
+                return;
+            }
+        }
+
+        game.getTriggerHandler().runTrigger(TriggerType.ChaosEnsues, runParams,false);
+
+        for (Map.Entry<Integer, EnumSet<ZoneType>> e : tweakedTrigs.entrySet()) {
+            for (Card c : affected) {
+                for (Trigger t : c.getTriggers()) {
+                    if (t.getId() == e.getKey()) {
+                       EnumSet<ZoneType> zones = e.getValue();
+                        t.setActiveZone(zones);
+                    }
+                }
+            }
+        }
+    }
+}

forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java

@@ -13,8 +13,14 @@ public class PlaneswalkEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         Game game = sa.getActivatingPlayer().getGame();
 
-        for (Player p : game.getPlayers()) {
-            p.leaveCurrentPlane();
+        if (game.getActivePlanes() == null) { // not a planechase game, nothing happens
+            return;
+        }
+
+        if (!sa.hasParam("DontPlaneswalkAway")) {
+            for (Player p : game.getPlayers()) {
+                p.leaveCurrentPlane();
+            }
         }
         if (sa.hasParam("Defined")) {
             CardCollectionView destinations = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);

forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java

@@ -68,6 +68,9 @@ public class RollDiceEffect extends SpellAbilityEffect {
         return rollDiceForPlayer(sa, player, amount, sides, 0, 0, null);
     }
     private static int rollDiceForPlayer(SpellAbility sa, Player player, int amount, int sides, int ignore, int modifier, List<Integer> rollsResult) {
+        if (amount == 0) {
+            return 0;
+        }
         int advantage = getRollAdvange(player);
         amount += advantage;
         int total = 0;

forge-game/src/main/java/forge/game/ability/effects/RunChaosEffect.java

@@ -1,12 +1,6 @@
 package forge.game.ability.effects;
 
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
-
-import forge.game.PlanarDice;
-import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
@@ -16,17 +10,17 @@ import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
 import forge.game.trigger.WrappedAbility;
 
+import java.util.List;
+
 public class RunChaosEffect extends SpellAbilityEffect {
 
     @Override
     public void resolve(SpellAbility sa) {
-        Map<AbilityKey, Object> map = AbilityKey.mapFromPlayer(sa.getActivatingPlayer());
-        map.put(AbilityKey.Result, PlanarDice.Chaos);
 
         List<SpellAbility> validSA = Lists.newArrayList();
         for (final Card c : getTargetCards(sa)) {
             for (Trigger t : c.getTriggers()) {
-                if (TriggerType.PlanarDice.equals(t.getMode()) && t.performTest(map)) {
+                if (t.getMode() == TriggerType.ChaosEnsues) {
                     SpellAbility triggerSA = t.ensureAbility().copy(sa.getActivatingPlayer());
 
                     Player decider = sa.getActivatingPlayer();
@@ -44,5 +38,4 @@ public class RunChaosEffect extends SpellAbilityEffect {
         }
         sa.getActivatingPlayer().getController().orderAndPlaySimultaneousSa(validSA);
     }
-
 }

forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java

@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import forge.util.Lang;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ArrayListMultimap;
@@ -35,13 +36,13 @@ public class VoteEffect extends SpellAbilityEffect {
     @Override
     protected String getStackDescription(final SpellAbility sa) {
         final StringBuilder sb = new StringBuilder();
-        sb.append(StringUtils.join(getDefinedPlayersOrTargeted(sa), ", "));
-        sb.append(" vote ");
+        sb.append(Lang.joinHomogenous(getDefinedPlayersOrTargeted(sa))).append(" vote ");
         if (sa.hasParam("VoteType")) {
-            sb.append(StringUtils.join(sa.getParam("VoteType").split(","), " or "));
+            sb.append("for ").append(StringUtils.join(sa.getParam("VoteType").split(","), " or "));
         } else if (sa.hasParam("VoteMessage")) {
             sb.append(sa.getParam("VoteMessage"));
         }
+        sb.append(".");
         return sb.toString();
     }
 

forge-game/src/main/java/forge/game/card/CardFactory.java

@@ -350,9 +350,17 @@ public class CardFactory {
         planesWalkTrigger.setOverridingAbility(AbilityFactory.getAbility(rolledWalk, card));
         card.addTrigger(planesWalkTrigger);
 
+        String chaosTrig = "Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Static$ True";
+
+        String rolledChaos = "DB$ ChaosEnsues";
+
+        Trigger chaosTrigger = TriggerHandler.parseTrigger(chaosTrig, card, true);
+        chaosTrigger.setOverridingAbility(AbilityFactory.getAbility(rolledChaos, card));
+        card.addTrigger(chaosTrigger);
+
         String specialA = "ST$ RollPlanarDice | Cost$ X | SorcerySpeed$ True | Activator$ Player | SpecialAction$ True" +
                 " | ActivationZone$ Command | SpellDescription$ Roll the planar dice. X is equal to the number of " +
-                "times you have previously taken this action this turn.";
+                "times you have previously taken this action this turn. | CostDesc$ {X}: ";
 
         SpellAbility planarRoll = AbilityFactory.getAbility(specialA, card);
         planarRoll.setSVar("X", "Count$PlanarDiceSpecialActionThisTurn");

forge-game/src/main/java/forge/game/card/CardUtil.java

@@ -203,7 +203,7 @@ public final class CardUtil {
         newCopy.getCurrentState().copyFrom(in.getState(in.getFaceupCardStateName()), true);
         if (in.isFaceDown()) {
             newCopy.turnFaceDownNoUpdate();
-            newCopy.setType(new CardType(in.getType()));
+            newCopy.setType(new CardType(in.getCurrentState().getType()));
             // prevent StackDescription from revealing face
             newCopy.updateStateForView();
         }

forge-game/src/main/java/forge/game/player/Player.java

@@ -209,6 +209,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     private Map<Card, Card> maingameCardsMap = Maps.newHashMap();
 
     private CardCollection currentPlanes = new CardCollection();
+    private CardCollection planeswalkedToThisTurn = new CardCollection();
 
     private PlayerStatistics stats = new PlayerStatistics();
     private PlayerController controller;
@@ -1918,6 +1919,10 @@ public class Player extends GameEntity implements Comparable<Player> {
         completedDungeons.clear();
     }
 
+    public final List<Card> getPlaneswalkedToThisTurn() {
+        return planeswalkedToThisTurn;
+    }
+
     public final void altWinBySpellEffect(final String sourceName) {
         if (cantWin()) {
             System.out.println("Tried to win, but currently can't.");
@@ -2458,6 +2463,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         setNumManaConversion(0);
 
         damageReceivedThisTurn.clear();
+        planeswalkedToThisTurn.clear();
 
         // set last turn nr
         if (game.getPhaseHandler().isPlayerTurn(this)) {
@@ -2617,7 +2623,7 @@ public class Player extends GameEntity implements Comparable<Player> {
      * Then runs triggers.
      */
     public void planeswalkTo(SpellAbility sa, final CardCollectionView destinations) {
-        System.out.println(getName() + ": planeswalk to " + destinations.toString());
+        System.out.println(getName() + " planeswalks to " + destinations.toString());
         currentPlanes.addAll(destinations);
         game.getView().updatePlanarPlayer(getView());
 
@@ -2625,8 +2631,9 @@ public class Player extends GameEntity implements Comparable<Player> {
         moveParams.put(AbilityKey.LastStateBattlefield, sa.getLastStateBattlefield());
         moveParams.put(AbilityKey.LastStateGraveyard, sa.getLastStateGraveyard());
 
-        for (Card c : currentPlanes) {
+        for (Card c : destinations) {
             game.getAction().moveTo(ZoneType.Command, c, sa, moveParams);
+            planeswalkedToThisTurn.add(c);
             //getZone(ZoneType.PlanarDeck).remove(c);
             //getZone(ZoneType.Command).add(c);
         }
@@ -2634,7 +2641,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         game.setActivePlanes(currentPlanes);
         //Run PlaneswalkedTo triggers here.
         final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
-        runParams.put(AbilityKey.Cards, currentPlanes);
+        runParams.put(AbilityKey.Cards, destinations);
         game.getTriggerHandler().runTrigger(TriggerType.PlaneswalkedTo, runParams, false);
         view.updateCurrentPlaneName(currentPlanes.toString().replaceAll(" \\(.*","").replace("[",""));
     }

forge-game/src/main/java/forge/game/trigger/TriggerChaosEnsues.java

@@ -0,0 +1,63 @@
+package forge.game.trigger;
+
+import forge.game.GameObject;
+import forge.game.ability.AbilityKey;
+import forge.game.card.Card;
+import forge.game.spellability.SpellAbility;
+
+import java.util.Map;
+
+public class TriggerChaosEnsues extends Trigger {
+
+    /**
+     * <p>
+     * Constructor for Trigger_ChaosEnsues
+     * </p>
+     *
+     * @param params
+     *            a {@link java.util.HashMap} object.
+     * @param host
+     *            a {@link forge.game.card.Card} object.
+     * @param intrinsic
+     *            the intrinsic
+     */
+    public TriggerChaosEnsues(final Map<String, String> params, final Card host, final boolean intrinsic) {
+        super(params, host, intrinsic);
+    }
+
+    /* (non-Javadoc)
+     * @see forge.card.trigger.Trigger#performTest(java.util.Map)
+     */
+    @Override
+    public boolean performTest(Map<AbilityKey, Object> runParams) {
+        if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Player))) {
+            return false;
+        }
+        if (runParams.containsKey(AbilityKey.Affected)) {
+            final Object o = runParams.get(AbilityKey.Affected);
+            if (o instanceof GameObject) {
+                final GameObject c = (GameObject) o;
+                if (!c.equals(this.getHostCard())) {
+                    return false;
+                }
+            } else if (o instanceof Iterable<?>) {
+                for (Object o2 : (Iterable<?>) o) {
+                    if (!o2.equals(this.getHostCard())) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void setTriggeringObjects(SpellAbility sa, Map<AbilityKey, Object> runParams) {
+        sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
+    }
+
+    @Override
+    public String getImportantStackObjects(SpellAbility sa) {
+        return "";
+    }
+}

forge-game/src/main/java/forge/game/trigger/TriggerHandler.java

@@ -180,7 +180,7 @@ public class TriggerHandler {
         return FileSection.parseToMap(trigParse, FileSection.DOLLAR_SIGN_KV_SEPARATOR);
     }
 
-    private void collectTriggerForWaiting() {
+    public void collectTriggerForWaiting() {
         for (final TriggerWaiting wt : waitingTriggers) {
             if (wt.getTriggers() != null)
                 continue;

forge-game/src/main/java/forge/game/trigger/TriggerType.java

@@ -39,6 +39,7 @@ public enum TriggerType {
     ChangesController(TriggerChangesController.class),
     ChangesZone(TriggerChangesZone.class),
     ChangesZoneAll(TriggerChangesZoneAll.class),
+    ChaosEnsues(TriggerChaosEnsues.class),
     Clashed(TriggerClashed.class),
     ClassLevelGained(TriggerClassLevelGained.class),
     ConjureAll(TriggerConjureAll.class),

forge-gui/res/adventure/Shandalar/decks/copperhostbrutalizer.dck

@@ -0,0 +1,43 @@
+[metadata]
+Name=copperhostbrutalizer
+[Avatar]
+
+[Main]
+2 Blighted Burgeoning|MOM|1
+1 Bloated Contaminator|ONE|1
+1 Bloated Contaminator|ONE|2
+1 Bloated Processor|MOM|1
+1 Bloated Processor|MOM|2
+2 Converter Beast|MOM|1
+2 Drown in Ichor|ONE|1
+4 Elvish Vatkeeper|MOM|1
+2 Expand the Sphere|ONE|1
+1 Forest|ONE|1
+5 Forest|ONE|2
+6 Forest|ONE|3
+2 Gift of Compleation|MOM|1
+2 Glistening Dawn|MOM|2
+1 Grafted Butcher|MOM|1
+1 Grafted Butcher|MOM|2
+2 Gulping Scraptrap|ONE|1
+2 Ichor Drinker|MOM|1
+4 Jungle Hollow|MOM|1
+3 Swamp|ONE|1
+1 Swamp|ONE|2
+3 Swamp|ONE|3
+1 Swamp|ONE|4
+2 Tangled Skyline|MOM|1
+2 Traumatic Revelation|MOM|1
+2 Vat Emergence|ONE|1
+2 Vat of Rebirth|ONE|1
+2 Venomous Brutalizer|ONE|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+

forge-gui/res/adventure/Shandalar/decks/drossgrimnarch.dck

@@ -0,0 +1,47 @@
+[metadata]
+Name=drossgrimnarch
+[Avatar]
+
+[Main]
+2 Annihilating Glare|ONE|1
+2 Bilious Skulldweller|ONE|1
+2 Blightwing Whelp|YONE|1
+2 Chittering Skitterling|ONE|1
+2 Darkslick Shores|ONE|1
+4 Dismal Backwater|MOM|1
+2 Distorted Curiosity|ONE|1
+2 Drown in Ichor|ONE|1
+1 Experimental Augury|ONE|1
+1 Experimental Augury|ONE|2
+1 Grafted Butcher|MOM|1
+1 Grafted Butcher|MOM|2
+2 Grim Affliction|NPH|1
+2 Gulping Scraptrap|ONE|1
+2 Infectious Inquiry|ONE|1
+2 Island|MOM|1
+3 Island|MOM|2
+1 Island|MOM|3
+1 Mercurial Spelldancer|ONE|1
+1 Mercurial Spelldancer|ONE|2
+1 Myr Convert|ONE|1
+1 Myr Convert|ONE|2
+2 Necrogen Communion|ONE|1
+2 Pestilent Syphoner|ONE|1
+2 Quicksilver Servitor|YONE|1
+2 Sheoldred's Headcleaver|ONE|1
+5 Swamp|MOM|1
+1 Swamp|MOM|2
+4 Swamp|MOM|3
+1 Thrummingbird|ONE|1
+1 Thrummingbird|ONE|2
+2 Viral Drake|NPH|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+

forge-gui/res/adventure/Shandalar/decks/furnacetormentor.dck

@@ -0,0 +1,45 @@
+[metadata]
+Name=furnacetormentor
+[Avatar]
+
+[Main]
+1 All Will Be One|ONE|1
+1 All Will Be One|ONE|2
+2 Armored Scrapgorger|ONE|1
+2 Axiom Engraver|ONE|1
+2 Blighted Burgeoning|MOM|1
+2 Churning Reservoir|ONE|1
+2 Cinderslash Ravager|ONE|1
+2 Converter Beast|MOM|1
+2 Copperline Gorge|ONE|1
+2 Copperline Gorge|ONE|2
+2 Evolving Adaptive|ONE|1
+2 Expand the Sphere|ONE|1
+2 Exuberant Fuseling|ONE|1
+1 Forest|ONE|1
+1 Forest|ONE|2
+1 Forest|ONE|3
+4 Forest|ONE|4
+4 Magmatic Sprinter|ONE|1
+3 Mountain|ONE|1
+3 Mountain|ONE|2
+2 Mountain|ONE|3
+5 Mountain|ONE|4
+2 Nahiri's Warcrafting|MOM|1
+2 Thrill of Possibility|ONE|1
+1 Urabrask's Anointer|ONE|1
+1 Urabrask's Anointer|ONE|2
+2 Urabrask's Forge|ONE|1
+2 Urabrask's Forge|ONE|2
+1 Vindictive Flamestoker|ONE|1
+1 Vindictive Flamestoker|ONE|2
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+

forge-gui/res/adventure/Shandalar/decks/gitaxianscientist.dck

@@ -0,0 +1,43 @@
+[metadata]
+Name=gitaxianscientist
+[Avatar]
+
+[Main]
+2 Blighted Agent|NPH|1
+2 Bloated Contaminator|ONE|2
+2 Contagious Vorrac|ONE|1
+4 Distorted Curiosity|ONE|1
+1 Experimental Augury|ONE|1
+1 Experimental Augury|ONE|2
+2 Forest|ONE|1
+2 Forest|ONE|2
+3 Forest|ONE|3
+1 Forest|ONE|4
+2 Glistener Seer|ONE|1
+2 Ichorspit Basilisk|ONE|1
+2 Infectious Bite|ONE|1
+6 Island|ONE|1
+3 Island|ONE|2
+2 Island|ONE|3
+3 Island|ONE|4
+1 Mindsplice Apparatus|ONE|1
+1 Mindsplice Apparatus|ONE|2
+1 Myr Convert|ONE|1
+1 Myr Convert|ONE|2
+2 Serum Snare|ONE|1
+2 Tainted Observer|ONE|1
+2 The Seedcore|ONE|2
+2 Thrummingbird|ONE|1
+2 Thrummingbird|ONE|2
+4 Viral Drake|NPH|1
+2 Vivisurgeon's Insight|ONE|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+

forge-gui/res/adventure/Shandalar/decks/phyrexianangel.dck

@@ -0,0 +1,45 @@
+[metadata]
+Name=phyrexianangel
+[Avatar]
+
+[Main]
+2 Apostle of Invasion|ONE|1
+2 Bloated Contaminator|ONE|1
+2 Blossoming Sands|MOM|1
+2 Charge of the Mites|ONE|1
+4 Crawling Chorus|ONE|1
+2 Duelist of Deep Faith|ONE|1
+2 Flensing Raptor|ONE|1
+3 Forest|ONE|3
+3 Forest|ONE|4
+2 Infectious Bite|ONE|1
+2 Infested Fleshcutter|ONE|1
+2 Mite Overseer|ONE|2
+1 Myr Convert|ONE|1
+1 Myr Convert|ONE|2
+2 Norn's Wellspring|ONE|1
+1 Ossification|ONE|1
+1 Ossification|ONE|2
+2 Phyrexia's Core|NPH|1
+2 Plague Nurse|ONE|1
+3 Plains|ONE|1
+2 Plains|ONE|2
+1 Plains|ONE|3
+4 Plains|ONE|4
+2 Razorverge Thicket|ONE|2
+1 Sinew Dancer|ONE|1
+1 Sinew Dancer|ONE|2
+2 Slaughter Singer|ONE|1
+2 Slaughter Singer|ONE|2
+2 The Seedcore|ONE|1
+2 Venerated Rotpriest|ONE|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+

forge-gui/res/adventure/Shandalar/decks/phyrexianduelist.json

@@ -3,7 +3,7 @@
   "template":
   {
    "count":60,
-   "colors":["White", "Black"],
+   "colors":["White"],
    "tribe":"Phyrexian",        
    "tribeCards":1.0,
    "tribeSynergyCards":0.5,

forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx

@@ -151,6 +151,7 @@
 	"Challenger 20",
 	"Challenger 21",
 	"Challenger 22",
+	"Copper Host Infector",
 	"Dino",
 	"Eldraine Faerie",
 	"Elf",

forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx

@@ -137,6 +137,7 @@
 	"Challenger 22",
 	"Djinn",
 	"Elemental",
+	"Gitaxian Underling",
 	"Merfolk",
 	"Merfolk Avatar",
 	"Merfolk Fighter",

forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx

@@ -136,6 +136,7 @@
 	"Efreet",
 	"Fire Elemental",
 	"Flame Elemental",
+	"Furnace Goblin",
 	"Goblin",
 	"Goblin Chief",
 	"Goblin Warrior",

forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx

@@ -145,6 +145,7 @@
 	"Human guard",
 	"Knight",
 	"Monk",
+	"Orthodoxy Duelist",
 	"White Dwarf",
 	"White Wiz1",
 	"White Wiz2",

forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx

@@ -67,6 +67,7 @@
 	"Dark Knight",
 	"Death Knight",
 	"Demon",
+	"Dross Gladiator",
 	"Ghoul",
 	"Ghost",
 	"Harpy",

forge-gui/res/adventure/Shandalar/maps/map/phyrexian_b1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="76">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="77">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -13,7 +13,7 @@
  </layer>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJy1lVEOhCAMRP01epYeYw9mun94H4+3IbFhtrYKFkgaIAiPMgNuyzRtFfGZ/aiZ/zYSldjpvz+KeayFx2eN7Tw+istnbkzXPfTm4nqoZ+Za+vbiW1zR2vJa/j7iM2vfieriS4Xf6nmPy6BvUnrfRYQrdwf99MTnDtyavEZwUT+dLz/kHeXqs9Uh49pXLX7GIncW3ym9D2xH7nEuUgvX83RSeUaYwpX3wdJO96Nc69y9f9EInsX1zrd1zR/ubyqt
+   eJy1lVEOhCAMRP3duGfhGB7MdP/Y++zxDIkTx24rCJVkAgTD67SA6zxNa0XLq021fXqU06FvOs85tkjm733wZO95XNbBjubK7k3SfwzR+WYfrGywisr3EWyLi1pb8YxywfPO1ZU+6cy/E4fHFapvVvW+0ggXd4fPU40vAdwWX09wuX7ar1R8j3J1brWwPnKuuOHO8jul4+CxFXerSkMPrnems+Gzlwku3gerdnoObq9XK+/evyjCZwvXy+/dPTf2kSWe
   </data>
  </layer>
  <layer id="3" name="Clutter" width="30" height="17">
@@ -26,7 +26,7 @@
  </layer>
  <layer id="2" name="Walls" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJzbwcPAsIMI3K6HGxOjXwYNE6OnD2g2PjCBCLtH7SUOT9eD4GlQN8zQQ4jRKn6R01Ub1N4OEtMZLcIZHaC7iV72TtDD5NPDXmzuGGr2TkfCIIDMxxau9PAvuj3z0NxJy3IDnU+v8goEZujhLkdoaS++8pIW9uLzJ6X2wsoeZAATI6deAABIX/aO
+   eJzbwcPAsIMAbtNjYGjHgzv0CJshg4YJqQfhPqC5+MCEUXupYu80oLnToXgd1A0bkMRm0Mhe5HQ1D2rvAhLTGS3CGR3cxOIOetg7QQ+TTw97sbljKNl7CCntToe6AZm/DEu40sO/6PZcRHPnDDrZi60coaW9G/RwlyO0tBdfeUkLe88RUV6SY+8dpLIHGcDEbpNRPgMAC9v4YQ==
   </data>
  </layer>
  <layer id="8" name="Archway" width="30" height="17">
@@ -79,25 +79,25 @@
 ]</property>
    </properties>
   </object>
-  <object id="75" template="../obj/booster.tx" x="254.75" y="33.5">
+  <object id="75" template="../obj/booster.tx" x="216.75" y="32.8333">
    <properties>
     <property name="reward">[
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 10,
     &quot;rarity&quot;: [ &quot;Common&quot; ]
     &quot;colors&quot;: [ &quot;blue&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 3,
     &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
     &quot;colors&quot;: [ &quot;blue&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 1,
     &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
@@ -107,6 +107,7 @@
 </property>
    </properties>
   </object>
+  <object id="76" template="../obj/treasure.tx" x="256" y="32"/>
  </objectgroup>
  <objectgroup id="7" name="Waypoints">
   <object id="64" template="../obj/waypoint.tx" x="273" y="145"/>

forge-gui/res/adventure/Shandalar/maps/map/phyrexian_black1.tmx

@@ -58,21 +58,21 @@
    <properties>
     <property name="reward">[
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 10,
     &quot;rarity&quot;: [ &quot;Common&quot; ]
     &quot;colors&quot;: [ &quot;black&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 3,
     &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
     &quot;colors&quot;: [ &quot;black&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 1,
     &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]

forge-gui/res/adventure/Shandalar/maps/map/phyrexian_g1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="29" height="34" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="74">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="29" height="34" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="75">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -49,21 +49,21 @@
    <properties>
     <property name="reward">[
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 10,
     &quot;rarity&quot;: [ &quot;Common&quot; ]
     &quot;colors&quot;: [ &quot;green&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 3,
     &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
     &quot;colors&quot;: [ &quot;green&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 1,
     &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
@@ -101,6 +101,7 @@
     <property name="waypoints" value=""/>
    </properties>
   </object>
+  <object id="74" template="../obj/treasure.tx" x="217" y="71"/>
  </objectgroup>
  <objectgroup id="7" name="Waypoints">
   <object id="57" template="../obj/waypoint.tx" x="88.5" y="327.167"/>

forge-gui/res/adventure/Shandalar/maps/map/phyrexian_r1.tmx

@@ -46,7 +46,6 @@
    <properties>
     <property name="enemy" value="Furnace Tormentor"/>
     <property name="threatRange" value="20"/>
-    <property name="waypoints" value="60,58,57,62,60,58,57,62,60,59,61,62"/>
    </properties>
   </object>
   <object id="78" template="../obj/enemy.tx" x="136.333" y="219.333">
@@ -99,21 +98,21 @@
    <properties>
     <property name="reward">[
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 10,
     &quot;rarity&quot;: [ &quot;Common&quot; ]
     &quot;colors&quot;: [ &quot;red&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 3,
     &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
     &quot;colors&quot;: [ &quot;red&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 1,
     &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]

forge-gui/res/adventure/Shandalar/maps/map/phyrexian_w1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="78">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="79">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -64,21 +64,21 @@
    <properties>
     <property name="reward">[
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 10,
     &quot;rarity&quot;: [ &quot;Common&quot; ]
     &quot;colors&quot;: [ &quot;white&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 3,
     &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
     &quot;colors&quot;: [ &quot;white&quot; ]
   },
   {
-    &quot;editions&quot;: [ &quot;ONE&quot; ],
+    &quot;editions&quot;: [ &quot;NPH&quot;,&quot;ONE&quot;,&quot;MOM&quot; ],
     &quot;type&quot;: &quot;card&quot;,
     &quot;count&quot;: 1,
     &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
@@ -88,6 +88,7 @@
 </property>
    </properties>
   </object>
+  <object id="78" template="../obj/treasure.tx" x="315" y="74"/>
  </objectgroup>
  <objectgroup id="8" name="Waypoints">
   <object id="70" template="../obj/waypoint.tx" x="144" y="176"/>

forge-gui/res/adventure/Shandalar/sprites/heroes/avatar.atlas

@@ -602,4 +602,64 @@ Werewolf_f
   size: 16, 16        
 Werewolf_f
   size: 16, 16        
-  xy: 144, 304
+  xy: 144, 304  
+Leonin_m
+  xy: 0, 320
+  size: 16, 16         
+Leonin_m
+  xy: 16, 320
+  size: 16, 16        
+Leonin_m
+  xy: 32, 320
+  size: 16, 16        
+Leonin_m
+  xy: 48, 320
+  size: 16, 16        
+Leonin_m
+  xy: 64, 320
+  size: 16, 16        
+Leonin_m
+  xy: 80, 320
+  size: 16, 16        
+Leonin_m
+  xy: 96, 320
+  size: 16, 16        
+Leonin_m
+  xy: 112, 320
+  size: 16, 16        
+Leonin_m
+  xy: 128, 320
+  size: 16, 16        
+Leonin_m
+  xy: 144, 320
+  size: 16, 16        
+Leonin_f
+  xy: 0, 336
+  size: 16, 16         
+Leonin_f
+  xy: 16, 336
+  size: 16, 16        
+Leonin_f
+  xy: 32, 336
+  size: 16, 16        
+Leonin_f
+  xy: 48, 336
+  size: 16, 16        
+Leonin_f
+  xy: 64, 336
+  size: 16, 16        
+Leonin_f
+  xy: 80, 336
+  size: 16, 16        
+Leonin_f
+  xy: 96, 336
+  size: 16, 16        
+Leonin_f
+  xy: 112, 336
+  size: 16, 16        
+Leonin_f
+  xy: 128, 336
+  size: 16, 16        
+Leonin_f
+  size: 16, 16        
+  xy: 144, 336

forge-gui/res/adventure/Shandalar/sprites/heroes/leonin_f.atlas

@@ -0,0 +1,485 @@
+leonin_f.png
+size: 64,96
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none           
+IdleRight 
+  xy: 0, 0
+  size: 16, 16             
+IdleRight 
+  xy: 16, 0
+  size: 16, 16        
+IdleRight 
+  xy: 32, 0
+  size: 16, 16          
+IdleRight 
+  xy: 48, 0
+  size: 16, 16      
+IdleRightDown 
+  xy: 64, 0
+  size: 16, 16             
+IdleRightDown 
+  xy: 80, 0
+  size: 16, 16        
+IdleRightDown 
+  xy: 96, 0
+  size: 16, 16          
+IdleRightDown 
+  xy: 112, 0
+  size: 16, 16      
+IdleDown 
+  xy: 128, 0
+  size: 16, 16             
+IdleDown 
+  xy: 144, 0
+  size: 16, 16        
+IdleDown 
+  xy: 160, 0
+  size: 16, 16          
+IdleDown 
+  xy: 176, 0
+  size: 16, 16     
+IdleLeftDown 
+  xy: 192, 0
+  size: 16, 16             
+IdleLeftDown 
+  xy: 208, 0
+  size: 16, 16        
+IdleLeftDown 
+  xy: 224, 0
+  size: 16, 16          
+IdleLeftDown 
+  xy: 240, 0
+  size: 16, 16      
+IdleLeft 
+  xy: 256, 0
+  size: 16, 16             
+IdleLeft 
+  xy: 272, 0
+  size: 16, 16        
+IdleLeft 
+  xy: 288, 0
+  size: 16, 16          
+IdleLeft 
+  xy: 304, 0
+  size: 16, 16      
+IdleLeftUp
+  xy: 320, 0
+  size: 16, 16             
+IdleLeftUp 
+  xy: 336, 0
+  size: 16, 16        
+IdleLeftUp 
+  xy: 352, 0
+  size: 16, 16          
+IdleLeftUp 
+  xy: 368, 0
+  size: 16, 16     
+IdleUp
+  xy: 384, 0
+  size: 16, 16             
+IdleUp 
+  xy: 400, 0
+  size: 16, 16        
+IdleUp 
+  xy: 416, 0
+  size: 16, 16          
+IdleUp 
+  xy: 432, 0
+  size: 16, 16        
+IdleRightUp
+  xy: 448, 0
+  size: 16, 16             
+IdleRightUp 
+  xy: 464, 0
+  size: 16, 16        
+IdleRightUp 
+  xy: 480, 0
+  size: 16, 16          
+IdleRightUp 
+  xy: 496, 0
+  size: 16, 16       
+WalkRight 
+  xy: 0, 16
+  size: 16, 16             
+WalkRight 
+  xy: 16, 16
+  size: 16, 16        
+WalkRight 
+  xy: 32, 16
+  size: 16, 16          
+WalkRight 
+  xy: 48, 16
+  size: 16, 16      
+WalkRightDown 
+  xy: 64, 16
+  size: 16, 16             
+WalkRightDown 
+  xy: 80, 16
+  size: 16, 16        
+WalkRightDown 
+  xy: 96, 16
+  size: 16, 16          
+WalkRightDown 
+  xy: 112, 16
+  size: 16, 16      
+WalkDown 
+  xy: 128, 16
+  size: 16, 16             
+WalkDown 
+  xy: 144, 16
+  size: 16, 16        
+WalkDown 
+  xy: 160, 16
+  size: 16, 16          
+WalkDown 
+  xy: 176, 16
+  size: 16, 16     
+WalkLeftDown 
+  xy: 192, 16
+  size: 16, 16             
+WalkLeftDown 
+  xy: 208, 16
+  size: 16, 16        
+WalkLeftDown 
+  xy: 224, 16
+  size: 16, 16          
+WalkLeftDown 
+  xy: 240, 16
+  size: 16, 16      
+WalkLeft 
+  xy: 256, 16
+  size: 16, 16             
+WalkLeft 
+  xy: 272, 16
+  size: 16, 16        
+WalkLeft 
+  xy: 288, 16
+  size: 16, 16          
+WalkLeft 
+  xy: 304, 16
+  size: 16, 16      
+WalkLeftUp
+  xy: 320, 16
+  size: 16, 16             
+WalkLeftUp 
+  xy: 336, 16
+  size: 16, 16        
+WalkLeftUp 
+  xy: 352, 16
+  size: 16, 16          
+WalkLeftUp 
+  xy: 368, 16
+  size: 16, 16     
+WalkUp
+  xy: 384, 16
+  size: 16, 16             
+WalkUp 
+  xy: 400, 16
+  size: 16, 16        
+WalkUp 
+  xy: 416, 16
+  size: 16, 16          
+WalkUp 
+  xy: 432, 16
+  size: 16, 16        
+WalkRightUp
+  xy: 448, 16
+  size: 16, 16             
+WalkRightUp 
+  xy: 464, 16
+  size: 16, 16        
+WalkRightUp 
+  xy: 480, 16
+  size: 16, 16          
+WalkRightUp 
+  xy: 496, 16
+  size: 16, 16       
+AttackRight 
+  xy: 0, 32
+  size: 16, 16             
+AttackRight 
+  xy: 16, 32
+  size: 16, 16        
+AttackRight 
+  xy: 32, 32
+  size: 16, 16          
+AttackRight 
+  xy: 48, 32
+  size: 16, 16      
+AttackRightDown 
+  xy: 64, 32
+  size: 16, 16             
+AttackRightDown 
+  xy: 80, 32
+  size: 16, 16        
+AttackRightDown 
+  xy: 96, 32
+  size: 16, 16          
+AttackRightDown 
+  xy: 112, 32
+  size: 16, 16      
+AttackDown 
+  xy: 128, 32
+  size: 16, 16             
+AttackDown 
+  xy: 144, 32
+  size: 16, 16        
+AttackDown 
+  xy: 160, 32
+  size: 16, 16          
+AttackDown 
+  xy: 176, 32
+  size: 16, 16     
+AttackLeftDown 
+  xy: 192, 32
+  size: 16, 16             
+AttackLeftDown 
+  xy: 208, 32
+  size: 16, 16        
+AttackLeftDown 
+  xy: 224, 32
+  size: 16, 16          
+AttackLeftDown 
+  xy: 240, 32
+  size: 16, 16      
+AttackLeft 
+  xy: 256, 32
+  size: 16, 16             
+AttackLeft 
+  xy: 272, 32
+  size: 16, 16        
+AttackLeft 
+  xy: 288, 32
+  size: 16, 16          
+AttackLeft 
+  xy: 304, 32
+  size: 16, 16      
+AttackLeftUp
+  xy: 320, 32
+  size: 16, 16             
+AttackLeftUp 
+  xy: 336, 32
+  size: 16, 16        
+AttackLeftUp 
+  xy: 352, 32
+  size: 16, 16          
+AttackLeftUp 
+  xy: 368, 32
+  size: 16, 16     
+AttackUp
+  xy: 384, 32
+  size: 16, 16             
+AttackUp 
+  xy: 400, 32
+  size: 16, 16        
+AttackUp 
+  xy: 416, 32
+  size: 16, 16          
+AttackUp 
+  xy: 432, 32
+  size: 16, 16        
+AttackRightUp
+  xy: 448, 32
+  size: 16, 16             
+AttackRightUp 
+  xy: 464, 32
+  size: 16, 16        
+AttackRightUp 
+  xy: 480, 32
+  size: 16, 16          
+AttackRightUp 
+  xy: 496, 32
+  size: 16, 16       
+HitRight 
+  xy: 0, 48
+  size: 16, 16             
+HitRight 
+  xy: 16, 48
+  size: 16, 16        
+HitRight 
+  xy: 32, 48
+  size: 16, 16          
+HitRight 
+  xy: 48, 48
+  size: 16, 16      
+HitRightDown 
+  xy: 64, 48
+  size: 16, 16             
+HitRightDown 
+  xy: 80, 48
+  size: 16, 16        
+HitRightDown 
+  xy: 96, 48
+  size: 16, 16          
+HitRightDown 
+  xy: 112, 48
+  size: 16, 16      
+HitDown 
+  xy: 128, 48
+  size: 16, 16             
+HitDown 
+  xy: 144, 48
+  size: 16, 16        
+HitDown 
+  xy: 160, 48
+  size: 16, 16          
+HitDown 
+  xy: 176, 48
+  size: 16, 16     
+HitLeftDown 
+  xy: 192, 48
+  size: 16, 16             
+HitLeftDown 
+  xy: 208, 48
+  size: 16, 16        
+HitLeftDown 
+  xy: 224, 48
+  size: 16, 16          
+HitLeftDown 
+  xy: 240, 48
+  size: 16, 16      
+HitLeft 
+  xy: 256, 48
+  size: 16, 16             
+HitLeft 
+  xy: 272, 48
+  size: 16, 16        
+HitLeft 
+  xy: 288, 48
+  size: 16, 16          
+HitLeft 
+  xy: 304, 48
+  size: 16, 16      
+HitLeftUp
+  xy: 320, 48
+  size: 16, 16             
+HitLeftUp 
+  xy: 336, 48
+  size: 16, 16        
+HitLeftUp 
+  xy: 352, 48
+  size: 16, 16          
+HitLeftUp 
+  xy: 368, 48
+  size: 16, 16     
+HitUp
+  xy: 384, 48
+  size: 16, 16             
+HitUp 
+  xy: 400, 48
+  size: 16, 16        
+HitUp 
+  xy: 416, 48
+  size: 16, 16          
+HitUp 
+  xy: 432, 48
+  size: 16, 16        
+HitRightUp
+  xy: 448, 48
+  size: 16, 16             
+HitRightUp 
+  xy: 464, 48
+  size: 16, 16        
+HitRightUp 
+  xy: 480, 48
+  size: 16, 16          
+HitRightUp 
+  xy: 496, 48
+  size: 16, 16       
+DeathRight 
+  xy: 0, 64
+  size: 16, 16             
+DeathRight 
+  xy: 16, 64
+  size: 16, 16        
+DeathRight 
+  xy: 32, 64
+  size: 16, 16          
+DeathRight 
+  xy: 48, 64
+  size: 16, 16      
+DeathRightDown 
+  xy: 64, 64
+  size: 16, 16             
+DeathRightDown 
+  xy: 80, 64
+  size: 16, 16        
+DeathRightDown 
+  xy: 96, 64
+  size: 16, 16          
+DeathRightDown 
+  xy: 112, 64
+  size: 16, 16      
+DeathDown 
+  xy: 128, 64
+  size: 16, 16             
+DeathDown 
+  xy: 144, 64
+  size: 16, 16        
+DeathDown 
+  xy: 160, 64
+  size: 16, 16          
+DeathDown 
+  xy: 176, 64
+  size: 16, 16     
+DeathLeftDown 
+  xy: 192, 64
+  size: 16, 16             
+DeathLeftDown 
+  xy: 208, 64
+  size: 16, 16        
+DeathLeftDown 
+  xy: 224, 64
+  size: 16, 16          
+DeathLeftDown 
+  xy: 240, 64
+  size: 16, 16      
+DeathLeft 
+  xy: 256, 64
+  size: 16, 16             
+DeathLeft 
+  xy: 272, 64
+  size: 16, 16        
+DeathLeft 
+  xy: 288, 64
+  size: 16, 16          
+DeathLeft 
+  xy: 304, 64
+  size: 16, 16      
+DeathLeftUp
+  xy: 320, 64
+  size: 16, 16             
+DeathLeftUp 
+  xy: 336, 64
+  size: 16, 16        
+DeathLeftUp 
+  xy: 352, 64
+  size: 16, 16          
+DeathLeftUp 
+  xy: 368, 64
+  size: 16, 16     
+DeathUp
+  xy: 384, 64
+  size: 16, 16             
+DeathUp 
+  xy: 400, 64
+  size: 16, 16        
+DeathUp 
+  xy: 416, 64
+  size: 16, 16          
+DeathUp 
+  xy: 432, 64
+  size: 16, 16        
+DeathRightUp
+  xy: 448, 64
+  size: 16, 16             
+DeathRightUp 
+  xy: 464, 64
+  size: 16, 16        
+DeathRightUp 
+  xy: 480, 64
+  size: 16, 16          
+DeathRightUp 
+  xy: 496, 64
+  size: 16, 16       

forge-gui/res/adventure/Shandalar/sprites/heroes/leonin_m.atlas

@@ -0,0 +1,485 @@
+leonin_m.png
+size: 64,96
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none           
+IdleRight 
+  xy: 0, 0
+  size: 16, 16             
+IdleRight 
+  xy: 16, 0
+  size: 16, 16        
+IdleRight 
+  xy: 32, 0
+  size: 16, 16          
+IdleRight 
+  xy: 48, 0
+  size: 16, 16      
+IdleRightDown 
+  xy: 64, 0
+  size: 16, 16             
+IdleRightDown 
+  xy: 80, 0
+  size: 16, 16        
+IdleRightDown 
+  xy: 96, 0
+  size: 16, 16          
+IdleRightDown 
+  xy: 112, 0
+  size: 16, 16      
+IdleDown 
+  xy: 128, 0
+  size: 16, 16             
+IdleDown 
+  xy: 144, 0
+  size: 16, 16        
+IdleDown 
+  xy: 160, 0
+  size: 16, 16          
+IdleDown 
+  xy: 176, 0
+  size: 16, 16     
+IdleLeftDown 
+  xy: 192, 0
+  size: 16, 16             
+IdleLeftDown 
+  xy: 208, 0
+  size: 16, 16        
+IdleLeftDown 
+  xy: 224, 0
+  size: 16, 16          
+IdleLeftDown 
+  xy: 240, 0
+  size: 16, 16      
+IdleLeft 
+  xy: 256, 0
+  size: 16, 16             
+IdleLeft 
+  xy: 272, 0
+  size: 16, 16        
+IdleLeft 
+  xy: 288, 0
+  size: 16, 16          
+IdleLeft 
+  xy: 304, 0
+  size: 16, 16      
+IdleLeftUp
+  xy: 320, 0
+  size: 16, 16             
+IdleLeftUp 
+  xy: 336, 0
+  size: 16, 16        
+IdleLeftUp 
+  xy: 352, 0
+  size: 16, 16          
+IdleLeftUp 
+  xy: 368, 0
+  size: 16, 16     
+IdleUp
+  xy: 384, 0
+  size: 16, 16             
+IdleUp 
+  xy: 400, 0
+  size: 16, 16        
+IdleUp 
+  xy: 416, 0
+  size: 16, 16          
+IdleUp 
+  xy: 432, 0
+  size: 16, 16        
+IdleRightUp
+  xy: 448, 0
+  size: 16, 16             
+IdleRightUp 
+  xy: 464, 0
+  size: 16, 16        
+IdleRightUp 
+  xy: 480, 0
+  size: 16, 16          
+IdleRightUp 
+  xy: 496, 0
+  size: 16, 16       
+WalkRight 
+  xy: 0, 16
+  size: 16, 16             
+WalkRight 
+  xy: 16, 16
+  size: 16, 16        
+WalkRight 
+  xy: 32, 16
+  size: 16, 16          
+WalkRight 
+  xy: 48, 16
+  size: 16, 16      
+WalkRightDown 
+  xy: 64, 16
+  size: 16, 16             
+WalkRightDown 
+  xy: 80, 16
+  size: 16, 16        
+WalkRightDown 
+  xy: 96, 16
+  size: 16, 16          
+WalkRightDown 
+  xy: 112, 16
+  size: 16, 16      
+WalkDown 
+  xy: 128, 16
+  size: 16, 16             
+WalkDown 
+  xy: 144, 16
+  size: 16, 16        
+WalkDown 
+  xy: 160, 16
+  size: 16, 16          
+WalkDown 
+  xy: 176, 16
+  size: 16, 16     
+WalkLeftDown 
+  xy: 192, 16
+  size: 16, 16             
+WalkLeftDown 
+  xy: 208, 16
+  size: 16, 16        
+WalkLeftDown 
+  xy: 224, 16
+  size: 16, 16          
+WalkLeftDown 
+  xy: 240, 16
+  size: 16, 16      
+WalkLeft 
+  xy: 256, 16
+  size: 16, 16             
+WalkLeft 
+  xy: 272, 16
+  size: 16, 16        
+WalkLeft 
+  xy: 288, 16
+  size: 16, 16          
+WalkLeft 
+  xy: 304, 16
+  size: 16, 16      
+WalkLeftUp
+  xy: 320, 16
+  size: 16, 16             
+WalkLeftUp 
+  xy: 336, 16
+  size: 16, 16        
+WalkLeftUp 
+  xy: 352, 16
+  size: 16, 16          
+WalkLeftUp 
+  xy: 368, 16
+  size: 16, 16     
+WalkUp
+  xy: 384, 16
+  size: 16, 16             
+WalkUp 
+  xy: 400, 16
+  size: 16, 16        
+WalkUp 
+  xy: 416, 16
+  size: 16, 16          
+WalkUp 
+  xy: 432, 16
+  size: 16, 16        
+WalkRightUp
+  xy: 448, 16
+  size: 16, 16             
+WalkRightUp 
+  xy: 464, 16
+  size: 16, 16        
+WalkRightUp 
+  xy: 480, 16
+  size: 16, 16          
+WalkRightUp 
+  xy: 496, 16
+  size: 16, 16       
+AttackRight 
+  xy: 0, 32
+  size: 16, 16             
+AttackRight 
+  xy: 16, 32
+  size: 16, 16        
+AttackRight 
+  xy: 32, 32
+  size: 16, 16          
+AttackRight 
+  xy: 48, 32
+  size: 16, 16      
+AttackRightDown 
+  xy: 64, 32
+  size: 16, 16             
+AttackRightDown 
+  xy: 80, 32
+  size: 16, 16        
+AttackRightDown 
+  xy: 96, 32
+  size: 16, 16          
+AttackRightDown 
+  xy: 112, 32
+  size: 16, 16      
+AttackDown 
+  xy: 128, 32
+  size: 16, 16             
+AttackDown 
+  xy: 144, 32
+  size: 16, 16        
+AttackDown 
+  xy: 160, 32
+  size: 16, 16          
+AttackDown 
+  xy: 176, 32
+  size: 16, 16     
+AttackLeftDown 
+  xy: 192, 32
+  size: 16, 16             
+AttackLeftDown 
+  xy: 208, 32
+  size: 16, 16        
+AttackLeftDown 
+  xy: 224, 32
+  size: 16, 16          
+AttackLeftDown 
+  xy: 240, 32
+  size: 16, 16      
+AttackLeft 
+  xy: 256, 32
+  size: 16, 16             
+AttackLeft 
+  xy: 272, 32
+  size: 16, 16        
+AttackLeft 
+  xy: 288, 32
+  size: 16, 16          
+AttackLeft 
+  xy: 304, 32
+  size: 16, 16      
+AttackLeftUp
+  xy: 320, 32
+  size: 16, 16             
+AttackLeftUp 
+  xy: 336, 32
+  size: 16, 16        
+AttackLeftUp 
+  xy: 352, 32
+  size: 16, 16          
+AttackLeftUp 
+  xy: 368, 32
+  size: 16, 16     
+AttackUp
+  xy: 384, 32
+  size: 16, 16             
+AttackUp 
+  xy: 400, 32
+  size: 16, 16        
+AttackUp 
+  xy: 416, 32
+  size: 16, 16          
+AttackUp 
+  xy: 432, 32
+  size: 16, 16        
+AttackRightUp
+  xy: 448, 32
+  size: 16, 16             
+AttackRightUp 
+  xy: 464, 32
+  size: 16, 16        
+AttackRightUp 
+  xy: 480, 32
+  size: 16, 16          
+AttackRightUp 
+  xy: 496, 32
+  size: 16, 16       
+HitRight 
+  xy: 0, 48
+  size: 16, 16             
+HitRight 
+  xy: 16, 48
+  size: 16, 16        
+HitRight 
+  xy: 32, 48
+  size: 16, 16          
+HitRight 
+  xy: 48, 48
+  size: 16, 16      
+HitRightDown 
+  xy: 64, 48
+  size: 16, 16             
+HitRightDown 
+  xy: 80, 48
+  size: 16, 16        
+HitRightDown 
+  xy: 96, 48
+  size: 16, 16          
+HitRightDown 
+  xy: 112, 48
+  size: 16, 16      
+HitDown 
+  xy: 128, 48
+  size: 16, 16             
+HitDown 
+  xy: 144, 48
+  size: 16, 16        
+HitDown 
+  xy: 160, 48
+  size: 16, 16          
+HitDown 
+  xy: 176, 48
+  size: 16, 16     
+HitLeftDown 
+  xy: 192, 48
+  size: 16, 16             
+HitLeftDown 
+  xy: 208, 48
+  size: 16, 16        
+HitLeftDown 
+  xy: 224, 48
+  size: 16, 16          
+HitLeftDown 
+  xy: 240, 48
+  size: 16, 16      
+HitLeft 
+  xy: 256, 48
+  size: 16, 16             
+HitLeft 
+  xy: 272, 48
+  size: 16, 16        
+HitLeft 
+  xy: 288, 48
+  size: 16, 16          
+HitLeft 
+  xy: 304, 48
+  size: 16, 16      
+HitLeftUp
+  xy: 320, 48
+  size: 16, 16             
+HitLeftUp 
+  xy: 336, 48
+  size: 16, 16        
+HitLeftUp 
+  xy: 352, 48
+  size: 16, 16          
+HitLeftUp 
+  xy: 368, 48
+  size: 16, 16     
+HitUp
+  xy: 384, 48
+  size: 16, 16             
+HitUp 
+  xy: 400, 48
+  size: 16, 16        
+HitUp 
+  xy: 416, 48
+  size: 16, 16          
+HitUp 
+  xy: 432, 48
+  size: 16, 16        
+HitRightUp
+  xy: 448, 48
+  size: 16, 16             
+HitRightUp 
+  xy: 464, 48
+  size: 16, 16        
+HitRightUp 
+  xy: 480, 48
+  size: 16, 16          
+HitRightUp 
+  xy: 496, 48
+  size: 16, 16       
+DeathRight 
+  xy: 0, 64
+  size: 16, 16             
+DeathRight 
+  xy: 16, 64
+  size: 16, 16        
+DeathRight 
+  xy: 32, 64
+  size: 16, 16          
+DeathRight 
+  xy: 48, 64
+  size: 16, 16      
+DeathRightDown 
+  xy: 64, 64
+  size: 16, 16             
+DeathRightDown 
+  xy: 80, 64
+  size: 16, 16        
+DeathRightDown 
+  xy: 96, 64
+  size: 16, 16          
+DeathRightDown 
+  xy: 112, 64
+  size: 16, 16      
+DeathDown 
+  xy: 128, 64
+  size: 16, 16             
+DeathDown 
+  xy: 144, 64
+  size: 16, 16        
+DeathDown 
+  xy: 160, 64
+  size: 16, 16          
+DeathDown 
+  xy: 176, 64
+  size: 16, 16     
+DeathLeftDown 
+  xy: 192, 64
+  size: 16, 16             
+DeathLeftDown 
+  xy: 208, 64
+  size: 16, 16        
+DeathLeftDown 
+  xy: 224, 64
+  size: 16, 16          
+DeathLeftDown 
+  xy: 240, 64
+  size: 16, 16      
+DeathLeft 
+  xy: 256, 64
+  size: 16, 16             
+DeathLeft 
+  xy: 272, 64
+  size: 16, 16        
+DeathLeft 
+  xy: 288, 64
+  size: 16, 16          
+DeathLeft 
+  xy: 304, 64
+  size: 16, 16      
+DeathLeftUp
+  xy: 320, 64
+  size: 16, 16             
+DeathLeftUp 
+  xy: 336, 64
+  size: 16, 16        
+DeathLeftUp 
+  xy: 352, 64
+  size: 16, 16          
+DeathLeftUp 
+  xy: 368, 64
+  size: 16, 16     
+DeathUp
+  xy: 384, 64
+  size: 16, 16             
+DeathUp 
+  xy: 400, 64
+  size: 16, 16        
+DeathUp 
+  xy: 416, 64
+  size: 16, 16          
+DeathUp 
+  xy: 432, 64
+  size: 16, 16        
+DeathRightUp
+  xy: 448, 64
+  size: 16, 16             
+DeathRightUp 
+  xy: 464, 64
+  size: 16, 16        
+DeathRightUp 
+  xy: 480, 64
+  size: 16, 16          
+DeathRightUp 
+  xy: 496, 64
+  size: 16, 16       

forge-gui/res/adventure/Shandalar/world/black.json

@@ -47,6 +47,7 @@
 	"Dark Knight",
 	"Death Knight",
 	"Demon",
+	"Dross Gladiator",
 	"Eye",
 	"Fungus",
 	"Frog",

forge-gui/res/adventure/Shandalar/world/blue.json

@@ -43,6 +43,7 @@
 	"Frog",
 	"Frost Titan",
 	"Geist",
+	"Gitaxian Underling",
 	"Horror",
 	"Illusionist",
 	"Jellyfish",

forge-gui/res/adventure/Shandalar/world/enemies.json

@@ -3366,7 +3366,7 @@
 	"name": "Copper Host Brutalizer",
 	"sprite": "sprites/copperhostbrutalizer.atlas",
 	"deck": [
-		"deckscopperhostbrutalizer.json"
+		"decks/copperhostbrutalizer.dck" 
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4680,7 +4680,7 @@
 	"name": "Dross Grimnarch",
 	"sprite": "sprites/drossgrimnarch.atlas",
 	"deck": [
-		"decks/drossgrimnarch.json"
+		"decks/drossgrimnarch.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.1,
@@ -6197,7 +6197,7 @@
 	"name": "Furnace Tormentor",
 	"sprite": "sprites/furnacetormentor.atlas",
 	"deck": [
-		"decks/furnacetormentor.json"
+		"decks/furnacetormentor.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6814,7 +6814,7 @@
 	"name": "Gitaxian Scientist",
 	"sprite": "sprites/gitaxianscientist.atlas",
 	"deck": [
-		"decks/gitaxianscientist.json"
+		"decks/gitaxianscientist.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11471,7 +11471,7 @@
 	"name": "Orthodoxy Angel",
 	"sprite": "sprites/phyrexianangel.atlas",
 	"deck": [
-		"decks/phyrexianangel.json"
+		"decks/phyrexianangel.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.1,

forge-gui/res/adventure/Shandalar/world/green.json

@@ -42,6 +42,7 @@
 	"Challenger 20",
 	"Challenger 21",
 	"Challenger 22",
+	"Copper Host Infector",
 	"Dino",
 	"Eldraine Faerie",
 	"Elf",

forge-gui/res/adventure/Shandalar/world/heroes.json

@@ -70,7 +70,14 @@
     "male":"sprites/heroes/werewolf_m.atlas",      
     "femaleAvatar":"Werewolf_f",      
     "maleAvatar":"Werewolf_m" 
-  }   
+  },
+  {
+    "name":"Leonin",
+    "female":"sprites/heroes/leonin_f.atlas",      
+    "male":"sprites/heroes/leonin_m.atlas",      
+    "femaleAvatar":"Leonin_f",      
+    "maleAvatar":"Leonin_m" 
+  }  
   
   
   ]

forge-gui/res/adventure/Shandalar/world/red.json

@@ -47,6 +47,7 @@
 	"Efreet",
 	"Fire Elemental",
 	"Flame Elemental",
+	"Furnace Goblin",
 	"Goblin",
 	"Goblin Chief",
 	"Goblin Warrior",

forge-gui/res/adventure/Shandalar/world/white.json

@@ -54,6 +54,7 @@
 	"Knight",
 	"Kor Warrior",
 	"Monk",
+	"Orthodoxy Duelist",
 	"Owl",
 	"Raven",
 	"Scorpion",

forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt

@@ -1,9 +1,10 @@
 Name:Academy at Tolaria West
 ManaCost:no cost
 Types:Plane Dominaria
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | IsPresent$ Card.YouCtrl | PresentZone$ Hand | PresentCompare$ EQ0 | Execute$ AcademicDraw | TriggerDescription$ At the beginning of your end step, if you have no cards in hand, draw seven cards.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | IsPresent$ Card.YouOwn | PresentZone$ Hand | PresentCompare$ EQ0 | Execute$ AcademicDraw | TriggerDescription$ At the beginning of your end step, if you have no cards in hand, draw seven cards.
 SVar:AcademicDraw:DB$ Draw | Defined$ You | NumCards$ 7
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, discard your hand.
-SVar:RolledChaos:DB$ Discard | Mode$ Hand | Defined$ You
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigDiscard | TriggerDescription$ Whenever chaos ensues, discard your hand.
+SVar:TrigDiscard:DB$ Discard | Mode$ Hand | Defined$ You
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | CardsInHandLE$ 2
-Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever you roll {CHAOS}, discard your hand.
+Deckhas:Ability$Discard
+Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever chaos ensues, discard your hand.

forge-gui/res/cardsfolder/a/agyrem.txt

@@ -10,9 +10,9 @@ T:Mode$ ChangesZone | ValidCard$ Creature.nonWhite | Origin$ Battlefield | Desti
 SVar:TrigDelay2:DB$ Effect | Name$ Agyrem Effect For non-White Creatures | Triggers$ TrigEOT2 | RememberObjects$ TriggeredCard | Duration$ Permanent
 SVar:TrigEOT2:Mode$ Phase | Phase$ End of Turn | Execute$ AgyremReturn2 | TriggerDescription$ Return creature to its owner's hand at the beginning of the next end step.
 SVar:AgyremReturn2:DB$ ChangeZone | Defined$ Remembered | Origin$ Graveyard | Destination$ Hand | SubAbility$ AgyremCleanup
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, creatures can't attack you until a player planeswalks.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, creatures can't attack you until a player planeswalks.
 SVar:RolledChaos:DB$ Effect | Name$ Agyrem Effect - Can't Attack | StaticAbilities$ STCantAttack | Triggers$ TrigPlaneswalk | Duration$ Permanent
 SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature | Target$ You | Description$ Creatures can't attack you until a player planeswalks.
 SVar:TrigPlaneswalk:Mode$ PlaneswalkedFrom | Execute$ AgyremCleanup | Static$ True
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:Whenever a white creature dies, return it to the battlefield under its owner's control at the beginning of the next end step.\nWhenever a nonwhite creature dies, return it to its owner's hand at the beginning of the next end step.\nWhenever you roll {CHAOS}, creatures can't attack you until a player planeswalks.
+Oracle:Whenever a white creature dies, return it to the battlefield under its owner's control at the beginning of the next end step.\nWhenever a nonwhite creature dies, return it to its owner's hand at the beginning of the next end step.\nWhenever chaos ensues, creatures can't attack you until a player planeswalks.

forge-gui/res/cardsfolder/a/akoum.txt

@@ -2,7 +2,7 @@ Name:Akoum
 ManaCost:no cost
 Types:Plane Zendikar
 S:Mode$ CastWithFlash | ValidCard$ Enchantment | ValidSA$ Spell | EffectZone$ Command | Caster$ Player | Description$ Players may cast enchantment spells as though they had flash.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, destroy target creature that isn't enchanted.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, destroy target creature that isn't enchanted.
 SVar:RolledChaos:DB$ Destroy | ValidTgts$ Creature.unenchanted | TgtPrompt$ Select target creature that isn't enchanted
 SVar:AIRollPlanarDieParams:Mode$ Always | OppHasCreatureInPlay$ True | RollInMain1$ True
-Oracle:Players may cast enchantment spells as though they had flash.\nWhenever you roll {CHAOS}, destroy target creature that isn't enchanted.
+Oracle:Players may cast enchantment spells as though they had flash.\nWhenever chaos ensues, destroy target creature that isn't enchanted.

forge-gui/res/cardsfolder/a/aretopolis.txt

@@ -8,8 +8,8 @@ SVar:ScrollsOfLife:DB$ GainLife | Defined$ You | LifeAmount$ NumScrolls
 SVar:NumScrolls:Count$CardCounters.SCROLL
 T:Mode$ Always | TriggerZones$ Command | CheckSVar$ NumScrolls | SVarCompare$ GE10 | Execute$ RolledWalk | TriggerDescription$ When CARDNAME has ten or more scroll counters on it, planeswalk.
 SVar:RolledWalk:DB$ Planeswalk
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put a scroll counter on CARDNAME, then draw cards equal to the number of scroll counters on it.
-SVar:RolledChaos:DB$ PutCounter | Defined$ Self | CounterType$ SCROLL | CounterNum$ 1 | SubAbility$ ScrollsOfKnowledge
-SVar:ScrollsOfKnowledge:DB$ Draw | Defined$ You | NumCards$ NumScrolls
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigPutCounter | TriggerDescription$ Whenever chaos ensues, put a scroll counter on CARDNAME, then draw cards equal to the number of scroll counters on it.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ SCROLL | SubAbility$ ScrollsOfKnowledge
+SVar:ScrollsOfKnowledge:DB$ Draw | NumCards$ NumScrolls
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:When you planeswalk to Aretopolis or at the beginning of your upkeep, put a scroll counter on Aretopolis, then you gain life equal to the number of scroll counters on it.\nWhen Aretopolis has ten or more scroll counters on it, planeswalk.\nWhenever you roll {CHAOS}, put a scroll counter on Aretopolis, then draw cards equal to the number of scroll counters on it.
+Oracle:When you planeswalk to Aretopolis or at the beginning of your upkeep, put a scroll counter on Aretopolis, then you gain life equal to the number of scroll counters on it.\nWhen Aretopolis has ten or more scroll counters on it, planeswalk.\nWhenever chaos ensues, put a scroll counter on Aretopolis, then draw cards equal to the number of scroll counters on it.

forge-gui/res/cardsfolder/a/astral_arena.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Kolbahan
 S:Mode$ AttackRestrict | EffectZone$ Command | MaxAttackers$ 1 | Description$ No more than one creature can attack each combat.
 S:Mode$ Continuous | EffectZone$ Command | GlobalRule$ No more than one creature can block each combat. | Description$ No more than one creature can block each combat.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 2 damage to each creature.
-SVar:RolledChaos:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature | ValidDescription$ each creature.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, CARDNAME deals 2 damage to each creature.
+SVar:RolledChaos:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature
 SVar:AIRollPlanarDieParams:Mode$ Random | MinTurn$ 5
-Oracle:No more than one creature can attack each combat.\nNo more than one creature can block each combat.\nWhenever you roll {CHAOS}, Astral Arena deals 2 damage to each creature.
+Oracle:No more than one creature can attack each combat.\nNo more than one creature can block each combat.\nWhenever chaos ensues, Astral Arena deals 2 damage to each creature.

forge-gui/res/cardsfolder/b/bant.txt

@@ -2,9 +2,9 @@ Name:Bant
 ManaCost:no cost
 Types:Plane Alara
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | AddKeyword$ Exalted | Description$ All creatures have exalted.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put a divinity counter on target green, white, or blue creature. That creature has indestructible for as long as it has a divinity counter on it.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, put a divinity counter on target green, white, or blue creature. That creature has indestructible for as long as it has a divinity counter on it.
 SVar:RolledChaos:DB$ PutCounter | ValidTgts$ Creature.Green,Creature.White,Creature.Blue | CounterType$ DIVINITY | CounterNum$ 1 | SubAbility$ DivineCharacter
 SVar:DivineCharacter:DB$ Animate | Defined$ Targeted | staticAbilities$ IndestructibleAspect | Duration$ Permanent
 SVar:IndestructibleAspect:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self+counters_GE1_DIVINITY | AddKeyword$ Indestructible
 SVar:AIRollPlanarDieParams:Mode$ Always | HasColorCreatureInPlay$ GWU
-Oracle:All creatures have exalted. (Whenever a creature attacks alone, it gets +1/+1 until end of turn for each instance of exalted among permanents its controller controls.)\nWhenever you roll {CHAOS}, put a divinity counter on target green, white, or blue creature. That creature has indestructible for as long as it has a divinity counter on it.
+Oracle:All creatures have exalted. (Whenever a creature attacks alone, it gets +1/+1 until end of turn for each instance of exalted among permanents its controller controls.)\nWhenever chaos ensues, put a divinity counter on target green, white, or blue creature. That creature has indestructible for as long as it has a divinity counter on it.

forge-gui/res/cardsfolder/b/bloodhill_bastion.txt

@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Plane Equilor
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Command | ValidCard$ Creature | Execute$ TrigPump | TriggerDescription$ Whenever a creature enters the battlefield, it gains double strike and haste until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | KW$ Double Strike & Haste
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, exile target nontoken creature you control, then return it to the battlefield under your control.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, exile target nontoken creature you control, then return it to the battlefield under your control.
 SVar:RolledChaos:DB$ ChangeZone | ValidTgts$ Creature.nonToken+YouCtrl | TgtPrompt$ Select target non-Token creature you control | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ RestorationReturn
 SVar:RestorationReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | GainControl$ True
 SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 3 | RollInMain1$ True
-Oracle:Whenever a creature enters the battlefield, it gains double strike and haste until end of turn.\nWhenever you roll {CHAOS}, exile target nontoken creature you control, then return it to the battlefield under your control.
+Oracle:Whenever a creature enters the battlefield, it gains double strike and haste until end of turn.\nWhenever chaos ensues, exile target nontoken creature you control, then return it to the battlefield under your control.

forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt

@@ -14,5 +14,5 @@ ManaCost:1 R
 Types:Instant Adventure
 A:SP$ Effect | Cost$ 1 R | Name$ Stomp Effect | StaticAbilities$ STCantPrevent | AILogic$ Burn | SubAbility$ DBDamage | SpellDescription$ Damage can't be prevented this turn. CARDNAME deals 2 damage to any target.
 SVar:STCantPrevent:Mode$ CantPreventDamage | EffectZone$ Command | Description$ Damage can't be prevented.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker,Creature | TgtPrompt$ Select any target | NumDmg$ 2 | NoPrevention$ True
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2 | NoPrevention$ True
 Oracle:Damage can't be prevented this turn. Stomp deals 2 damage to any target.

forge-gui/res/cardsfolder/b/breaking_entering.txt

@@ -11,8 +11,7 @@ ALTERNATE
 Name:Entering
 ManaCost:4 B R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 4 B R | Choices$ Creature | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBChangeZone | SpellDescription$ Put a creature card from a graveyard onto the battlefield under your control. It gains haste until end of turn.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ ChosenCard | GainControl$ True | RememberChanged$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBCleanup
+A:SP$ ChangeZone | ChangeType$ Creature | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Hidden$ True | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Put a creature card from a graveyard onto the battlefield under your control. It gains haste until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Put a creature card from a graveyard onto the battlefield under your control. It gains haste until end of turn.\nFuse (You may cast one or both halves of this card from your hand.)

forge-gui/res/cardsfolder/c/candles_glow.txt

@@ -2,7 +2,7 @@ Name:Candles' Glow
 ManaCost:1 W
 Types:Instant Arcane
 K:Splice:Arcane:1 W
-A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Any | Amount$ 3 | PreventionSubAbility$ GlowOfLife | ShieldEffectTarget$ You | TgtPrompt$ Select any target | SpellDescription$ Prevent the next 3 damage that would be dealt to any target this turn. You gain life equal to the damage prevented this way.
+A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Any | Amount$ 3 | PreventionSubAbility$ GlowOfLife | ShieldEffectTarget$ You | SpellDescription$ Prevent the next 3 damage that would be dealt to any target this turn. You gain life equal to the damage prevented this way.
 SVar:GlowOfLife:DB$ GainLife | Defined$ ShieldEffectTarget | LifeAmount$ PreventedDamage | SpellDescription$ You gain life equal to the damage prevented this way.
 DeckHints:Type$Arcane
 Oracle:Prevent the next 3 damage that would be dealt to any target this turn. You gain life equal to the damage prevented this way.\nSplice onto Arcane {1}{W} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)

forge-gui/res/cardsfolder/c/celestine_reef.txt

@@ -2,11 +2,11 @@ Name:Celestine Reef
 ManaCost:no cost
 Types:Plane Luvion
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.withoutFlying+withoutIslandwalk | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures without flying or islandwalk can't attack.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, until a player planeswalks, you can't lose the game and your opponents can't win the game.
-SVar:RolledChaos:DB$ Effect | Name$ Celestine Reef Effect | StaticAbilities$ STCantlose,STCantWin | Triggers$ TrigPlaneswalk | Duration$ Permanent
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, until a player planeswalks, you can't lose the game and your opponents can't win the game.
+SVar:RolledChaos:DB$ Effect | StaticAbilities$ STCantlose,STCantWin | Triggers$ TrigPlaneswalk | Duration$ Permanent
 SVar:STCantlose:Mode$ Continuous | EffectZone$ Command | Affected$ You | AddKeyword$ You can't lose the game. | Description$ Until a player planeswalks, you can't lose the game and your opponents can't win the game.
-SVar:STCantWin:Mode$ Continuous | EffectZone$ Command | Affected$ Player.Opponent | AddKeyword$ You can't win the game.
+SVar:STCantWin:Mode$ Continuous | EffectZone$ Command | Affected$ Opponent | AddKeyword$ You can't win the game.
 SVar:TrigPlaneswalk:Mode$ PlaneswalkedFrom | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:Creatures without flying or islandwalk can't attack.\nWhenever you roll {CHAOS}, until a player planeswalks, you can't lose the game and your opponents can't win the game.
+Oracle:Creatures without flying or islandwalk can't attack.\nWhenever chaos ensues, until a player planeswalks, you can't lose the game and your opponents can't win the game.

forge-gui/res/cardsfolder/c/cliffside_market.txt

@@ -4,8 +4,8 @@ Types:Plane Mercadia
 T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLife | TriggerZones$ Command | Secondary$ True | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
 SVar:TrigLife:DB$ ExchangeLife | Optional$ True | ValidTgts$ Player | TgtPrompt$ Select target player to exchange life totals with
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, exchange control of two target permanents that share a card type.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, exchange control of two target permanents that share a card type.
 SVar:RolledChaos:DB$ ExchangeControl | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent | TgtPrompt$ Select target permanents that share a permanent type | TargetsWithSameCardType$ True
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
-Oracle:When you planeswalk to Cliffside Market or at the beginning of your upkeep, you may exchange life totals with target player.\nWhenever you roll {CHAOS}, exchange control of two target permanents that share a card type.
+Oracle:When you planeswalk to Cliffside Market or at the beginning of your upkeep, you may exchange life totals with target player.\nWhenever chaos ensues, exchange control of two target permanents that share a card type.

forge-gui/res/cardsfolder/d/dragon_tempest.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ ChangesZone | ValidCard$ Creature.YouCtrl+withFlying | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature with flying enters the battlefield under your control, it gains haste until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | KW$ Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Dragon.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ NumDragons | TgtPrompt$ Select any target | DamageSource$ TriggeredCard
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ NumDragons | DamageSource$ TriggeredCard
 SVar:NumDragons:Count$Valid Dragon.YouCtrl
 SVar:BuffedBy:Creature.withFlying
 DeckHints:Type$Dragon & Keyword$Flying

forge-gui/res/cardsfolder/e/edge_of_malacol.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Belenon
 R:Event$ Untap | ActiveZones$ Command | ValidCard$ Creature.YouCtrl | ReplaceWith$ RepPutCounter | UntapStep$ True | Description$ If a creature you control would untap during your untap step, put two +1/+1 counters on it instead.
 SVar:RepPutCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 2
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, untap each creature you control.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, untap each creature you control.
 SVar:RolledChaos:DB$ UntapAll | ValidCards$ Creature.YouCtrl
 SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True
-Oracle:If a creature you control would untap during your untap step, put two +1/+1 counters on it instead.\nWhenever you roll {CHAOS}, untap each creature you control.
+Oracle:If a creature you control would untap during your untap step, put two +1/+1 counters on it instead.\nWhenever chaos ensues, untap each creature you control.

forge-gui/res/cardsfolder/e/eloren_wilds.txt

@@ -3,10 +3,10 @@ ManaCost:no cost
 Types:Plane Shandalar
 T:Mode$ TapsForMana | ValidCard$ Permanent | Execute$ TrigMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a permanent for mana, that player adds one mana of any type that permanent produced.
 SVar:TrigMana:DB$ ManaReflected | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ TriggeredActivator
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, target player can't cast spells until a player planeswalks.
-SVar:RolledChaos:DB$ Effect | ValidTgts$ Player | IsCurse$ True | Name$ Eloren Wilds Effect | StaticAbilities$ STCantCast | Triggers$ TrigPlaneswalk | RememberObjects$ Targeted | Duration$ Permanent
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, target player can't cast spells until a player planeswalks.
+SVar:RolledChaos:DB$ Effect | ValidTgts$ Player | IsCurse$ True | StaticAbilities$ STCantCast | Triggers$ TrigPlaneswalk | RememberObjects$ Targeted | Duration$ Permanent
 SVar:STCantCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Target player can't cast spells until a player planeswalks.
 SVar:TrigPlaneswalk:Mode$ PlaneswalkedFrom | Execute$ ExileSelf | Static$ True
 SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:Whenever a player taps a permanent for mana, that player adds one mana of any type that permanent produced.\nWhenever you roll {CHAOS}, target player can't cast spells until a player planeswalks.
+Oracle:Whenever a player taps a permanent for mana, that player adds one mana of any type that permanent produced.\nWhenever chaos ensues, target player can't cast spells until a player planeswalks.

forge-gui/res/cardsfolder/e/extract_from_darkness.txt

@@ -1,9 +1,8 @@
 Name:Extract from Darkness
 ManaCost:3 U B
 Types:Sorcery
-A:SP$ Mill | Cost$ 3 U B | NumCards$ 2 | Defined$ Player | SubAbility$ DBChoose | SpellDescription$ Each player mills two cards. Then you put a creature card from a graveyard onto the battlefield under your control.
-SVar:DBChoose:DB$ ChooseCard | Defined$ You | Choices$ Creature | ChoiceZone$ Graveyard | Mandatory$ True | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ ChosenCard | GainControl$ True
+A:SP$ Mill | NumCards$ 2 | Defined$ Player | SubAbility$ DBChoose | SpellDescription$ Each player mills two cards.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | Mandatory$ True | GainControl$ True | SelectPrompt$ Select a creature card to return to the battlefield | Hidden$ True | StackDescription$ SpellDescription | SpellDescription$ Then you put a creature card from a graveyard onto the battlefield under your control.
 AI:RemoveDeck:Random
-DeckHas:Ability$Graveyard
+DeckHas:Ability$Mill|Graveyard
 Oracle:Each player mills two cards. Then you put a creature card from a graveyard onto the battlefield under your control.

forge-gui/res/cardsfolder/f/feeding_grounds.txt

@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Plane Muraganda
 S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Card.Green | Type$ Spell | Amount$ 1 | Description$ Green spells cost {1} less to cast.
 S:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Card.Red | Type$ Spell | Amount$ 1 | Description$ Red spells cost {1} less to cast.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ DBPutCounter | TriggerDescription$ Whenever you roll {CHAOS}, put X +1/+1 counters on target creature, where X is that creature's mana value.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ DBPutCounter | TriggerDescription$ Whenever chaos ensues, put X +1/+1 counters on target creature, where X is that creature's mana value.
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ Y
 SVar:Y:Targeted$CardManaCost
 SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True
-Oracle:Red spells cost {1} less to cast.\nGreen spells cost {1} less to cast.\nWhenever you roll {CHAOS}, put X +1/+1 counters on target creature, where X is that creature's mana value.
+Oracle:Red spells cost {1} less to cast.\nGreen spells cost {1} less to cast.\nWhenever chaos ensues, put X +1/+1 counters on target creature, where X is that creature's mana value.

forge-gui/res/cardsfolder/f/fields_of_summer.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Moag
 T:Mode$ SpellCast | OptionalDecider$ TriggeredPlayer | TriggerZones$ Command | Execute$ LifeSummer | TriggerDescription$ Whenever a player casts a spell, that player may gain 2 life.
 SVar:LifeSummer:DB$ GainLife | Defined$ TriggeredPlayer | LifeAmount$ 2
-T:Mode$ PlanarDice | Result$ Chaos | OptionalDecider$ You | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may gain 10 life.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | OptionalDecider$ You | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, you may gain 10 life.
 SVar:RolledChaos:DB$ GainLife | LifeAmount$ 10 | Defined$ You
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Whenever a player casts a spell, that player may gain 2 life.\nWhenever you roll {CHAOS}, you may gain 10 life.
+Oracle:Whenever a player casts a spell, that player may gain 2 life.\nWhenever chaos ensues, you may gain 10 life.

forge-gui/res/cardsfolder/f/flesh_blood.txt

@@ -15,6 +15,6 @@ Name:Blood
 ManaCost:R G
 Types:Sorcery
 A:SP$ Pump | Cost$ R G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | SubAbility$ BloodDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to any target.
-SVar:BloodDamage:DB$ DealDamage | ValidTgts$ Any | AILogic$ PowerDmg | TgtPrompt$ Select any target | NumDmg$ Y | DamageSource$ ParentTarget
+SVar:BloodDamage:DB$ DealDamage | ValidTgts$ Any | AILogic$ PowerDmg | NumDmg$ Y | DamageSource$ ParentTarget
 SVar:Y:ParentTargeted$CardPower
 Oracle:Target creature you control deals damage equal to its power to any target.\nFuse (You may cast one or both halves of this card from your hand.)

forge-gui/res/cardsfolder/f/foundry_helix.txt

@@ -1,7 +1,7 @@
 Name:Foundry Helix
 ManaCost:1 R W
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R W Sac<1/Permanent> | ValidTgts$ Creature,Planeswalker,Player | TgtPrompt$ Select any target | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to any target. If the sacrificed permanent was an artifact, you gain 4 life.
+A:SP$ DealDamage | Cost$ 1 R W Sac<1/Permanent> | ValidTgts$ Any | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to any target. If the sacrificed permanent was an artifact, you gain 4 life.
 SVar:DBGainLife:DB$ GainLife | ConditionDefined$ Sacrificed | ConditionPresent$ Artifact | LifeAmount$ 4
 DeckHints:Type$Artifact
 DeckHas:Ability$LifeGain

forge-gui/res/cardsfolder/f/furnace_layer.txt

@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ FurnaceDiscard | Tri
 SVar:FurnaceDiscard:DB$ Discard | ValidTgts$ Player | TargetsAtRandom$ True | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | OptionalDecider$ You | TriggerDescription$ Whenever you roll {CHAOS}, you may destroy target nonland permanent.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | OptionalDecider$ You | TriggerDescription$ Whenever chaos ensues, you may destroy target nonland permanent.
 SVar:RolledChaos:DB$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent to destroy
 SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 3 | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:When you planeswalk to Furnace Layer or at the beginning of your upkeep, select target player at random. That player discards a card. If that player discards a land card this way, they lose 3 life.\nWhenever you roll {CHAOS}, you may destroy target nonland permanent.
+Oracle:When you planeswalk to Furnace Layer or at the beginning of your upkeep, select target player at random. That player discards a card. If that player discards a land card this way, they lose 3 life.\nWhenever chaos ensues, you may destroy target nonland permanent.

forge-gui/res/cardsfolder/g/gavony.txt

@@ -2,7 +2,7 @@ Name:Gavony
 ManaCost:no cost
 Types:Plane Innistrad
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | AddKeyword$ Vigilance | Description$ All creatures have vigilance.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, creatures you control gain indestructible until end of turn.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, creatures you control gain indestructible until end of turn.
 SVar:RolledChaos:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Indestructible
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:All creatures have vigilance.\nWhenever you roll {CHAOS}, creatures you control gain indestructible until end of turn.
+Oracle:All creatures have vigilance.\nWhenever chaos ensues, creatures you control gain indestructible until end of turn.

forge-gui/res/cardsfolder/g/glen_elendra.txt

@@ -4,7 +4,7 @@ Types:Plane Lorwyn
 T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | TriggerZones$ Command | OptionalDecider$ You | Execute$ TrigExchange | TriggerDescription$ At end of combat, you may exchange control of target creature you control that dealt combat damage to a player this combat and target creature that player controls.
 SVar:TrigExchange:DB$ Pump | ValidTgts$ Creature.YouCtrl+dealtCombatDamageThisCombat | TgtPrompt$ Select target creature you control that dealt combat damage to a player | SubAbility$ DBExchange
 SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Creature.ControlledBy Player.wasDealtCombatDamageThisCombatBy ParentTarget | TgtPrompt$ Select target creature that player controls.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, gain control of target creature you own.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, gain control of target creature you own.
 SVar:RolledChaos:DB$ GainControl | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature you own to gain control of
 AI:RemoveDeck:All
-Oracle:At end of combat, you may exchange control of target creature you control that dealt combat damage to a player this combat and target creature that player controls.\nWhenever you roll {CHAOS}, gain control of target creature you own.
+Oracle:At end of combat, you may exchange control of target creature you control that dealt combat damage to a player this combat and target creature that player controls.\nWhenever chaos ensues, gain control of target creature you own.

forge-gui/res/cardsfolder/g/glimmervoid_basin.txt

@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Plane Mirrodin
 T:Mode$ SpellCast | ValidSA$ Instant.singleTarget,Sorcery.singleTarget | Execute$ TrigCopy | TriggerZones$ Command | TriggerDescription$ Whenever a player casts an instant or sorcery spell with a single target, that player copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | CopyForEachCanTarget$ Spell,Permanent,Card,Player
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.
 SVar:RolledChaos:DB$ RepeatEach | RepeatPlayers$ NonTargetedController | RepeatSubAbility$ DBCopy | ValidTgts$ Creature | TgtPrompt$ Select target creature | ChangeZoneTable$ True
 SVar:DBCopy:DB$ CopyPermanent | Defined$ ParentTarget | Controller$ Remembered
 AI:RemoveDeck:All
-Oracle:Whenever a player casts an instant or sorcery spell with a single target, that player copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.\nWhenever you roll {CHAOS}, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.
+Oracle:Whenever a player casts an instant or sorcery spell with a single target, that player copies that spell for each other spell, permanent, card not on the battlefield, and/or player the spell could target. Each copy targets a different one of them.\nWhenever chaos ensues, choose target creature. Each player except that creature's controller creates a token that's a copy of that creature.

forge-gui/res/cardsfolder/g/goldmeadow.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Lorwyn
 T:Mode$ ChangesZone | ValidCard$ Land | Destination$ Battlefield | Execute$ TripleGoat | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield, that land's controller creates three 0/1 white Goat creature tokens.
 SVar:TripleGoat:DB$ Token | TokenScript$ w_0_1_goat | TokenOwner$ TriggeredCardController | TokenAmount$ 3
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create a 0/1 white Goat creature token.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, create a 0/1 white Goat creature token.
 SVar:RolledChaos:DB$ Token | TokenScript$ w_0_1_goat | TokenOwner$ You | TokenAmount$ 1
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Whenever a land enters the battlefield, that land's controller creates three 0/1 white Goat creature tokens.\nWhenever you roll {CHAOS}, create a 0/1 white Goat creature token.
+Oracle:Whenever a land enters the battlefield, that land's controller creates three 0/1 white Goat creature tokens.\nWhenever chaos ensues, create a 0/1 white Goat creature token.

forge-gui/res/cardsfolder/g/grand_ossuary.txt

@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:OssuaryCounters:DB$ PutCounter | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredCardController | TargetingPlayer$ TriggeredCardController | TgtPrompt$ Select target creature you control to distribute counters to | CounterType$ P1P1 | CounterNum$ OssuaryX | TargetMin$ 1 | TargetMax$ MaxTgts | DividedAsYouChoose$ OssuaryX
 SVar:OssuaryX:TriggeredCard$CardPower
 SVar:MaxTgts:TriggeredCardController$Valid Creature.YouCtrl
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures they exiled this way. Then planeswalk.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures they exiled this way. Then planeswalk.
 SVar:RolledChaos:DB$ ChangeZoneAll | ChangeType$ Creature | Imprint$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ OssuaryRepeat
 SVar:OssuaryRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ OssuaryTokens | SubAbility$ WalkAway | ChangeZoneTable$ True
 SVar:OssuaryTokens:DB$ Token | TokenAmount$ OsX | TokenScript$ g_1_1_saproling | TokenOwner$ Player.IsRemembered
@@ -13,4 +13,4 @@ SVar:WalkAway:DB$ Planeswalk | SubAbility$ ClearImprinted
 SVar:ClearImprinted:DB$ Cleanup | ClearImprinted$ True
 SVar:OsX:ImprintedLKI$FilterControlledByRemembered_CardPower
 SVar:AIRollPlanarDieParams:Mode$ Random | MinTurn$ 5
-Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures they control.\nWhenever you roll {CHAOS}, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures they exiled this way. Then planeswalk.
+Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures they control.\nWhenever chaos ensues, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures they exiled this way. Then planeswalk.

forge-gui/res/cardsfolder/g/grixis.txt

@@ -2,7 +2,7 @@ Name:Grixis
 ManaCost:no cost
 Types:Plane Alara
 S:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Graveyard | Affected$ Creature.YouOwn+Blue,Creature.YouOwn+Red,Creature.YouOwn+Black | AddKeyword$ Unearth:CardManaCost | Description$ Blue, black, and/or red creature cards in your graveyard have unearth. The unearth cost is equal to the card's mana cost. (Pay the card's mana cost: Return it to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, put target creature card from a graveyard onto the battlefield under your control.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, put target creature card from a graveyard onto the battlefield under your control.
 SVar:RolledChaos:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature
 SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 3 | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Blue, black, and/or red creature cards in your graveyard have unearth. The unearth cost is equal to the card's mana cost. (Pay the card's mana cost: Return it to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)\nWhenever you roll {CHAOS}, put target creature card from a graveyard onto the battlefield under your control.
+Oracle:Blue, black, and/or red creature cards in your graveyard have unearth. The unearth cost is equal to the card's mana cost. (Pay the card's mana cost: Return it to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)\nWhenever chaos ensues, put target creature card from a graveyard onto the battlefield under your control.

forge-gui/res/cardsfolder/g/grove_of_the_dreampods.txt

@@ -4,7 +4,7 @@ Types:Plane Fabacin
 T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ DreampodsDig | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DreampodsDig | TriggerZones$ Command | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
 SVar:DreampodsDig:DB$ DigUntil | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, return target creature card from your graveyard to the battlefield.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, return target creature card from your graveyard to the battlefield.
 SVar:RolledChaos:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl
 SVar:AIRollPlanarDieParams:Mode$ Always | MinTurn$ 3
-Oracle:When you planeswalk to Grove of the Dreampods or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.\nWhenever you roll {CHAOS}, return target creature card from your graveyard to the battlefield.
+Oracle:When you planeswalk to Grove of the Dreampods or at the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.\nWhenever chaos ensues, return target creature card from your graveyard to the battlefield.

forge-gui/res/cardsfolder/g/guardian_of_faith.txt

@@ -5,6 +5,6 @@ PT:3/2
 K:Flash
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPhaseOut | TriggerDescription$ When CARDNAME enters the battlefield, any number of other target creatures you control phase out. (Treat them and anything attached to them as though they don't exist until their controller's next turn.)
-SVar:TrigPhaseOut:DB$ Phases | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select other creature | TargetMin$ 0 | TargetMax$ MaxTgts | SelectPrompt$ Choose any number of creatures you control | Duration$ UntilHostLeavesPlay
+SVar:TrigPhaseOut:DB$ Phases | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select any number of other target creatures you control | TargetMin$ 0 | TargetMax$ MaxTgts
 SVar:MaxTgts:Count$Valid Creature.Other+YouCtrl
 Oracle:Flash\nVigilance\nWhen Guardian of Faith enters the battlefield, any number of other target creatures you control phase out. (Treat them and anything attached to them as though they don't exist until their controller's next turn.)

forge-gui/res/cardsfolder/h/hedron_fields_of_agadeem.txt

@@ -2,7 +2,7 @@ Name:Hedron Fields of Agadeem
 ManaCost:no cost
 Types:Plane Zendikar
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.powerGE7 | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Creatures with power 7 or greater can't attack or block.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)
-SVar:RolledChaos:DB$ Token | TokenAmount$ 1 | TokenScript$ c_7_7_eldrazi_annihilator | TokenOwner$ You
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)
+SVar:RolledChaos:DB$ Token | TokenScript$ c_7_7_eldrazi_annihilator
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:Creatures with power 7 or greater can't attack or block.\nWhenever you roll {CHAOS}, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)
+Oracle:Creatures with power 7 or greater can't attack or block.\nWhenever chaos ensues, create a 7/7 colorless Eldrazi creature token with annihilator 1. (Whenever it attacks, defending player sacrifices a permanent.)

forge-gui/res/cardsfolder/h/horizon_boughs.txt

@@ -2,7 +2,7 @@ Name:Horizon Boughs
 ManaCost:no cost
 Types:Plane Pyrulea
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Permanent | AddHiddenKeyword$ CARDNAME untaps during each other player's untap step. | Description$ All permanents untap during each player's untap step.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ DBFetch | TriggerDescription$ Whenever you roll {CHAOS}, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ DBFetch | TriggerDescription$ Whenever chaos ensues, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
 SVar:DBFetch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 3 | ShuffleNonMandatory$ True
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:All permanents untap during each player's untap step.\nWhenever you roll {CHAOS}, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
+Oracle:All permanents untap during each player's untap step.\nWhenever chaos ensues, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.

forge-gui/res/cardsfolder/i/ill_tempered_loner_howlpack_avenger.txt

@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Human Werewolf
 PT:3/3
 T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to any target.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any | TgtPrompt$ Select any target
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any
 SVar:X:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
 A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
@@ -19,7 +19,7 @@ Colors:red
 Types:Creature Werewolf
 PT:4/4
 T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Permanent.YouCtrl | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control is dealt damage, CARDNAME deals that much damage to any target.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any | TgtPrompt$ Select any target
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any
 SVar:X:TriggerCount$DamageAmount
 S:Mode$ Continuous | Affected$ Permanent.YouCtrl | AddSVar$ CE
 SVar:CE:SVar:HasCombatEffect:TRUE

forge-gui/res/cardsfolder/i/immersturm.txt

@@ -4,9 +4,9 @@ Types:Plane Valla
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Command | Execute$ TrigDamage | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ Y | DamageSource$ TriggeredCard | TargetingPlayer$ TriggeredCardController
 SVar:Y:TriggeredCard$CardPower
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, exile target creature, then return it to the battlefield under its owner's control.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, exile target creature, then return it to the battlefield under its owner's control.
 SVar:RolledChaos:DB$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberTargets$ True | SubAbility$ RestorationReturn
 SVar:RestorationReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True
-Oracle:Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice.\nWhenever you roll {CHAOS}, exile target creature, then return it to the battlefield under its owner's control.
+Oracle:Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to any target of their choice.\nWhenever chaos ensues, exile target creature, then return it to the battlefield under its owner's control.

forge-gui/res/cardsfolder/i/improvised_weaponry.txt

@@ -1,7 +1,7 @@
 Name:Improvised Weaponry
 ManaCost:2 R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Any | TgtPrompt$ Select any targeto | NumDmg$ 2 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 2 damage to any target.
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Any | NumDmg$ 2 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 2 damage to any target.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Create a Treasure token.
 DeckHas:Ability$Token
 Oracle:Improvised Weaponry deals 2 damage to any target. Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

forge-gui/res/cardsfolder/i/incremental_growth.txt

@@ -1,7 +1,7 @@
 Name:Incremental Growth
 ManaCost:3 G G
 Types:Sorcery
-A:SP$ PutCounter | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetUnique$ True | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutTwo | SpellDescription$ Put a +1/+1 counter on target creature, two +1/+1 counters on another target creature, and three +1/+1 counters on a third target creature.
+A:SP$ PutCounter | ValidTgts$ Creature | TargetUnique$ True | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutTwo | SpellDescription$ Put a +1/+1 counter on target creature, two +1/+1 counters on another target creature, and three +1/+1 counters on a third target creature.
 SVar:DBPutTwo:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select another target creature | TargetUnique$ True | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPutThree
 SVar:DBPutThree:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select a third target creature | TargetUnique$ True | CounterType$ P1P1 | CounterNum$ 3
 DeckHas:Ability$Counters

forge-gui/res/cardsfolder/i/interplanar_tunnel.txt

@@ -2,6 +2,9 @@ Name:Interplanar Tunnel
 ManaCost:no cost
 Types:Phenomenon
 T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When you encounter CARDNAME, reveal cards from the top of your planar deck until you reveal five plane cards. Put a plane card from among them on top of your planar deck, then put the rest of the revealed cards on the bottom in a random order. (Then planeswalk away from this phenomenon.)
-SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | SourceZone$ PlanarDeck | DestinationZone$ PlanarDeck | DestinationZone2$ PlanarDeck | LibraryPosition$ 0 | ChangeValid$ Plane | RestRandomOrder$ True | SubAbility$ Replaneswalk
-SVar:Replaneswalk:DB$ Planeswalk | Cost$ 0
+SVar:TrigDig:DB$ DigUntil | Amount$ 5 | Valid$ Plane | DigZone$ PlanarDeck | ImprintFound$ True | RememberRevealed$ True | FoundDestination$ PlanarDeck | RevealedDestination$ PlanarDeck | SubAbility$ DBPutOnTop
+SVar:PutOnTop:DB$ ChangeZone | ChangeType$ Card.IsImprinted | Origin$ PlanarDeck | Destination$ PlanarDeck | LibraryPosition$ 0 | ForgetChanged$ True | SubAbility$ DBRestOnBottom
+SVar:RestOnBottom:DB$ ChangeZone | Defined$ Remembered | Origin$ PlanarDeck | Destination$ PlanarDeck | LibraryPosition$ -1 | RandomOrder$ True | SubAbility$ Replaneswalk
+SVar:Replaneswalk:DB$ Planeswalk | Cost$ 0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 Oracle:When you encounter Interplanar Tunnel, reveal cards from the top of your planar deck until you reveal five plane cards. Put a plane card from among them on top of your planar deck, then put the rest of the revealed cards on the bottom in a random order. (Then planeswalk away from this phenomenon.)

forge-gui/res/cardsfolder/i/isle_of_vesuva.txt

@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Plane Dominaria
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Command | Execute$ TrigVesuvaCopy | TriggerDescription$ Whenever a nontoken creature enters the battlefield, its controller creates a token that's a copy of that creature.
 SVar:TrigVesuvaCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | Controller$ TriggeredCardController
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, destroy target creature and all other creatures with the same name as that creature.
 SVar:RolledChaos:DB$ Destroy | ValidTgts$ Creature | SubAbility$ DestroyOtherAll
 SVar:DestroyOtherAll:DB$ DestroyAll | ValidCards$ Targeted.sameName+Other
 SVar:AIRollPlanarDieParams:Mode$ Always | OppHasCreatureInPlay$ True
-Oracle:Whenever a nontoken creature enters the battlefield, its controller creates a token that's a copy of that creature.\nWhenever you roll {CHAOS}, destroy target creature and all other creatures with the same name as that creature.
+Oracle:Whenever a nontoken creature enters the battlefield, its controller creates a token that's a copy of that creature.\nWhenever chaos ensues, destroy target creature and all other creatures with the same name as that creature.

forge-gui/res/cardsfolder/i/izzet_steam_maze.txt

@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Plane Ravnica
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Player | Execute$ TrigCopy | TriggerZones$ Command | TriggerDescription$ Whenever a player casts an instant or sorcery spell, that player copies it. The player may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | MayChooseTarget$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, instant and sorcery spells you cast this turn cost {3} less to cast.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, instant and sorcery spells you cast this turn cost {3} less to cast.
 SVar:RolledChaos:DB$ Effect | StaticAbilities$ ReduceSPcost
 SVar:ReduceSPcost:Mode$ ReduceCost | EffectZone$ Command | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 3 | Description$ Instant and sorcery spells you cast this turn cost 3 less to cast.
 SVar:AIRollPlanarDieParams:Mode$ Always | RollInMain1$ True
-Oracle:Whenever a player casts an instant or sorcery spell, that player copies it. The player may choose new targets for the copy.\nWhenever you roll {CHAOS}, instant and sorcery spells you cast this turn cost {3} less to cast.
+Oracle:Whenever a player casts an instant or sorcery spell, that player copies it. The player may choose new targets for the copy.\nWhenever chaos ensues, instant and sorcery spells you cast this turn cost {3} less to cast.

forge-gui/res/cardsfolder/j/jund.txt

@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Plane Alara
 T:Mode$ SpellCast | ValidCard$ Creature.Black,Creature.Red,Creature.Green | ValidActivatingPlayer$ Player | TriggerZones$ Command | Execute$ DevourPump | TriggerDescription$ Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)
 SVar:DevourPump:DB$ Animate | Defined$ TriggeredCard | Keywords$ Devour:5 | Duration$ Permanent
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, create two 1/1 red Goblin creature tokens.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, create two 1/1 red Goblin creature tokens.
 SVar:RolledChaos:DB$ Token | TokenAmount$ 2 | TokenScript$ r_1_1_goblin | TokenOwner$ You
-Oracle:Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)\nWhenever you roll {CHAOS}, create two 1/1 red Goblin creature tokens.
+Oracle:Whenever a player casts a black, red, or green creature spell, it gains devour 5. (As the creature enters the battlefield, its controller may sacrifice any number of creatures. The creature enters the battlefield with five times that many +1/+1 counters on it.)\nWhenever chaos ensues, create two 1/1 red Goblin creature tokens.

forge-gui/res/cardsfolder/k/karplusan_hound.txt

@@ -3,6 +3,6 @@ ManaCost:3 R
 Types:Creature Dog
 PT:3/3
 T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Planeswalker.Chandra+YouCtrl | Execute$ DBDealDamage | TriggerDescription$ Whenever CARDNAME attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.
-SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2 | TgtPrompt$ Select any target
+SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2
 SVar:BuffedBy:Chandra
 Oracle:Whenever Karplusan Hound attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target.

forge-gui/res/cardsfolder/k/karplusan_minotaur.txt

@@ -4,7 +4,7 @@ Types:Creature Minotaur Warrior
 PT:3/3
 K:Cumulative upkeep:FlipCoin<1>:Flip a coin.
 T:Mode$ FlippedCoin | ValidPlayer$ You | ValidResult$ Win | TriggerZones$ Battlefield | Execute$ TrigYouDmg | TriggerDescription$ Whenever you win a coin flip, CARDNAME deals 1 damage to any target.
-SVar:TrigYouDmg:DB$ DealDamage | NumDmg$ 1 | ValidTgts$ Any | TgtPrompt$ Select any target
+SVar:TrigYouDmg:DB$ DealDamage | NumDmg$ 1 | ValidTgts$ Any
 T:Mode$ FlippedCoin | ValidPlayer$ You | ValidResult$ Lose | TriggerZones$ Battlefield | Execute$ TrigOppDmg | TriggerDescription$ Whenever you lose a coin flip, CARDNAME deals 1 damage to any target of an opponent's choice.
 SVar:TrigOppDmg:DB$ DealDamage | NumDmg$ 1 | ValidTgts$ Any | TargetingPlayer$ Opponent
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/k/kessig.txt

@@ -2,8 +2,8 @@ Name:Kessig
 ManaCost:no cost
 Types:Plane Innistrad
 R:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Creature.nonWerewolf | Description$ Prevent all combat damage that would be dealt by non-Werewolf creatures.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each creature you control gets +2/+2, gains trample, and becomes a Werewolf in addition to its other types until end of turn.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, each creature you control gets +2/+2, gains trample, and becomes a Werewolf in addition to its other types until end of turn.
 SVar:RolledChaos:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Types$ Werewolf | SubAbility$ DBPump
 SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Trample | NumAtt$ 2 | NumDef$ 2
 SVar:AIRollPlanarDieParams:Mode$ Always | RollInMain1$ True | HasCreatureInPlay$ True
-Oracle:Prevent all combat damage that would be dealt by non-Werewolf creatures.\nWhenever you roll {CHAOS}, each creature you control gets +2/+2, gains trample, and becomes a Werewolf in addition to its other types until end of turn.
+Oracle:Prevent all combat damage that would be dealt by non-Werewolf creatures.\nWhenever chaos ensues, each creature you control gets +2/+2, gains trample, and becomes a Werewolf in addition to its other types until end of turn.

forge-gui/res/cardsfolder/k/kharasha_foothills.txt

@@ -7,10 +7,10 @@ SVar:DBCopy:DB$ CopyPermanent | Defined$ TriggeredAttacker | NumCopies$ 1 | Toke
 # The DelayedTrigger is for all player, not just for each attacking, so can't use AtEOT there
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigExile | RememberObjects$ ImprintedLKI | TriggerDescription$ At the beginning of the next end step, exile those tokens. | SubAbility$ DBCleanup
 SVar:TrigExile:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Exile
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, CARDNAME deals that much damage to target creature.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, you may sacrifice any number of creatures. If you do, CARDNAME deals that much damage to target creature.
 SVar:RolledChaos:DB$ Sacrifice | Defined$ You | Amount$ SacX | SacValid$ Creature | RememberSacrificed$ True | Optional$ True | SubAbility$ DBDmg
 SVar:SacX:Count$Valid Creature.YouCtrl
 SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature | NumDmg$ DmgX | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:DmgX:Remembered$Amount
-Oracle:Whenever a creature you control attacks a player, for each other opponent, you may create a token that's a copy of that creature, tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.\nWhenever you roll {CHAOS}, you may sacrifice any number of creatures. If you do, Kharasha Foothills deals that much damage to target creature.
+Oracle:Whenever a creature you control attacks a player, for each other opponent, you may create a token that's a copy of that creature, tapped and attacking that opponent. Exile those tokens at the beginning of the next end step.\nWhenever chaos ensues, you may sacrifice any number of creatures. If you do, Kharasha Foothills deals that much damage to target creature.

forge-gui/res/cardsfolder/k/kilnspire_district.txt

@@ -5,9 +5,9 @@ T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ PutCounter | TriggerDes
 T:Mode$ Phase | PreCombatMain$ True | ValidPlayer$ You | TriggerZones$ Command | Execute$ PutCounter | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your precombat main phase, put a charge counter on CARDNAME, then add {R} for each charge counter on it.
 SVar:PutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ R | Amount$ Y
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may pay {X}. If you do, CARDNAME deals X damage to any target.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, you may pay {X}. If you do, CARDNAME deals X damage to any target.
 SVar:RolledChaos:AB$ DealDamage | Cost$ X | ValidTgts$ Any | NumDmg$ X
 SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:When you planeswalk to Kilnspire District or at the beginning of your precombat main phase, put a charge counter on Kilnspire District, then add {R} for each charge counter on it.\nWhenever you roll {CHAOS}, you may pay {X}. If you do, Kilnspire District deals X damage to any target.
+Oracle:When you planeswalk to Kilnspire District or at the beginning of your precombat main phase, put a charge counter on Kilnspire District, then add {R} for each charge counter on it.\nWhenever chaos ensues, you may pay {X}. If you do, Kilnspire District deals X damage to any target.

forge-gui/res/cardsfolder/k/klement_novice_acolyte.txt

@@ -61,7 +61,7 @@ Types:Legendary Creature Tiefling Cleric
 PT:2/3
 K:Double Strike
 T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to any target.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any | TgtPrompt$ Select any target
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Any
 SVar:X:TriggerCount$DamageAmount
 Oracle:Double strike\nWhenever Klement, Tempest Acolyte is dealt damage, it deals that much damage to any target.
 

forge-gui/res/cardsfolder/k/krosa.txt

@@ -2,7 +2,7 @@ Name:Krosa
 ManaCost:no cost
 Types:Plane Dominaria
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | AddPower$ 2 | AddToughness$ 2 | Description$ All creatures get +2/+2.
-T:Mode$ PlanarDice | Result$ Chaos | OptionalDecider$ You | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G}.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | OptionalDecider$ You | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, you may add {W}{U}{B}{R}{G}.
 SVar:RolledChaos:DB$ Mana | Produced$ W U B R G
 SVar:AIRollPlanarDieParams:Mode$ Always | RollInMain1$ True
-Oracle:All creatures get +2/+2.\nWhenever you roll {CHAOS}, you may add {W}{U}{B}{R}{G}.
+Oracle:All creatures get +2/+2.\nWhenever chaos ensues, you may add {W}{U}{B}{R}{G}.

forge-gui/res/cardsfolder/l/lair_of_the_ashen_idol.txt

@@ -6,7 +6,7 @@ SVar:SacToIdol:DB$ Sacrifice | Defined$ You | SacValid$ Creature | SubAbility$ I
 SVar:IdolWalk:DB$ Planeswalk | ConditionCheckSVar$ IdolX | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:IdolX:Remembered$Amount
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, any number of target players each create a 2/2 black Zombie creature token.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, any number of target players each create a 2/2 black Zombie creature token.
 SVar:RolledChaos:DB$ Token | ValidTgts$ Player | TgtPrompt$ Select target player to receive zombie token | TargetMin$ 0 | TargetMax$ MaxTgt | TokenScript$ b_2_2_zombie | TokenOwner$ Targeted | TokenAmount$ 1
 SVar:MaxTgt:PlayerCountPlayers$Amount
-Oracle:At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.\nWhenever you roll {CHAOS}, any number of target players each create a 2/2 black Zombie creature token.
+Oracle:At the beginning of your upkeep, sacrifice a creature. If you can't, planeswalk.\nWhenever chaos ensues, any number of target players each create a 2/2 black Zombie creature token.

forge-gui/res/cardsfolder/l/lethe_lake.txt

@@ -2,8 +2,8 @@ Name:Lethe Lake
 ManaCost:no cost
 Types:Plane Arkhos
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ LetheMill | TriggerDescription$ At the beginning of your upkeep, mill ten cards.
-SVar:LetheMill:DB$ Mill | Defined$ You | NumCards$ 10
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, target player puts the top 10 cards of their library into their graveyard.
-SVar:RolledChaos:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Choose target player to mill. | NumCards$ 10
+SVar:LetheMill:DB$ Mill | NumCards$ 10
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, target player mills ten cards.
+SVar:RolledChaos:DB$ Mill | ValidTgts$ Player | NumCards$ 10
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
-Oracle:At the beginning of your upkeep, mill ten cards.\nWhenever you roll {CHAOS}, target player mills ten cards.
+Oracle:At the beginning of your upkeep, mill ten cards.\nWhenever chaos ensues, target player mills ten cards.

forge-gui/res/cardsfolder/l/lightning_bolt.txt

@@ -1,5 +1,5 @@
 Name:Lightning Bolt
 ManaCost:R
 Types:Instant
-A:SP$ DealDamage | ValidTgts$ Creature,Battle,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
+A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
 Oracle:Lightning Bolt deals 3 damage to any target.

forge-gui/res/cardsfolder/l/llanowar.txt

@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Dominaria
 S:Mode$ Continuous | Affected$ Creature | EffectZone$ Command | AddAbility$ LlanowarAb | Description$ All creatures have "{T}: Add {G}{G}.".
 SVar:LlanowarAb:AB$ Mana | Cost$ T | Amount$ 2 | Produced$ G | SpellDescription$ Add {G}{G}.
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, untap all creatures you control.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, untap all creatures you control.
 SVar:RolledChaos:DB$ UntapAll | ValidCards$ Creature.YouCtrl
 SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True
-Oracle:All creatures have "{T}: Add {G}{G}."\nWhenever you roll {CHAOS}, untap all creatures you control.
+Oracle:All creatures have "{T}: Add {G}{G}."\nWhenever chaos ensues, untap all creatures you control.

forge-gui/res/cardsfolder/l/lozhan_dragons_legacy.txt

@@ -4,7 +4,7 @@ Types:Legendary Creature Dragon Shaman
 PT:4/2
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card.Adventure,Dragon | ValidActivatingPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an Adventure spell or Dragon spell, CARDNAME deals damage equal to that spell's mana value to any target that isn't a commander.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.IsNotCommander,Player,Planeswalker.IsNotCommander | TgtPrompt$ Select any target that isn't a commander | NumDmg$ X
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.IsNotCommander,Player,Planeswalker.IsNotCommander,Battle.IsNotCommander | TgtPrompt$ Select any target that isn't a commander | NumDmg$ X
 SVar:X:TriggeredStackInstance$CardManaCostLKI
 SVar:BuffedBy:Creature.AdventureCard,Dragon
 DeckHints:Type$Adventure|Dragon

forge-gui/res/cardsfolder/m/minamo.txt

@@ -3,10 +3,10 @@ ManaCost:no cost
 Types:Plane Kamigawa
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZones$ Command | Execute$ TrigDraw | TriggerDescription$ Whenever a player casts a spell, that player may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ TriggeredActivator | OptionalDecider$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player may return a blue card from their graveyard to their hand.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, each player may return a blue card from their graveyard to their hand.
 SVar:RolledChaos:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBChangeZoneAll
 SVar:DBChoose:DB$ ChooseCard | Choices$ Card.RememberedPlayerCtrl+Blue | ChoiceZone$ Graveyard | Defined$ Player.IsRemembered | Amount$ 1 | RememberChosen$ True
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AIRollPlanarDieParams:Mode$ Always | HasColorInGraveyard$ U
-Oracle:Whenever a player casts a spell, that player may draw a card.\nWhenever you roll {CHAOS}, each player may return a blue card from their graveyard to their hand.
+Oracle:Whenever a player casts a spell, that player may draw a card.\nWhenever chaos ensues, each player may return a blue card from their graveyard to their hand.