From 7559996227f93c98dbaec20fb373c8aa585ba848 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 13 Nov 2020 19:03:27 -0500
Subject: [PATCH] Bugfixes / New campaign map

---
 core/assets/bundles/bundle.properties         |   1 +
 core/assets/maps/windsweptIslands.msav        | Bin 0 -> 12782 bytes
 core/src/mindustry/content/SectorPresets.java |   7 ++-
 core/src/mindustry/content/TechTree.java      |  52 ++++++++++--------
 core/src/mindustry/core/Control.java          |   2 +
 core/src/mindustry/core/Logic.java            |   1 -
 core/src/mindustry/input/DesktopInput.java    |   4 +-
 .../mindustry/ui/fragments/HudFragment.java   |   2 +-
 8 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 core/assets/maps/windsweptIslands.msav

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 671eff2048..eef7dd7e26 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -561,6 +561,7 @@ sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
 sector.biomassFacility.name = Biomass Synthesis Facility
+sector.windsweptIslands.name = Windswept Islands
 
 #unused
 #sector.crags.name = Crags
diff --git a/core/assets/maps/windsweptIslands.msav b/core/assets/maps/windsweptIslands.msav
new file mode 100644
index 0000000000000000000000000000000000000000..347c8ce3f49408c59de52ccc1efbfcc0e799088f
GIT binary patch
literal 12782
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
E0HpTBNB{r;

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index 8b1459552a..e6ff587048 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -8,7 +8,7 @@ import static mindustry.content.Planets.*;
 public class SectorPresets implements ContentList{
     public static SectorPreset
     groundZero,
-    craters, biomassFacility, frozenForest, ruinousShores, stainedMountains, tarFields, fungalPass,
+    craters, biomassFacility, frozenForest, ruinousShores, windsweptIslands, stainedMountains, tarFields, fungalPass,
     saltFlats, overgrowth,
     impact0078, desolateRift, nuclearComplex;
 
@@ -46,6 +46,11 @@ public class SectorPresets implements ContentList{
             difficulty = 3;
         }};
 
+        windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 246){{
+            captureWave = 30;
+            difficulty = 5;
+        }};
+
         stainedMountains = new SectorPreset("stainedMountains", serpulo, 20){{
             captureWave = 30;
             difficulty = 3;
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index 559611fb69..77e5344e05 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -436,7 +436,7 @@ public class TechTree implements ContentList{
                         });
                     });
 
-                    node(navalFactory, () -> {
+                    node(navalFactory, Seq.with(new SectorComplete(ruinousShores)), () -> {
                         node(risso, () -> {
                             node(minke, () -> {
                                 node(bryde, () -> {
@@ -479,36 +479,44 @@ public class TechTree implements ContentList{
                             new Research(kiln),
                             new Research(mechanicalPump)
                         ), () -> {
-                            node(tarFields, Seq.with(
+                            node(windsweptIslands, Seq.with(
                                 new SectorComplete(ruinousShores),
-                                new Research(coalCentrifuge),
-                                new Research(conduit),
-                                new Research(wave)
+                                new Research(pneumaticDrill),
+                                new Research(hail),
+                                new Research(siliconSmelter),
+                                new Research(steamGenerator)
                             ), () -> {
-                                //TODO change positions?
-                                node(impact0078, Seq.with(
-                                    new SectorComplete(tarFields),
-                                    new Research(Items.thorium),
-                                    new Research(overdriveProjector)
+                                node(tarFields, Seq.with(
+                                    new SectorComplete(windsweptIslands),
+                                    new Research(coalCentrifuge),
+                                    new Research(conduit),
+                                    new Research(wave)
                                 ), () -> {
-                                    node(desolateRift, Seq.with(
-                                        new SectorComplete(impact0078),
-                                        new Research(thermalGenerator),
-                                        new Research(thoriumReactor)
+                                    //TODO change positions?
+                                    node(impact0078, Seq.with(
+                                        new SectorComplete(tarFields),
+                                        new Research(Items.thorium),
+                                        new Research(overdriveProjector)
                                     ), () -> {
+                                        node(desolateRift, Seq.with(
+                                            new SectorComplete(impact0078),
+                                            new Research(thermalGenerator),
+                                            new Research(thoriumReactor)
+                                        ), () -> {
 
+                                        });
                                     });
                                 });
-                            });
 
-                            node(saltFlats, Seq.with(
-                                new SectorComplete(ruinousShores),
-                                new Research(groundFactory),
-                                new Research(airFactory),
-                                new Research(door),
-                                new Research(waterExtractor)
-                            ), () -> {
+                                node(saltFlats, Seq.with(
+                                    new SectorComplete(windsweptIslands),
+                                    new Research(groundFactory),
+                                    new Research(airFactory),
+                                    new Research(door),
+                                    new Research(waterExtractor)
+                                ), () -> {
 
+                                });
                             });
                         });
 
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 2134d08d57..946c675605 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -175,6 +175,8 @@ public class Control implements ApplicationListener, Loadable{
             app.post(() -> ui.hudfrag.showLand());
             renderer.zoomIn(Fx.coreLand.lifetime);
             app.post(() -> Fx.coreLand.at(core.getX(), core.getY(), 0, core.block));
+            camera.position.set(core);
+            player.set(core);
             Time.run(Fx.coreLand.lifetime, () -> {
                 Fx.launch.at(core);
                 Effect.shake(5f, 5f, core);
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 646d0732a6..85cb166237 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -34,7 +34,6 @@ public class Logic implements ApplicationListener{
         Events.on(BlockDestroyEvent.class, event -> {
             //blocks that get broken are appended to the team's broken block queue
             Tile tile = event.tile;
-            Block block = tile.block();
             //skip null entities or un-rebuildables, for obvious reasons; also skip client since they can't modify these requests
             if(tile.build == null || !tile.block().rebuildable || net.client()) return;
 
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 50bcf839e3..4533053822 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -61,7 +61,7 @@ public class DesktopInput extends InputHandler{
             t.visible(() -> {
                 t.color.a = Mathf.lerpDelta(t.color.a, player.builder().isBuilding() ? 1f : 0f, 0.15f);
 
-                return Core.settings.getBool("hints") && selectRequests.isEmpty() && t.color.a > 0.01f;
+                return ui.hudfrag.shown && Core.settings.getBool("hints") && selectRequests.isEmpty() && t.color.a > 0.01f;
             });
             t.touchable(() -> t.color.a < 0.1f ? Touchable.disabled : Touchable.childrenOnly);
             t.table(Styles.black6, b -> {
@@ -75,7 +75,7 @@ public class DesktopInput extends InputHandler{
         });
 
         group.fill(t -> {
-            t.visible(() -> lastSchematic != null && !selectRequests.isEmpty());
+            t.visible(() -> ui.hudfrag.shown && lastSchematic != null && !selectRequests.isEmpty());
             t.bottom();
             t.table(Styles.black6, b -> {
                 b.defaults().left();
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index c2d372786e..d3ec9647a0 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -446,7 +446,7 @@ public class HudFragment extends Fragment{
 
             Table table = new Table(Tex.button);
             table.update(() -> {
-                if(state.isMenu()){
+                if(state.isMenu() || !ui.hudfrag.shown){
                     table.remove();
                 }
             });