From 89aec3ac51e9110c046e7765d5c91fc331e0f85b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 15 Jun 2020 18:35:21 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/content/UnitTypes.java         | 2 +-
 core/src/mindustry/entities/comp/BuilderComp.java | 5 ++---
 core/src/mindustry/game/Gamemode.java             | 2 +-
 core/src/mindustry/game/Rules.java                | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 6254716aaf..c356127a6b 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -530,7 +530,7 @@ public class UnitTypes implements ContentList{
             range = 70f;
             itemCapacity = 70;
             health = 400;
-            buildSpeed = 0.6f;
+            buildSpeed = 0.5f;
             engineOffset = 6.5f;
             hitsize = 8f;
         }};
diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index f68d22a8eb..e13d5f12bc 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -29,7 +29,6 @@ abstract class BuilderComp implements Unitc{
     @Import float x, y, rotation;
 
     Queue<BuildPlan> plans = new Queue<>();
-    transient float buildSpeed = 1f;
     transient boolean building = true;
 
     @Override
@@ -115,9 +114,9 @@ abstract class BuilderComp implements Unitc{
         BuildEntity entity = tile.ent();
 
         if(current.breaking){
-            entity.deconstruct(this, core, 1f / entity.buildCost * Time.delta() * buildSpeed * state.rules.buildSpeedMultiplier);
+            entity.deconstruct(this, core, 1f / entity.buildCost * Time.delta() * type().buildSpeed * state.rules.buildSpeedMultiplier);
         }else{
-            if(entity.construct(this, core, 1f / entity.buildCost * Time.delta() * buildSpeed * state.rules.buildSpeedMultiplier, current.hasConfig)){
+            if(entity.construct(this, core, 1f / entity.buildCost * Time.delta() * type().buildSpeed * state.rules.buildSpeedMultiplier, current.hasConfig)){
                 if(current.hasConfig){
                     Call.onTileConfig(null, tile.entity, current.config);
                 }
diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java
index 1639ec511d..55bd7e0249 100644
--- a/core/src/mindustry/game/Gamemode.java
+++ b/core/src/mindustry/game/Gamemode.java
@@ -21,7 +21,7 @@ public enum Gamemode{
         rules.attackMode = true;
         rules.waves = true;
         rules.waveTimer = true;
-    }, map -> map.teams.contains(state.rules.waveTeam.id) && !map.rules().pvp),
+    }, map -> map.teams.contains(state.rules.waveTeam.id)),
     pvp(rules -> {
         rules.pvp = true;
         rules.enemyCoreBuildRadius = 600f;
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index e318e4e066..6329bf8eab 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -97,6 +97,8 @@ public class Rules{
     public static class TeamRule{
         /** Whether to use building AI. */
         public boolean ai;
+        /** TODO Tier of blocks/designs that the AI uses for building. [0, 1]*/
+        public float aiTier = 0f;
         /** If true, blocks don't require power or resources. */
         public boolean cheat;
         /** If true, resources are not consumed when building. */