diff --git a/core/assets/sounds/artillerySap.ogg b/core/assets/sounds/artillerySap.ogg new file mode 100644 index 0000000000..9fbd1f4868 Binary files /dev/null and b/core/assets/sounds/artillerySap.ogg differ diff --git a/core/assets/sounds/artillerySapBig.ogg b/core/assets/sounds/artillerySapBig.ogg new file mode 100644 index 0000000000..c9c2d8e52f Binary files /dev/null and b/core/assets/sounds/artillerySapBig.ogg differ diff --git a/core/assets/sounds/artilleryShockExplosion.ogg b/core/assets/sounds/artilleryShockExplosion.ogg new file mode 100644 index 0000000000..05eecd4ef9 Binary files /dev/null and b/core/assets/sounds/artilleryShockExplosion.ogg differ diff --git a/core/assets/sounds/artilleryShockExplosionBig.ogg b/core/assets/sounds/artilleryShockExplosionBig.ogg new file mode 100644 index 0000000000..5a7276e541 Binary files /dev/null and b/core/assets/sounds/artilleryShockExplosionBig.ogg differ diff --git a/core/assets/sounds/bigshot.ogg b/core/assets/sounds/bigshot.ogg deleted file mode 100644 index 3218eec651..0000000000 Binary files a/core/assets/sounds/bigshot.ogg and /dev/null differ diff --git a/core/assets/sounds/corexplode.ogg b/core/assets/sounds/corexplode.ogg deleted file mode 100644 index b26ff4a64c..0000000000 Binary files a/core/assets/sounds/corexplode.ogg and /dev/null differ diff --git a/core/assets/sounds/lasercharge2.ogg b/core/assets/sounds/lasercharge2.ogg index 317941fee3..1061fe6284 100644 Binary files a/core/assets/sounds/lasercharge2.ogg and b/core/assets/sounds/lasercharge2.ogg differ diff --git a/core/assets/sounds/sap.ogg b/core/assets/sounds/sap.ogg index 9e73a8d516..702adccd07 100644 Binary files a/core/assets/sounds/sap.ogg and b/core/assets/sounds/sap.ogg differ diff --git a/core/assets/sounds/shootAtrax.ogg b/core/assets/sounds/shootAtrax.ogg new file mode 100644 index 0000000000..303fbd6027 Binary files /dev/null and b/core/assets/sounds/shootAtrax.ogg differ diff --git a/core/assets/sounds/shotgunSap.ogg b/core/assets/sounds/shotgunSap.ogg new file mode 100644 index 0000000000..4601ef6d37 Binary files /dev/null and b/core/assets/sounds/shotgunSap.ogg differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 0d01764af1..865896c14f 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -681,7 +681,7 @@ public class UnitTypes{ ejectEffect = Fx.none; recoil = 1f; x = 7f; - shootSound = Sounds.flame; + shootSound = Sounds.shootAtrax; bullet = new LiquidBulletType(Liquids.slag){{ damage = 13; @@ -830,13 +830,14 @@ public class UnitTypes{ shake = 3f; rotateSpeed = 2f; ejectEffect = Fx.casing1; - shootSound = Sounds.artillery; + shootSound = Sounds.artillerySap; rotate = true; shadow = 8f; recoil = 3f; bullet = new ArtilleryBulletType(2f, 12){{ hitEffect = Fx.sapExplosion; + despawnSound = Sounds.artilleryShockExplosion; knockback = 0.8f; lifetime = 70f; width = height = 19f; @@ -895,7 +896,8 @@ public class UnitTypes{ shake = 4f; rotateSpeed = 2f; ejectEffect = Fx.casing1; - shootSound = Sounds.shootBig; + shootSound = Sounds.shotgunSap; + shootSoundVolume = 0.8f; rotate = true; shadow = 12f; recoil = 3f; @@ -927,13 +929,14 @@ public class UnitTypes{ recoil = 10f; rotateSpeed = 1f; ejectEffect = Fx.casing3; - shootSound = Sounds.artillery; + shootSound = Sounds.artillerySapBig; rotate = true; shadow = 30f; rotationLimit = 80f; bullet = new ArtilleryBulletType(3f, 50){{ + despawnSound = Sounds.artilleryShockExplosionBig; hitEffect = Fx.sapExplosion; knockback = 0.8f; lifetime = 80f; @@ -959,6 +962,7 @@ public class UnitTypes{ fragBullets = 9; fragBullet = new ArtilleryBulletType(2.3f, 30){{ + despawnSound = Sounds.artilleryShockExplosion; hitEffect = Fx.sapExplosion; knockback = 0.8f; lifetime = 90f;