From a559c3581e93194636ceefdce8ae269548fd7fbf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 14 Jul 2021 18:46:51 -0400
Subject: [PATCH] Fixed continuous weapon sounds / Improved naval support audio

---
 core/assets/sounds/mineDeploy.ogg                | Bin 0 -> 8428 bytes
 core/src/mindustry/content/UnitTypes.java        |   4 ++++
 .../entities/abilities/EnergyFieldAbility.java   |   6 ++++++
 core/src/mindustry/type/Weapon.java              |   5 ++++-
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 core/assets/sounds/mineDeploy.ogg

diff --git a/core/assets/sounds/mineDeploy.ogg b/core/assets/sounds/mineDeploy.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..69fb5d2f984c2d83d49e36ea43e01b795c1d480b
GIT binary patch
literal 8428
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

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 811650ef7a..8749c7f4e9 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1780,6 +1780,7 @@ public class UnitTypes implements ContentList{
                 shots = 3;
                 shotDelay = 7f;
                 x = y = shootX = shootY = 0f;
+                shootSound = Sounds.mineDeploy;
 
                 bullet = new BasicBulletType(){{
                     sprite = "mine-bullet";
@@ -2150,6 +2151,8 @@ public class UnitTypes implements ContentList{
                 shootY = 7f;
                 recoil = 4f;
                 cooldownTime = reload - 10f;
+                //TODO better sound
+                shootSound = Sounds.laser;
 
                 bullet = new EmpBulletType(){{
                     float rad = 100f;
@@ -2182,6 +2185,7 @@ public class UnitTypes implements ContentList{
                     hitShake = 4f;
                     trailRotation = true;
                     status = StatusEffects.electrified;
+                    hitSound = Sounds.plasmaboom;
 
                     trailEffect = new Effect(16f, e -> {
                         color(Pal.heal);
diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
index 0109128f38..8681e37843 100644
--- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
@@ -1,6 +1,7 @@
 package mindustry.entities.abilities;
 
 import arc.*;
+import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -19,6 +20,7 @@ public class EnergyFieldAbility extends Ability{
     public float damage = 1, reload = 100, range = 60;
     public Effect healEffect = Fx.heal, hitEffect = Fx.hitLaserBlast, damageEffect = Fx.chainLightning;
     public StatusEffect status = StatusEffects.electrified;
+    public Sound shootSound = Sounds.spark;
     public float statusDuration = 60f * 6f;
     public float x, y;
     public boolean hitBuildings = true;
@@ -139,6 +141,10 @@ public class EnergyFieldAbility extends Ability{
                 }
             }
 
+            if(anyNearby){
+                shootSound.at(unit);
+            }
+
             timer = 0f;
         }
     }
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 4fb99cf01a..33729c9636 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -249,7 +249,7 @@ public class Weapon implements Cloneable{
                 unit.vel.add(Tmp.v1.trns(unit.rotation + 180f, mount.bullet.type.recoil));
                 if(shootSound != Sounds.none && !headless){
                     if(mount.sound == null) mount.sound = new SoundLoop(shootSound, 1f);
-                    mount.sound.update(x, y, true);
+                    mount.sound.update(bulletX, bulletY, true);
                 }
             }
         }else{
@@ -323,6 +323,9 @@ public class Weapon implements Cloneable{
                 Time.run(sequenceNum * shotDelay + firstShotDelay, () -> {
                     if(!unit.isAdded()) return;
                     mount.bullet = bullet(unit, shootX + unit.x - baseX, shootY + unit.y - baseY, f + Mathf.range(inaccuracy), lifeScl);
+                    if(!continuous){
+                        shootSound.at(shootX, shootY, Mathf.random(soundPitchMin, soundPitchMax));
+                    }
                 });
                 sequenceNum++;
             });