diff --git a/core/assets/sounds/bombDrop.ogg b/core/assets/sounds/bombDrop.ogg index a724d6a74a..12aa90be82 100644 Binary files a/core/assets/sounds/bombDrop.ogg and b/core/assets/sounds/bombDrop.ogg differ diff --git a/core/assets/sounds/explosionPlasmaSmall.ogg b/core/assets/sounds/explosionPlasmaSmall.ogg index 85704dfd3c..b054d207de 100644 Binary files a/core/assets/sounds/explosionPlasmaSmall.ogg and b/core/assets/sounds/explosionPlasmaSmall.ogg differ diff --git a/core/assets/sounds/lasercharge2.ogg b/core/assets/sounds/lasercharge2.ogg index 1061fe6284..3ac0be51c8 100644 Binary files a/core/assets/sounds/lasercharge2.ogg and b/core/assets/sounds/lasercharge2.ogg differ diff --git a/core/assets/sounds/mechStep.ogg b/core/assets/sounds/mechStep.ogg index 3de7284a46..f9e6f2e9fe 100644 Binary files a/core/assets/sounds/mechStep.ogg and b/core/assets/sounds/mechStep.ogg differ diff --git a/core/assets/sounds/mechStepHeavy.ogg b/core/assets/sounds/mechStepHeavy.ogg new file mode 100644 index 0000000000..119028de7e Binary files /dev/null and b/core/assets/sounds/mechStepHeavy.ogg differ diff --git a/core/assets/sounds/missilePlasmaShort.ogg b/core/assets/sounds/missilePlasmaShort.ogg index 280b5000e3..e127697f34 100644 Binary files a/core/assets/sounds/missilePlasmaShort.ogg and b/core/assets/sounds/missilePlasmaShort.ogg differ diff --git a/core/assets/sounds/plasmaboom.ogg b/core/assets/sounds/plasmaboom.ogg index fab2f3471d..6b5a30e5ec 100644 Binary files a/core/assets/sounds/plasmaboom.ogg and b/core/assets/sounds/plasmaboom.ogg differ diff --git a/core/assets/sounds/plasmadrop.ogg b/core/assets/sounds/plasmadrop.ogg index 57bd0b8e27..0a70ec6f7d 100644 Binary files a/core/assets/sounds/plasmadrop.ogg and b/core/assets/sounds/plasmadrop.ogg differ diff --git a/core/assets/sounds/shootNavanax.ogg b/core/assets/sounds/shootNavanax.ogg index f76458f073..d3066b9b60 100644 Binary files a/core/assets/sounds/shootNavanax.ogg and b/core/assets/sounds/shootNavanax.ogg differ diff --git a/core/assets/sounds/shootScepter.ogg b/core/assets/sounds/shootScepter.ogg index 3a0690b6ad..fd2c6b965d 100644 Binary files a/core/assets/sounds/shootScepter.ogg and b/core/assets/sounds/shootScepter.ogg differ diff --git a/core/assets/sounds/torpedoPlasma.ogg b/core/assets/sounds/torpedoPlasma.ogg new file mode 100644 index 0000000000..146c512908 Binary files /dev/null and b/core/assets/sounds/torpedoPlasma.ogg differ diff --git a/core/src/mindustry/audio/SoundPriority.java b/core/src/mindustry/audio/SoundPriority.java index 0c85722278..7a1fa1dcfb 100644 --- a/core/src/mindustry/audio/SoundPriority.java +++ b/core/src/mindustry/audio/SoundPriority.java @@ -48,10 +48,6 @@ public class SoundPriority{ laser.setMaxConcurrent(5); sameGroup(flame, flamePlasma); - - //sameGroup(hit1, hit2, hit3); - //max(4, hit1, hit2, hit3); - sameGroup(missile, missileShort, missilePlasmaShort); sameGroup(spark, shock); @@ -61,9 +57,9 @@ public class SoundPriority{ mechStep.setMinConcurrentInterrupt(0.5f); walkerStep.setMinConcurrentInterrupt(0.6f); + mechStepHeavy.setMinConcurrentInterrupt(0.6f); - mechStep.setMaxConcurrent(4); - walkerStep.setMaxConcurrent(4); + max(4, mechStep, mechStepHeavy, walkerStep); } static void max(int max, Sound... sounds){ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index bd1bb9b715..e6ba7d46e9 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -198,7 +198,8 @@ public class UnitTypes{ singleTarget = true; drownTimeMultiplier = 1.5f; stepSound = Sounds.mechStep; - stepSoundVolume = 0.25f; + stepSoundPitch = 0.9f; + stepSoundVolume = 0.35f; abilities.add(new ShieldRegenFieldAbility(25f, 250f, 60f * 1, 60f)); @@ -219,6 +220,7 @@ public class UnitTypes{ shake = 2f; ejectEffect = Fx.casing3; shootSound = Sounds.shootScepter; + shootSoundVolume = 0.95f; inaccuracy = 3f; shoot.shots = 3; @@ -271,7 +273,9 @@ public class UnitTypes{ mechFrontSway = 1.9f; mechSideSway = 0.6f; ammoType = new ItemAmmoType(Items.thorium); - stepSound = Sounds.mechStep; + stepSound = Sounds.mechStepHeavy; + stepSoundPitch = 0.9f; + stepSoundVolume = 0.45f; weapons.add( new Weapon("reign-weapon"){{ @@ -483,6 +487,7 @@ public class UnitTypes{ singleTarget = true; stepSound = Sounds.mechStep; + stepSoundPitch = 0.9f; stepSoundVolume = 0.25f; weapons.add(new Weapon("vela-weapon"){{ @@ -1918,7 +1923,7 @@ public class UnitTypes{ rotate = true; reload = 90f; x = y = shootX = shootY = 0f; - shootSound = Sounds.missilePlasmaShort; + shootSound = Sounds.torpedoPlasma; rotateSpeed = 180f; shootSoundVolume = 0.9f; diff --git a/core/src/mindustry/world/blocks/defense/BuildTurret.java b/core/src/mindustry/world/blocks/defense/BuildTurret.java index a6468c5433..58bd7912f1 100644 --- a/core/src/mindustry/world/blocks/defense/BuildTurret.java +++ b/core/src/mindustry/world/blocks/defense/BuildTurret.java @@ -220,7 +220,6 @@ public class BuildTurret extends BaseTurret{ @Override public void draw(){ - super.draw(); Draw.rect(baseRegion, x, y); Draw.color();