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

max sound fix

Browse Source
This commit is contained in:
Anuken
2020-11-07 12:12:13 -05:00
parent d11a03e7d8
commit 65990ad817
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1755,10 +1755,10 @@ public class Blocks implements ContentList{
shootSound = Sounds.shootBig; shootSound = Sounds.shootBig;
unitSort = (u, x, y) -> -u.maxHealth; unitSort = (u, x, y) -> -u.maxHealth;
coolantMultiplier = 0.09f; coolantMultiplier = 0.11f;
health = 150 * size * size; 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); consumes.powerCond(10f, TurretBuild::isActive);
}}; }};
@@ -1786,7 +1786,7 @@ public class Blocks implements ContentList{
shootSound = Sounds.shootBig; shootSound = Sounds.shootBig;
health = 160 * size * size; 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"){{ meltdown = new LaserTurret("meltdown"){{

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

@@ -50,6 +50,7 @@ public abstract class Turret extends ReloadTurret{
public float recoilAmount = 1f; public float recoilAmount = 1f;
public float restitution = 0.02f; public float restitution = 0.02f;
public float cooldown = 0.02f; public float cooldown = 0.02f;
public float coolantUsage = 0.2f;
public float shootCone = 8f; public float shootCone = 8f;
public float shootShake = 0f; public float shootShake = 0f;
public float xRand = 0f; public float xRand = 0f;
@@ -109,7 +110,7 @@ public abstract class Turret extends ReloadTurret{
public void init(){ public void init(){
if(acceptCoolant && !consumes.has(ConsumeType.liquid)){ if(acceptCoolant && !consumes.has(ConsumeType.liquid)){
hasLiquids = true; 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(); super.init();

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=f93ea128de153974d550bc294de4acaf810da24b archash=4e15523716770c3e5f8b370c65b8321f54a907f8