From 471504090a0a24ec173c99eca644901815653630 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 7 May 2022 20:44:28 -0400
Subject: [PATCH] Misc bugfixes

---
 core/src/mindustry/game/Team.java                            | 5 +++--
 .../mindustry/world/blocks/defense/turrets/ReloadTurret.java | 4 ++--
 core/src/mindustry/world/blocks/defense/turrets/Turret.java  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index 9bbb6289e6..af2bfcedf6 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -32,8 +32,9 @@ public class Team implements Comparable<Team>{
         sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
         crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
         malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")),
-        green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
-        //TODO temporarily no palette.
+
+        //TODO temporarily no palettes for these teams.
+        green = new Team(4, "green", Color.valueOf("54d67d")),//Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
         blue = new Team(5, "blue", Color.valueOf("6c87fd")); //Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")
 
     static{
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
index 24f6ecaf87..4a6c957a0e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java
@@ -28,8 +28,8 @@ public class ReloadTurret extends BaseTurret{
         @Override
         public void created(){
             super.created();
-            //for visual reasons, the turret does not need reloading when placed
-            reloadCounter = reload;
+            //for visual reasons, the turret does not need reloading when placed; however, it should not be *fully* reloaded, so firing will not occur
+            reloadCounter = reload - 0.0001f;
         }
 
         protected void updateCooling(){
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 2e73e906db..426edb7b0b 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -449,7 +449,7 @@ public class Turret extends ReloadTurret{
         }
 
         public boolean charging(){
-            return queuedBullets > 0;
+            return queuedBullets > 0 && shoot.firstShotDelay > 0;
         }
 
         protected void updateReload(){