Buff signal flare turret

+ Slightly better code

Author: MEEPofFaith

src/progressed/content/PMUnitTypes.java

@@ -198,22 +198,22 @@ public static void load(){
         }});
 
         flareSmall = EntityRegistry.content("small-flare", SignalFlareUnit.class, name -> new SignalFlareUnitType(name){{
-            health = 300f;
+            health = 400f;
             hideDetails = false;
             attraction = 800f;
             flareY = 29f / 4f;
         }});
 
-        flareMedium = EntityRegistry.content("medium-flare", SignalFlareUnit.class, name -> new SignalFlareUnitType(name, 360f){{
-            health = 900f;
+        flareMedium = EntityRegistry.content("medium-flare", SignalFlareUnit.class, name -> new SignalFlareUnitType(name, 8f * 60f){{
+            health = 1500f;
             hideDetails = false;
             attraction = 11000f;
             flareY = 45f / 4f;
             flareEffectSize = 1.5f;
         }});
 
-        flareLarge = EntityRegistry.content("large-flare", SignalFlareUnit.class, name -> new SignalFlareUnitType(name, 420f){{
-            health = 2700f;
+        flareLarge = EntityRegistry.content("large-flare", SignalFlareUnit.class, name -> new SignalFlareUnitType(name, 15f * 60f){{
+            health = 6000f;
             hideDetails = false;
             attraction = 26000f;
             flareY = 61f / 4f;

src/progressed/content/blocks/PMBlocks.java

@@ -597,7 +597,7 @@ public void setStats(){
             minRange = 5f * tilesize;
             range = 60f * tilesize;
             shootY = 23f / 4f;
-            reload = 900f;
+            reload = 120f;
             inaccuracy = 10f;
             velocityRnd = 0.2f;
             shootSound = Sounds.shootSnap;

src/progressed/world/blocks/defence/turret/SignalFlareTurret.java

@@ -105,6 +105,8 @@ public void updateTile(){
                 bullet = null;
             }
 
+            if(flaresMaxed()) return; //Don't bother with targeting when it can't shoot.
+
             if(hasAmmo()){
                 if(timer(timerTarget, targetInterval)){
                     findTarget();
@@ -131,26 +133,26 @@ public void updateTile(){
 
         @Override
         protected void updateShooting(){
-            if(flares.size < flareLimit && bullet == null){
-                if(reloadCounter >= reload && !charging()){
-                    BulletType type = peekAmmo();
+            if(bullet != null) return;
 
-                    shoot(type);
+            if(reloadCounter >= reload && !charging()){
+                BulletType type = peekAmmo();
 
-                    reloadCounter = 0f;
+                shoot(type);
 
-                    targetFound = false;
-                }else{
-                    reloadCounter += delta() * peekAmmo().reloadMultiplier * baseReloadSpeed();
-                }
+                reloadCounter = 0f;
+
+                targetFound = false;
+            }else{
+                reloadCounter += delta() * peekAmmo().reloadMultiplier * baseReloadSpeed();
             }
         }
 
         @Override
         protected void updateCooling(){
-            if(flares.size < flareLimit && bullet == null){
-                super.updateCooling();
-            }
+            if(bullet != null) return;
+
+            super.updateCooling();
         }
 
         @Override
@@ -188,7 +190,11 @@ protected void handleBullet(Bullet bullet, float offsetX, float offsetY, float a
 
         @Override
         public BlockStatus status(){
-            return (flares.size >= flareLimit || bullet != null) ? BlockStatus.noOutput : super.status();
+            return flaresMaxed() ? BlockStatus.noOutput : super.status();
+        }
+
+        public boolean flaresMaxed(){
+            return flares.size >= flareLimit || bullet != null;
         }
 
         public float countf(){