Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flare nerf / More liquid capacity increase considerations

Browse Source
This commit is contained in:
Anuken
2025-12-17 18:51:24 -05:00
parent 425b154e3b
commit 670e9467da
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -6196,7 +6196,7 @@ public class Blocks{
airFactory = new UnitFactory("air-factory"){{ airFactory = new UnitFactory("air-factory"){{
requirements(Category.units, with(Items.copper, 60, Items.lead, 70)); requirements(Category.units, with(Items.copper, 60, Items.lead, 70));
plans = Seq.with( 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)) new UnitPlan(UnitTypes.mono, 60f * 35, with(Items.silicon, 30, Items.lead, 15))
); );
size = 3; size = 3;

5
core/src/mindustry/content/UnitTypes.java
View File

@@ -1079,10 +1079,11 @@ public class UnitTypes{
shoot.shotDelay = 3f; shoot.shotDelay = 3f;
ejectEffect = Fx.casing1; ejectEffect = Fx.casing1;
mirror = false; mirror = false;
bullet = new BasicBulletType(2.5f, 16){{ bullet = new BasicBulletType(2.5f, 9){{
inaccuracy = 4f;
width = 7f; width = 7f;
height = 9f; height = 9f;
lifetime = 45f; lifetime = 32f;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke; smokeEffect = Fx.shootSmallSmoke;
ammoMultiplier = 2; ammoMultiplier = 2;

8
core/src/mindustry/world/Block.java
View File

@@ -1327,12 +1327,16 @@ public class Block extends UnlockableContent implements Senseable{
lightClipSize = Math.max(lightClipSize, size * 30f * 2f); 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){ if(liquidCapacity < 0){
float consumeAmount = 1f; float consumeAmount = 1f;
for(var cons : consumeBuilder){ for(var cons : consumeBuilder){
if(cons instanceof ConsumeLiquid liq){ if(cons instanceof ConsumeLiquidBase liq){
consumeAmount = Math.max(consumeAmount, liq.amount * 60f); 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); liquidCapacity = Mathf.round(10f * consumeAmount);

1
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -155,7 +155,6 @@ public class Turret extends ReloadTurret{
public Turret(String name){ public Turret(String name){
super(name); super(name);
liquidCapacity = 20f;
outlinedIcon = 1; outlinedIcon = 1;
drawLiquidLight = false; drawLiquidLight = false;
sync = true; sync = true;