From 2832dc69ef6065441001c5ae8964e9fe667abf32 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 14 Aug 2019 23:27:24 -0400
Subject: [PATCH] Random shoot sound pitch

---
 core/src/io/anuke/mindustry/game/SoundLoop.java               | 2 +-
 core/src/io/anuke/mindustry/type/Weapon.java                  | 2 +-
 core/src/io/anuke/mindustry/world/blocks/BuildBlock.java      | 4 ++--
 .../anuke/mindustry/world/blocks/defense/turrets/Turret.java  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/io/anuke/mindustry/game/SoundLoop.java b/core/src/io/anuke/mindustry/game/SoundLoop.java
index 6dc6f2cae8..3266721ed6 100644
--- a/core/src/io/anuke/mindustry/game/SoundLoop.java
+++ b/core/src/io/anuke/mindustry/game/SoundLoop.java
@@ -9,7 +9,7 @@ public class SoundLoop{
     private static final float fadeSpeed = 0.05f;
 
     private final Sound sound;
-    private long id = -1;
+    private int id = -1;
     private float volume, baseVolume;
 
     public SoundLoop(Sound sound, float baseVolume){
diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java
index 180bb2fad5..4e77b2bc4a 100644
--- a/core/src/io/anuke/mindustry/type/Weapon.java
+++ b/core/src/io/anuke/mindustry/type/Weapon.java
@@ -92,7 +92,7 @@ public class Weapon{
         float baseX = shooter.getX(), baseY = shooter.getY();
 
         Weapon weapon = shooter.getWeapon();
-        weapon.shootSound.at(x, y);
+        weapon.shootSound.at(x, y, Mathf.random(0.8f, 1.0f));
 
         sequenceNum = 0;
         if(weapon.shotDelay > 0.01f){
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index c8d571a395..a1a7f153c8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -54,7 +54,7 @@ public class BuildBlock extends Block{
         Effects.effect(Fx.breakBlock, tile.drawx(), tile.drawy(), block.size);
         world.removeBlock(tile);
         Events.fire(new BlockBuildEndEvent(tile, team, true));
-        Sounds.breaks.at(tile);
+        Sounds.breaks.at(tile, Mathf.random(0.7f, 1.4f));
     }
 
     @Remote(called = Loc.server)
@@ -75,7 +75,7 @@ public class BuildBlock extends Block{
             Core.app.post(() -> tile.block().playerPlaced(tile));
         }
         Core.app.post(() -> Events.fire(new BlockBuildEndEvent(tile, team, false)));
-        Sounds.place.at(tile);
+        Sounds.place.at(tile, Mathf.random(0.7f, 1.4f));
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
index 7c8d9e51f1..3873f2177d 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
@@ -279,7 +279,7 @@ public abstract class Turret extends Block{
 
         Effects.effect(shootEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
         Effects.effect(smokeEffect, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation);
-        shootSound.at(tile);
+        shootSound.at(tile, Mathf.random(0.9f, 1.1f));
 
         if(shootShake > 0){
             Effects.shake(shootShake, shootShake, tile.entity);