From 670e9467da5c1e37a3f46c6087a9cebb66507589 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Dec 2025 18:51:24 -0500
Subject: [PATCH] Flare nerf / More liquid capacity increase considerations

---
 core/src/mindustry/content/Blocks.java                    | 2 +-
 core/src/mindustry/content/UnitTypes.java                 | 5 +++--
 core/src/mindustry/world/Block.java                       | 8 ++++++--
 .../mindustry/world/blocks/defense/turrets/Turret.java    | 1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b6b6787d47..6c1bb500ce 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -6196,7 +6196,7 @@ public class Blocks{
         airFactory = new UnitFactory("air-factory"){{
             requirements(Category.units, with(Items.copper, 60, Items.lead, 70));
             plans = Seq.with(
-                new UnitPlan(UnitTypes.flare, 60f * 15, with(Items.silicon, 15)),
+                new UnitPlan(UnitTypes.flare, 60f * 15, with(Items.silicon, 20)),
                 new UnitPlan(UnitTypes.mono, 60f * 35, with(Items.silicon, 30, Items.lead, 15))
             );
             size = 3;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index b5357e2a84..5cd16f2259 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1079,10 +1079,11 @@ public class UnitTypes{
                 shoot.shotDelay = 3f;
                 ejectEffect = Fx.casing1;
                 mirror = false;
-                bullet = new BasicBulletType(2.5f, 16){{
+                bullet = new BasicBulletType(2.5f, 9){{
+                    inaccuracy = 4f;
                     width = 7f;
                     height = 9f;
-                    lifetime = 45f;
+                    lifetime = 32f;
                     shootEffect = Fx.shootSmall;
                     smokeEffect = Fx.shootSmallSmoke;
                     ammoMultiplier = 2;
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index a70a11ec4d..133cb377c5 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -1327,12 +1327,16 @@ public class Block extends UnlockableContent implements Senseable{
             lightClipSize = Math.max(lightClipSize, size * 30f * 2f);
         }
 
-        // some blocks dont have hasLiquids but have liquid consumers/liquid capacity
+        //some blocks don't have hasLiquids, but have liquid consumers/liquid capacity
         if(liquidCapacity < 0){
             float consumeAmount = 1f;
             for(var cons : consumeBuilder){
-                if(cons instanceof ConsumeLiquid liq){
+                if(cons instanceof ConsumeLiquidBase liq){
                     consumeAmount = Math.max(consumeAmount, liq.amount * 60f);
+                }else if(cons instanceof ConsumeLiquids liq){
+                    for(var stack : liq.liquids){
+                        consumeAmount = Math.max(consumeAmount, stack.amount * 60f);
+                    }
                 }
             }
             liquidCapacity = Mathf.round(10f * consumeAmount);
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index f83114a5e4..0b007ba2db 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -155,7 +155,6 @@ public class Turret extends ReloadTurret{
 
     public Turret(String name){
         super(name);
-        liquidCapacity = 20f;
         outlinedIcon = 1;
         drawLiquidLight = false;
         sync = true;