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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
N+w=cSR;xmn000^yB6|P;

literal 3546
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

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());
             }