diff --git a/core/assets/sounds/fuse.ogg b/core/assets/sounds/fuse.ogg deleted file mode 100644 index bb6ffca750..0000000000 Binary files a/core/assets/sounds/fuse.ogg and /dev/null differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e3989ae9b8..79c4874a81 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3892,7 +3892,8 @@ public class Blocks{ envEnabled |= Env.space; scaledHealth = 220; - shootSound = Sounds.fuse; + shootSound = Sounds.shotgun; + shootSoundVolume = 0.9f; coolant = consumeCoolant(0.3f); float brange = range + 10f; @@ -4005,7 +4006,7 @@ public class Blocks{ collidesTiles = false; splashDamageRadius = 40f * 0.75f; splashDamage = 90f; - fragBullet = new BasicBulletType(2.5f, 10, "bullet"){{ + fragBullet = new BasicBulletType(2.5f, 14, "bullet"){{ width = 10f; height = 12f; shrinkY = 1f; @@ -4015,7 +4016,7 @@ public class Blocks{ despawnEffect = Fx.none; collidesAir = false; }}; - fragBullets = 10; + fragBullets = 15; backColor = Pal.plastaniumBack; frontColor = Pal.plastaniumFront; lifeScaleRandMax = 1.08f; @@ -4041,7 +4042,7 @@ public class Blocks{ coolant = consumeCoolant(0.3f); scaledHealth = 130; - shootSound = Sounds.artillery; + shootSound = Sounds.shootRipple; }}; cyclone = new ItemTurret("cyclone"){{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java index 97aedf43b5..2fdc39f416 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java @@ -27,7 +27,7 @@ public class PointDefenseTurret extends ReloadTurret{ public Effect hitEffect = Fx.pointHit; public Effect shootEffect = Fx.sparkShoot; - public Sound shootSound = Sounds.lasershoot; + public Sound shootSound = Sounds.shootSegment; public float shootCone = 5f; public float bulletDamage = 10f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 105be42df5..d3c0542076 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -119,6 +119,8 @@ public class Turret extends ReloadTurret{ public Effect ammoUseEffect = Fx.none; /** Sound emitted when a single bullet is shot. */ public Sound shootSound = Sounds.shoot; + /** Volume of shooting sound. */ + public float shootSoundVolume = 1f; /** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */ public Sound chargeSound = Sounds.none; /** The sound that this block makes while active. One sound loop. Do not overuse. */ @@ -735,7 +737,7 @@ public class Turret extends ReloadTurret{ (shootEffect == null ? type.shootEffect : shootEffect).at(bulletX, bulletY, rotation + angleOffset, type.hitColor); (smokeEffect == null ? type.smokeEffect : smokeEffect).at(bulletX, bulletY, rotation + angleOffset, type.hitColor); - shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax)); + shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax), shootSoundVolume); ammoUseEffect.at( x - Angles.trnsx(rotation, ammoEjectBack), diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index 694acd3b40..4b1f038ec6 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -66,7 +66,7 @@ public class NuclearReactor extends PowerGenerator{ explosionDamage = 1250 * 4; explodeEffect = Fx.reactorExplosion; - explodeSound = Sounds.explosionbig; + explodeSound = Sounds.reactorExplosion; } @Override