From 65990ad817b1fc2fa7b420940e8a8c54658049dc Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 7 Nov 2020 12:12:13 -0500 Subject: [PATCH] max sound fix --- core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 3 ++- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 535b601db9..cd8dcdc4d7 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1755,10 +1755,10 @@ public class Blocks implements ContentList{ shootSound = Sounds.shootBig; unitSort = (u, x, y) -> -u.maxHealth; - coolantMultiplier = 0.09f; + coolantMultiplier = 0.11f; health = 150 * size * size; - consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true); + coolantUsage = 1f; consumes.powerCond(10f, TurretBuild::isActive); }}; @@ -1786,7 +1786,7 @@ public class Blocks implements ContentList{ shootSound = Sounds.shootBig; health = 160 * size * size; - consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true); + coolantUsage = 1f; }}; meltdown = new LaserTurret("meltdown"){{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 4507ba345d..07f3b3ea8e 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -50,6 +50,7 @@ public abstract class Turret extends ReloadTurret{ public float recoilAmount = 1f; public float restitution = 0.02f; public float cooldown = 0.02f; + public float coolantUsage = 0.2f; public float shootCone = 8f; public float shootShake = 0f; public float xRand = 0f; @@ -109,7 +110,7 @@ public abstract class Turret extends ReloadTurret{ public void init(){ if(acceptCoolant && !consumes.has(ConsumeType.liquid)){ hasLiquids = true; - consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.2f)).update(false).boost(); + consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, coolantUsage)).update(false).boost(); } super.init(); diff --git a/gradle.properties b/gradle.properties index adeb48b273..42fb9e0633 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f93ea128de153974d550bc294de4acaf810da24b +archash=4e15523716770c3e5f8b370c65b8321f54a907f8