Merge branch 'master' into master2

forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java

@@ -123,9 +123,21 @@ public class NewGameScene extends MenuScene {
             AdventureModes.Custom.setModes(custom);
         }
         String[] modeNames = new String[modes.size];
-        for (int i = 0; i < modes.size; i++)
+        int constructedIndex = -1;
+
+        for (int i = 0; i < modes.size; i++) {
             modeNames[i] = modes.get(i).getName();
+            if (modes.get(i) == AdventureModes.Constructed) {
+                constructedIndex = i;
+            }
+        }
+
         mode.setTextList(modeNames);
+        mode.setCurrentIndex(constructedIndex != -1 ? constructedIndex : 0);
+
+        AdventureModes initialMode = modes.get(mode.getCurrentIndex());
+        starterEdition.setVisible(initialMode == AdventureModes.Standard);
+        starterEditionLabel.setVisible(initialMode == AdventureModes.Standard);
 
         gender.setTextList(new String[]{Forge.getLocalizer().getMessage("lblMale") + "[%120][CYAN] \u2642",
                 Forge.getLocalizer().getMessage("lblFemale") + "[%120][MAGENTA] \u2640"});

forge-gui/res/cardsfolder/upcoming/chittering_illuminator.txt

@@ -0,0 +1,7 @@
+Name:Chittering Illuminator
+ManaCost:1 G G
+Types:Enchantment Creature Squirrel Glimmer
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self+TopLibrary | AffectedZone$ Library | EffectZone$ All | MayPlay$ True | MayLookAt$ You | Description$ As long as CARDNAME is at the top of your library, you may look at it any time and you may cast it.
+S:Mode$ Continuous | Affected$ Creature.TopLibrary+YouCtrl+nonLand | AffectedZone$ Library | EffectZone$ Battlefield | MayPlay$ True | MayLookAt$ You | Description$ As long as the top card of your library is a creature card, you may look at it any time and you may cast it.
+Oracle:As long as Chittering Illuminator is at the top of your library, you may look at it any time and you may cast it.\nAs long as the top card of your library is a creature card, you may look at it any time and you may cast it.

forge-gui/res/cardsfolder/upcoming/enduring_friendship.txt

@@ -0,0 +1,11 @@
+Name:Enduring Friendship
+ManaCost:U R
+Types:Enchantment Creature Otter Glimmer
+PT:2/1
+K:Double team
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell, creatures you control that are Otters and/or enchantments get +1/+1 until end of turn.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.Otter+YouCtrl,Creature.Enchantment+YouCtrl | NumAtt$ 1 | NumDef$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ DBReturn | TriggerDescription$ When CARDNAME dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)
+SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | AnimateSubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Enchantment | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Double team\nWhenever you cast an instant or sorcery spell, creatures you control that are Otters and/or enchantments get +1/+1 until end of turn. When Enduring Friendship dies, if it was a creature, return it to the battlefield under its owner's control. It's an enchantment. (It's not a creature.)

forge-gui/res/editions/Modern Horizons 2.txt

@@ -609,7 +609,7 @@ g_5_3_elemental
 r_1_1_goblin
 rw_4_4_a_golem
 u_0_3_crab
-u_1_1_bird_flying
+w_1_1_bird_flying
 
 [other]
 eternalize_timeless_dragon