From 48c04bda8cbd6a1d202f4da94bcde9090c9703cf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 18 Feb 2020 20:07:07 -0500
Subject: [PATCH] Map tweaks

---
 core/src/mindustry/content/UnitTypes.java      | 6 +++---
 core/src/mindustry/graphics/BlockRenderer.java | 4 ++--
 core/src/mindustry/world/Build.java            | 5 +++++
 gradle.properties                              | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index de651d25b2..d239c910d3 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -96,9 +96,9 @@ public class UnitTypes implements ContentList{
             flying = true;
             drag = 0.05f;
             mass = 2f;
-            speed = 2f;
-            accel = 0.1f;
-            speed = 1.5f;
+            speed = 3f;
+            rotateSpeed = 12f;
+            accel = 0.3f;
             range = 70f;
             itemCapacity = 70;
             health = 400;
diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java
index 0680d1b64d..17197c43a6 100644
--- a/core/src/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -117,10 +117,10 @@ public class BlockRenderer implements Disposable{
         //TODO tweak noise and radius
         if(world.isCampaign()){
             int circleBlend = 14;
-            float rawDst = Mathf.dst(x, y, world.width() / 2, world.height() / 2) + Noise.nnoise(x, y, 7f, 8f) + Noise.nnoise(x, y, 20f, 25f);
+            float rawDst = Mathf.dst(x, y, world.width() / 2, world.height() / 2) + Noise.nnoise(x, y, 7f, 7f) + Noise.nnoise(x, y, 20f, 15f);
             int circleDst = (int)(rawDst - (world.width() / 2 - circleBlend));
             if(circleDst > 0){
-                dark = Math.max(circleDst / 1.4f, dark);
+                dark = Math.max(circleDst / 1.6f, dark);
             }
         }
 
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 0cafd2b416..a64d7187a2 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -82,6 +82,11 @@ public class Build{
             return false;
         }
 
+        //campaign circle check
+        if(world.isCampaign() && !Mathf.within(x, y, world.width()/2, world.height()/2, world.width()/2 - 8)){
+            return false;
+        }
+
         Tile tile = world.tile(x, y);
 
         if(tile == null) return false;
diff --git a/gradle.properties b/gradle.properties
index dc5c21b2cb..d496de7400 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=415c435dc59e9248fdef8362582220d18f9f8e17
+archash=7f149f0747ff41f1bfa80e2153d2b66402ba63c1