From 13c2eae1f478425f1c25c108f65acb79fbc6c56b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 27 Feb 2019 19:48:00 -0500
Subject: [PATCH] Frozen forest rework / Reduced starter copper / Auto-deselect

---
 core/assets/maps/frozenForest.mmap            | Bin 203286 -> 203262 bytes
 .../io/anuke/mindustry/content/Blocks.java    |  14 +++++++-------
 .../io/anuke/mindustry/content/Loadouts.java  |  16 +++++++++++++---
 .../src/io/anuke/mindustry/content/Zones.java |   2 +-
 .../io/anuke/mindustry/game/GlobalData.java   |   2 +-
 .../mindustry/ui/dialogs/DatabaseDialog.java  |   3 ++-
 .../world/blocks/SelectionTrait.java          |   2 +-
 7 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap
index 130da8e7a279fb9e1f68a6d9ab13c3244329b3d0..6b8bfc55f9dea4bf2ec1bb66a784c5cc854aef61 100644
GIT binary patch
delta 10673
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
R&E<gBeXwp1Fl0LR0ssx5cC-Kh

delta 9384
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
DC}J-f

diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 4b9103edb5..3ca432a273 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -751,41 +751,41 @@ public class Blocks implements ContentList{
         }};
 
         conduit = new Conduit("conduit"){{
-            requirements(Category.liquid, ItemStack.with(Items.lead, 1));
+            requirements(Category.liquid, ItemStack.with(Items.metaglass, 1));
             health = 45;
         }};
 
         pulseConduit = new Conduit("pulse-conduit"){{
-            requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.lead, 1));
+            requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.metaglass, 2));
             liquidCapacity = 16f;
             liquidFlowFactor = 4.9f;
             health = 90;
         }};
 
         liquidRouter = new LiquidRouter("liquid-router"){{
-            requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4));
+            requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4));
             liquidCapacity = 20f;
         }};
 
         liquidTank = new LiquidTank("liquid-tank"){{
-            requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.lead, 50));
+            requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.metaglass, 50));
             size = 3;
             liquidCapacity = 1500f;
             health = 500;
         }};
 
         liquidJunction = new LiquidJunction("liquid-junction"){{
-            requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4));
+            requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4));
         }};
 
         bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{
-            requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.lead, 8));
+            requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.metaglass, 8));
             range = 4;
             hasPower = false;
         }};
 
         phaseConduit = new LiquidBridge("phase-conduit"){{
-            requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.lead, 20, Items.titanium, 20));
+            requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.metaglass, 40, Items.titanium, 20));
             range = 12;
             hasPower = true;
             consumes.power(0.30f);
diff --git a/core/src/io/anuke/mindustry/content/Loadouts.java b/core/src/io/anuke/mindustry/content/Loadouts.java
index f4c647f5b7..a9c7f5bc3f 100644
--- a/core/src/io/anuke/mindustry/content/Loadouts.java
+++ b/core/src/io/anuke/mindustry/content/Loadouts.java
@@ -6,6 +6,7 @@ import io.anuke.mindustry.type.Loadout;
 public class Loadouts implements ContentList{
     public static Loadout
     basicShard,
+    advancedShard,
     basicFoundation,
     basicNucleus;
 
@@ -20,14 +21,23 @@ public class Loadouts implements ContentList{
         " C# C# "
         );
 
+        advancedShard = new Loadout(
+        "  ###  ",
+        "  #1#  ",
+        "#######",
+        "C#^ ^C#",
+        " ## ## ",
+        " C# C# "
+        );
+
         basicFoundation = new Loadout(
         "  ####  ",
         "  ####  ",
         "  #2##  ",
         "  ####  ",
-        "  ^  ^  ",
-        " ##  ## ",
-        " C#  C# "
+        "  ^^^^  ",
+        " ###### ",
+        " C#C#C# "
         );
 
         basicNucleus = new Loadout(
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 55c57289bd..059f2261e9 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -115,7 +115,7 @@ public class Zones implements ContentList{
             }};
         }};
 
-        frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 2)
+        frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 1)
             .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
             loadout = Loadouts.basicFoundation;
             baseLaunchCost = ItemStack.with(Items.copper, 100);
diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java
index ffbab24e7b..6726f6fd7f 100644
--- a/core/src/io/anuke/mindustry/game/GlobalData.java
+++ b/core/src/io/anuke/mindustry/game/GlobalData.java
@@ -116,7 +116,7 @@ public class GlobalData{
 
         //set up default values
         if(!Core.settings.has("item-" + Items.copper.name)){
-           addItem(Items.copper, 300);
+           addItem(Items.copper, 50);
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
index bb794e667a..1a6e383dd3 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
@@ -8,6 +8,7 @@ import io.anuke.arc.scene.ui.Tooltip;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.arc.scene.utils.UIUtils;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.graphics.Pal;
@@ -77,6 +78,6 @@ public class DatabaseDialog extends FloatingDialog{
     }
 
     boolean unlocked(UnlockableContent content){
-        return !Vars.world.isZone() || content.unlocked();
+        return (!Vars.world.isZone() && !Vars.state.is(State.menu)) || content.unlocked();
     }
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
index 5b4c1a99a5..ef6d0d5c7c 100644
--- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
+++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
@@ -28,7 +28,7 @@ public interface SelectionTrait{
         for(Item item : items){
             if(!data.isUnlocked(item) && world.isZone()) continue;
 
-            ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> {}).group(group).get();
+            ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> control.input(0).frag.config.hideConfig()).group(group).get();
             button.changed(() -> consumer.accept(button.isChecked() ? item : null));
             button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Icon.medium));
             button.update(() -> button.setChecked(holder.get() == item));