From 232ad79c02f98eccd40bb57183d53b287423a1e9 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@gmail.com>
Date: Wed, 30 Jun 2021 10:17:16 +0200
Subject: [PATCH] Demo version adjustments

---
 src/js/core/config.js        |  2 +-
 src/js/game/modes/regular.js | 96 ++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/js/core/config.js b/src/js/core/config.js
index 005e2719..78dd99e4 100644
--- a/src/js/core/config.js
+++ b/src/js/core/config.js
@@ -7,7 +7,7 @@ export const IS_DEBUG =
 
 export const SUPPORT_TOUCH = false;
 
-export const IS_MAC = navigator.platform.toLowerCase().indexOf("mac") >= 0;
+export const IS_MAC = navigator.platform.toLowerCase().indexOf("mac") >= 0 && !G_IS_DEV;
 
 const smoothCanvas = true;
 
diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js
index ca0e8672..87bb764f 100644
--- a/src/js/game/modes/regular.js
+++ b/src/js/game/modes/regular.js
@@ -342,63 +342,63 @@ export function generateLevelDefinitions(limitedVersion = false) {
             reward: enumHubGoalRewards.reward_rotater_ccw,
         },
 
-        // 8
-        {
-            shape: "RbRb----", // painter t2
-            required: 480,
-            reward: enumHubGoalRewards.reward_mixer,
-        },
-
-        // 9
-        // Mixing (purple)
-        {
-            shape: "CpCpCpCp", // belts t3
-            required: 600,
-            reward: enumHubGoalRewards.reward_merger,
-        },
-
-        // 10
-        // STACKER: Star shape + cyan
-        {
-            shape: "ScScScSc", // miners t3
-            required: 800,
-            reward: enumHubGoalRewards.reward_stacker,
-        },
-
-        // 11
-        // Chainable miner
-        {
-            shape: "CgScScCg", // processors t3
-            required: 1000,
-            reward: enumHubGoalRewards.reward_miner_chainable,
-        },
-
-        // 12
-        // Blueprints
-        {
-            shape: "CbCbCbRb:CwCwCwCw",
-            required: 1000,
-            reward: enumHubGoalRewards.reward_blueprints,
-        },
-
-        // 13
-        // Tunnel Tier 2
-        {
-            shape: chinaShapes ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw", // painting t3
-            required: 3800,
-            reward: enumHubGoalRewards.reward_underground_belt_tier_2,
-        },
-
         // DEMO STOPS HERE
         ...(limitedVersion
             ? [
                   {
-                      shape: chinaShapes ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw",
+                      shape: "CrCrCrCr",
                       required: 0,
                       reward: enumHubGoalRewards.reward_demo_end,
                   },
               ]
             : [
+                  // 8
+                  {
+                      shape: "RbRb----", // painter t2
+                      required: 480,
+                      reward: enumHubGoalRewards.reward_mixer,
+                  },
+
+                  // 9
+                  // Mixing (purple)
+                  {
+                      shape: "CpCpCpCp", // belts t3
+                      required: 600,
+                      reward: enumHubGoalRewards.reward_merger,
+                  },
+
+                  // 10
+                  // STACKER: Star shape + cyan
+                  {
+                      shape: "ScScScSc", // miners t3
+                      required: 800,
+                      reward: enumHubGoalRewards.reward_stacker,
+                  },
+
+                  // 11
+                  // Chainable miner
+                  {
+                      shape: "CgScScCg", // processors t3
+                      required: 1000,
+                      reward: enumHubGoalRewards.reward_miner_chainable,
+                  },
+
+                  // 12
+                  // Blueprints
+                  {
+                      shape: "CbCbCbRb:CwCwCwCw",
+                      required: 1000,
+                      reward: enumHubGoalRewards.reward_blueprints,
+                  },
+
+                  // 13
+                  // Tunnel Tier 2
+                  {
+                      shape: chinaShapes ? "CuCuCuCu:CwCwCwCw:Sb--Sr--" : "RpRpRpRp:CwCwCwCw", // painting t3
+                      required: 3800,
+                      reward: enumHubGoalRewards.reward_underground_belt_tier_2,
+                  },
+
                   // 14
                   // Belt reader
                   {