From c9520e607f1785bf79590a1cec04ddb162903db5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 18 Jun 2019 20:45:21 -0400
Subject: [PATCH] Implemented craters map, again / Disabled unit editing

---
 .travis.yml                                   |   5 +-
 core/assets/maps/craters.msav                 | Bin 3546 -> 11299 bytes
 core/src/io/anuke/mindustry/Vars.java         |   2 +
 .../src/io/anuke/mindustry/content/Zones.java |   4 +-
 .../io/anuke/mindustry/core/GameState.java    |   3 +-
 core/src/io/anuke/mindustry/core/Logic.java   |   2 +-
 .../mindustry/ui/fragments/HudFragment.java   |  97 +++++++++---------
 7 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 997046ee8b..2c226bdf10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,15 @@ script:
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-- git clone --depth=1 --branch=master https://github.com/mindustrygame/wiki ../wiki
+  git config --global user.name "Wiki Updater"
+- git clone --depth=1 --branch=master https://github.com/MindustryGame/wiki ../wiki
 - git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator
 - cd ../Mindustry-Wiki-Generator
 - "./gradlew run"
 - cd ../wiki
 - git add .
 - git commit -m "Update to match commit ${TRAVIS_COMMIT}"
-- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/mindustrygame/wiki
+- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/wiki
 deploy:
   provider: releases
   skip_cleanup: true
diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav
index 08435d2896822d16c9183e57a43d28cfb3c1b489..25102a39443329a7f85038f79d897df459424f4b 100644
GIT binary patch
literal 11299
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
ZI?hHMm0HlQ13#aI-ou9H{{lLyRiqjsB6|P;

literal 3546
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
UuV*<gPW>qQHPEyC?|!%pM^JC&Bme*a

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 974c262ffc..c969aa4006 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -47,6 +47,8 @@ public class Vars{
     public static final Team defaultTeam = Team.blue;
     /** team of the enemy in waves/sectors */
     public static final Team waveTeam = Team.red;
+    /** whether to enable editing of units in the editor */
+    public static final boolean enableUnitEditing = false;
     /** max chat message length */
     public static final int maxTextLength = 150;
     /** max player name length in bytes */
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 1f3f4088da..7f5cbaabb9 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -88,12 +88,12 @@ public class Zones implements ContentList{
             resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.sand};
         }};
 
-        craters = new Zone("craters", new MapGenerator("craters", 1).dist(0).decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.011))){{
+        craters = new Zone("craters", new MapGenerator("craters", 1).dist(0).decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.004))){{
             startingItems = ItemStack.list(Items.copper, 200);
             conditionWave = 10;
             zoneRequirements = ZoneRequirement.with(groundZero, 10);
             blockRequirements = new Block[]{Blocks.router};
-            resources = new Item[]{Items.copper, Items.lead, Items.coal};
+            resources = new Item[]{Items.copper, Items.lead, Items.coal, Items.sand, Items.scrap};
         }};
 
         frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 1)
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java
index fcf4d6646c..1e755de6c6 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/io/anuke/mindustry/core/GameState.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry.core;
 
 import io.anuke.arc.Events;
 import io.anuke.mindustry.entities.type.BaseUnit;
