From 538f1d7330be9f571ac19ea7f1309ab51e3769d1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 11 Nov 2020 17:12:42 -0500 Subject: [PATCH] Fixed #3352 / Fixed #3355 / Quad sounds --- core/assets/sounds/plasmaboom.ogg | Bin 0 -> 13151 bytes core/assets/sounds/plasmadrop.ogg | Bin 0 -> 14732 bytes core/src/mindustry/audio/LoopControl.java | 6 ++++++ core/src/mindustry/content/UnitTypes.java | 6 +++++- core/src/mindustry/logic/LExecutor.java | 5 ++++- core/src/mindustry/type/Weather.java | 4 ++-- .../world/meta/values/AmmoListValue.java | 7 +++++-- gradle.properties | 2 +- 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 core/assets/sounds/plasmaboom.ogg create mode 100644 core/assets/sounds/plasmadrop.ogg diff --git a/core/assets/sounds/plasmaboom.ogg b/core/assets/sounds/plasmaboom.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fab2f3471dae825a2a10cee0c4f93fbfc3b87a67 GIT binary patch literal 13151 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 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/audio/LoopControl.java b/core/src/mindustry/audio/LoopControl.java index 2419406176..a01aad5e85 100644 --- a/core/src/mindustry/audio/LoopControl.java +++ b/core/src/mindustry/audio/LoopControl.java @@ -10,6 +10,12 @@ import mindustry.*; public class LoopControl{ private ObjectMap sounds = new ObjectMap<>(); + public void play(Sound sound, float volume){ + if(Vars.headless) return; + + play(sound, Core.camera.position, volume); + } + public void play(Sound sound, Position pos, float volume){ if(Vars.headless) return; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index add391402e..e3129d3ad8 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1307,6 +1307,9 @@ public class UnitTypes implements ContentList{ reload = 55f; minShootVelocity = 0.01f; + soundPitchMin = 1f; + shootSound = Sounds.plasmadrop; + bullet = new BasicBulletType(){{ sprite = "large-bomb"; width = height = 120/4f; @@ -1318,9 +1321,10 @@ public class UnitTypes implements ContentList{ frontColor = Color.white; mixColorTo = Color.white; + hitSound = Sounds.plasmaboom; + shootCone = 180f; ejectEffect = Fx.none; - shootSound = Sounds.none; despawnShake = 4f; collidesAir = false; diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index c883cbd5ba..d4c20eaf5e 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -199,11 +199,14 @@ public class LExecutor{ //bind to the next unit exec.setconst(varUnit, seq.get(index)); } - index ++; + index++; }else{ //no units of this type found exec.setconst(varUnit, null); } + }else if(exec.obj(type) instanceof Unit u && u.team == exec.team){ + //bind to specific unit object + exec.setconst(varUnit, u); }else{ exec.setconst(varUnit, null); } diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index ed6145ceae..8e724a7ecb 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -89,9 +89,9 @@ public abstract class Weather extends UnlockableContent{ } } - if(sound != Sounds.none){ + if(!headless && sound != Sounds.none){ float noise = soundVolOscMag > 0 ? (float)Math.abs(Noise.rawNoise(Time.time() / soundVolOscScl)) * soundVolOscMag : 0; - loops.play(sound, Core.camera.position, Math.max((soundVol + noise) * state.opacity, soundVolMin)); + loops.play(sound, Math.max((soundVol + noise) * state.opacity, soundVolMin)); } } diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index 359b958a96..ba6a0d8a50 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -41,10 +41,13 @@ public class AmmoListValue implements StatValue{ sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1))); } - if(!Mathf.equal(type.ammoMultiplier, 1f)) + if(!Mathf.equal(type.ammoMultiplier, 1f) && !(type instanceof LiquidBulletType)){ sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier)); - if(!Mathf.equal(type.reloadMultiplier, 1f)) + } + + if(!Mathf.equal(type.reloadMultiplier, 1f)){ sep(bt, Core.bundle.format("bullet.reload", Strings.fixed(type.reloadMultiplier, 1))); + } if(type.knockback > 0){ sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1))); diff --git a/gradle.properties b/gradle.properties index ee126bcf75..cd20e76ae5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=a6f488d6f741b98d123113ceb26439032be0719e +archash=