diff --git a/core/assets/sounds/dullExplosion.ogg b/core/assets/sounds/dullExplosion.ogg index 37eb43c3a3..b3d8b41686 100644 Binary files a/core/assets/sounds/dullExplosion.ogg and b/core/assets/sounds/dullExplosion.ogg differ diff --git a/core/assets/sounds/shootDagger.ogg b/core/assets/sounds/shootDagger.ogg new file mode 100644 index 0000000000..475dfa824c Binary files /dev/null and b/core/assets/sounds/shootDagger.ogg differ diff --git a/core/assets/sounds/shootDuo.ogg b/core/assets/sounds/shootDuo.ogg index a391bce358..16af816ee7 100644 Binary files a/core/assets/sounds/shootDuo.ogg and b/core/assets/sounds/shootDuo.ogg differ diff --git a/core/assets/sounds/shootFast.ogg b/core/assets/sounds/shootFast.ogg deleted file mode 100644 index 3e6becc775..0000000000 Binary files a/core/assets/sounds/shootFast.ogg and /dev/null differ diff --git a/core/assets/sounds/shootSalvo.ogg b/core/assets/sounds/shootSalvo.ogg new file mode 100644 index 0000000000..2c194cefff Binary files /dev/null and b/core/assets/sounds/shootSalvo.ogg differ diff --git a/core/assets/sounds/shootStell.ogg b/core/assets/sounds/shootStell.ogg new file mode 100644 index 0000000000..328d4d9449 Binary files /dev/null and b/core/assets/sounds/shootStell.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index bd7aa6cef1..19f5c734ff 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3793,7 +3793,7 @@ public class Blocks{ ammoUseEffect = Fx.casing2; scaledHealth = 240; - shootSound = Sounds.shootFast; + shootSound = Sounds.shootSalvo; limitRange(); coolant = consumeCoolant(0.2f); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 0bb01ab6f4..f3897535cf 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -103,6 +103,7 @@ public class UnitTypes{ hitSize = 8f; health = 150; weapons.add(new Weapon("large-weapon"){{ + shootSound = Sounds.shootDagger; reload = 13f; x = 4f; y = 2f; @@ -2537,6 +2538,7 @@ public class UnitTypes{ researchCostMultiplier = 0f; weapons.add(new Weapon("stell-weapon"){{ + shootSound = Sounds.shootStell; layerOffset = 0.0001f; reload = 50f; shootY = 4.5f; @@ -2801,6 +2803,7 @@ public class UnitTypes{ recoil = 2f; rotate = true; rotateSpeed = 2f; + shootSound = Sounds.shootStell; bullet = new BasicBulletType(4.5f, 25){{ width = 6.5f; diff --git a/core/src/mindustry/world/blocks/campaign/LandingPad.java b/core/src/mindustry/world/blocks/campaign/LandingPad.java index 26bba36342..73135581fa 100644 --- a/core/src/mindustry/world/blocks/campaign/LandingPad.java +++ b/core/src/mindustry/world/blocks/campaign/LandingPad.java @@ -54,7 +54,7 @@ public class LandingPad extends Block{ public Color bottomColor = Pal.darkerMetal; public float landSoundVolume = 0.75f; - //sound duration must be exactly equal to arrivalDuration + //impact timing must be exactly equal to arrivalDuration public Sound landSound = Sounds.padLand; public LandingPad(String name){