+import io.anuke.mindustry.entities.type.base.BaseDrone;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.net.Net;
@@ -28,7 +29,7 @@ public class GameState{
     private State state = State.menu;
 
     public int enemies(){
-        return Net.client() ? enemies : unitGroups[waveTeam.ordinal()].size();
+        return Net.client() ? enemies : unitGroups[waveTeam.ordinal()].count(b -> !(b instanceof BaseDrone));
     }
 
     public BaseUnit boss(){
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index 2b8a61e685..b4a2fd9b76 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -198,7 +198,7 @@ public class Logic implements ApplicationListener{
                     Entities.update(tileGroup);
                     Entities.update(fireGroup);
                 }else{
-                    for(EntityGroup group : unitGroups){
+                    for(EntityGroup<?> group : unitGroups){
                         group.updateEvents();
                         collisions.updatePhysics(group);
                     }
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 0392442a86..3a10063236 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -194,57 +194,60 @@ public class HudFragment extends Fragment{
                         }
                     }).left();
 
-                    t.row();
-                    t.addImageTextButton("$editor.spawn", "icon-add", 8*3, () -> {
-                        FloatingDialog dialog = new FloatingDialog("$editor.spawn");
-                        int i = 0;
-                        for(UnitType type : content.<UnitType>getBy(ContentType.unit)){
-                            dialog.cont.addImageButton("white", 48, () -> {
-                                Call.spawnUnitEditor(player, type);
-                                dialog.hide();
-                            }).get().getStyle().imageUp = new TextureRegionDrawable(type.iconRegion);
-                            if(++i % 4 == 0) dialog.cont.row();
-                        }
-                        dialog.addCloseButton();
-                        dialog.setFillParent(false);
-                        dialog.show();
-                    }).fillX();
+                    if(enableUnitEditing){
 
-                    float[] size = {0};
-                    float[] position = {0, 0};
-
-                    t.row();
-                    t.addImageTextButton("$editor.removeunit", "icon-quit", "toggle", 8*3, () -> {
-
-                    }).fillX().update(b -> {
-                        boolean[] found = {false};
-                        if(b.isChecked()){
-                            Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
-                            if(e == null){
-                                Vector2 world = Core.input.mouseWorld();
-                                Units.nearby(world.x, world.y, 1f, 1f, unit -> {
-                                    if(!found[0] && unit instanceof BaseUnit){
-                                        if(Core.input.keyTap(KeyCode.MOUSE_LEFT)){
-                                            Call.removeUnitEditor(player, (BaseUnit)unit);
-                                        }
-                                        found[0] = true;
-                                        unit.hitbox(Tmp.r1);
-                                        size[0] = Mathf.lerpDelta(size[0], Tmp.r1.width*2f + Mathf.absin(Time.time(), 10f, 5f), 0.1f);
-                                        position[0] = unit.x;
-                                        position[1] = unit.y;
-                                    }
-                                });
+                        t.row();
+                        t.addImageTextButton("$editor.spawn", "icon-add", 8 * 3, () -> {
+                            FloatingDialog dialog = new FloatingDialog("$editor.spawn");
+                            int i = 0;
+                            for(UnitType type : content.<UnitType>getBy(ContentType.unit)){
+                                dialog.cont.addImageButton("white", 48, () -> {
+                                    Call.spawnUnitEditor(player, type);
+                                    dialog.hide();
+                                }).get().getStyle().imageUp = new TextureRegionDrawable(type.iconRegion);
+                                if(++i % 4 == 0) dialog.cont.row();
                             }
-                        }
+                            dialog.addCloseButton();
+                            dialog.setFillParent(false);
+                            dialog.show();
+                        }).fillX();
 
-                        Draw.color(Pal.accent, Color.WHITE, Mathf.absin(Time.time(), 8f, 1f));
-                        Lines.poly(position[0], position[1], 4, size[0]/2f);
-                        Draw.reset();
+                        float[] size = {0};
+                        float[] position = {0, 0};
 
-                        if(!found[0]){
-                            size[0] = Mathf.lerpDelta(size[0], 0f, 0.2f);
-                        }
-                    });
+                        t.row();
+                        t.addImageTextButton("$editor.removeunit", "icon-quit", "toggle", 8 * 3, () -> {
+
+                        }).fillX().update(b -> {
+                            boolean[] found = {false};
+                            if(b.isChecked()){
+                                Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+                                if(e == null){
+                                    Vector2 world = Core.input.mouseWorld();
+                                    Units.nearby(world.x, world.y, 1f, 1f, unit -> {
+                                        if(!found[0] && unit instanceof BaseUnit){
+                                            if(Core.input.keyTap(KeyCode.MOUSE_LEFT)){
+                                                Call.removeUnitEditor(player, (BaseUnit)unit);
+                                            }
+                                            found[0] = true;
+                                            unit.hitbox(Tmp.r1);
+                                            size[0] = Mathf.lerpDelta(size[0], Tmp.r1.width * 2f + Mathf.absin(Time.time(), 10f, 5f), 0.1f);
+                                            position[0] = unit.x;
+                                            position[1] = unit.y;
+                                        }
+                                    });
+                                }
+                            }
+
+                            Draw.color(Pal.accent, Color.WHITE, Mathf.absin(Time.time(), 8f, 1f));
+                            Lines.poly(position[0], position[1], 4, size[0] / 2f);
+                            Draw.reset();
+
+                            if(!found[0]){
+                                size[0] = Mathf.lerpDelta(size[0], 0f, 0.2f);
+                            }
+                        });
+                    }
                 }).width(dsize * 4 + 3f);
                 editorMain.visible(() -> shown && state.isEditor());
             }