Back to OGG

core/src/mindustry/audio/MusicControl.java

@@ -102,7 +102,7 @@ public class MusicControl{
     }
 
     /** Plays a random track.*/
-    protected void playRandom(){
+    public void playRandom(){
         if(isDark()){
             playOnce(darkMusic.random(lastRandomPlayed));
         }else{

core/src/mindustry/mod/ModLoadingMusic.java

@@ -2,6 +2,7 @@ package mindustry.mod;
 
 import arc.audio.*;
 import arc.mock.*;
+import arc.util.*;
 
 public class ModLoadingMusic implements Music{
     public Music music = new MockMusic();
@@ -71,6 +72,11 @@ public class ModLoadingMusic implements Music{
         music.setCompletionListener(listener);
     }
 
+    @Override
+    public void setFilter(int index, @Nullable AudioFilter filter){
+        music.setFilter(index, filter);
+    }
+
     @Override
     public boolean isDisposed(){
         return music.isDisposed();

core/src/mindustry/mod/ModLoadingSound.java

@@ -3,6 +3,7 @@ package mindustry.mod;
 import arc.audio.*;
 import arc.math.geom.*;
 import arc.mock.*;
+import arc.util.*;
 
 public class ModLoadingSound implements Sound{
     public Sound sound = new MockSound();
@@ -121,4 +122,19 @@ public class ModLoadingSound implements Sound{
     public boolean isDisposed(){
         return sound.isDisposed();
     }
+
+    @Override
+    public int play(float volume, float pitch, float pan, boolean loop){
+        return sound.play(volume, pitch, pan, loop);
+    }
+
+    @Override
+    public void setFilter(int index, @Nullable AudioFilter filter){
+        sound.setFilter(index, filter);
+    }
+
+    @Override
+    public boolean isPlaying(int soundId){
+        return sound.isPlaying(soundId);
+    }
 }

core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -26,6 +26,7 @@ public class LiquidTurret extends Turret{
         acceptCoolant = false;
         hasLiquids = true;
         loopSound = Sounds.spray;
+        shootSound = Sounds.none;
     }
 
     /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */
@@ -75,7 +76,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public boolean shouldActiveSound(){
-            return target != null && hasAmmo();
+            return wasShooting;
         }
 
         @Override

core/src/mindustry/world/blocks/defense/turrets/Turret.java

@@ -136,6 +136,7 @@ public abstract class Turret extends ReloadTurret{
         public @Nullable Posc target;
         public Vec2 targetPos = new Vec2();
         public BlockUnitc unit = Nulls.blockUnit;
+        public boolean wasShooting;
 
         @Override
         public void created(){
@@ -176,11 +177,15 @@ public abstract class Turret extends ReloadTurret{
                 case rotation -> rotation;
                 case shootX -> World.conv(targetPos.x);
                 case shootY -> World.conv(targetPos.y);
-                case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
+                case shooting -> isShooting() ? 1 : 0;
                 default -> super.sense(sensor);
             };
         }
 
+        public boolean isShooting(){
+            return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : target != null);
+        }
+
         @Override
         public Unit unit(){
             return (Unit)unit;
@@ -228,6 +233,8 @@ public abstract class Turret extends ReloadTurret{
         public void updateTile(){
             if(!validateTarget()) target = null;
 
+            wasShooting = false;
+
             recoil = Mathf.lerpDelta(recoil, 0f, restitution);
             heat = Mathf.lerpDelta(heat, 0f, cooldown);
 
@@ -269,6 +276,7 @@ public abstract class Turret extends ReloadTurret{
                     }
 
                     if(Angles.angleDist(rotation, targetRot) < shootCone && canShoot){
+                        wasShooting = true;
                         updateShooting();
                     }
                 }

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -42,7 +42,7 @@ public class Conveyor extends Block implements Autotiler{
         conveyorPlacement = true;
 
         ambientSound = Sounds.conveyor;
-        ambientSoundVolume = 0.0015f;
+        ambientSoundVolume = 0.0022f;
         unloadable = false;
         noUpdateDisabled = false;
     }

core/src/mindustry/world/blocks/production/Drill.java

@@ -67,7 +67,7 @@ public class Drill extends Block{
         liquidCapacity = 5f;
         hasItems = true;
         ambientSound = Sounds.drill;
-        ambientSoundVolume = 0.016f;
+        ambientSoundVolume = 0.015f;
     }
 
     @Override