From 8f5b3ee1e034b5a4501897ac6ded92f20706acd9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 26 Apr 2022 09:41:25 -0400
Subject: [PATCH] Removed destruction delay when core is destroyed

---
 core/assets/bloomshaders/alpha_bloom.frag | 2 +-
 core/src/mindustry/content/Blocks.java    | 2 +-
 core/src/mindustry/content/UnitTypes.java | 6 +++---
 core/src/mindustry/game/Teams.java        | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/assets/bloomshaders/alpha_bloom.frag b/core/assets/bloomshaders/alpha_bloom.frag
index 17578edab2..14dee7fc31 100644
--- a/core/assets/bloomshaders/alpha_bloom.frag
+++ b/core/assets/bloomshaders/alpha_bloom.frag
@@ -11,5 +11,5 @@ void main(){
     original = original *  (vec4(1.0) - bloom);
     vec4 combined =  original + bloom;
     float mx = min(max(combined.r,max(combined.g,combined.b)), 1.0);
-    gl_FragColor = vec4(combined.rgb/mx,mx);
+    gl_FragColor = vec4(combined.rgb / mx, mx);
 }
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 043c2318c0..1b99224840 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2701,7 +2701,7 @@ public class Blocks{
             incinerateNonBuildable = true;
 
             //TODO should this be higher?
-            buildCostMultiplier = 0.75f;
+            buildCostMultiplier = 0.7f;
 
             unitCapModifier = 15;
             researchCostMultiplier = 0.07f;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 2ef34795e6..7a3467876f 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -3647,7 +3647,7 @@ public class UnitTypes{
             flying = true;
             mineSpeed = 4f;
             mineTier = 3;
-            buildSpeed = 0.8f;
+            buildSpeed = 1.2f;
             drag = 0.08f;
             speed = 5.6f;
             rotateSpeed = 7f;
@@ -3708,7 +3708,7 @@ public class UnitTypes{
             flying = true;
             mineSpeed = 4.5f;
             mineTier = 3;
-            buildSpeed = 1.1f;
+            buildSpeed = 1.4f;
             drag = 0.08f;
             speed = 7f;
             rotateSpeed = 8f;
@@ -3782,7 +3782,7 @@ public class UnitTypes{
             flying = true;
             mineSpeed = 5f;
             mineTier = 3;
-            buildSpeed = 1.4f;
+            buildSpeed = 1.5f;
             drag = 0.08f;
             speed = 7.5f;
             rotateSpeed = 8f;
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index b76b383307..eca898df9a 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -329,7 +329,8 @@ public class Teams{
 
             for(var build : builds){
                 if(build.within(x, y, range) && !cores.contains(c -> c.within(x, y, range))){
-                    Time.run(Mathf.random(0f, 60f * 6f), build::kill);
+                    build.kill();
+                    //Time.run(Mathf.random(0f, 60f * 6f), build::kill);
                 }
             }
         }