diff --git a/core/assets/sounds/drill.ogg b/core/assets/sounds/drill.ogg index ea75df8198..8cd7c92dab 100644 Binary files a/core/assets/sounds/drill.ogg and b/core/assets/sounds/drill.ogg differ diff --git a/core/assets/sounds/padLand.ogg b/core/assets/sounds/padLand.ogg new file mode 100644 index 0000000000..067cdf0732 Binary files /dev/null and b/core/assets/sounds/padLand.ogg differ diff --git a/core/assets/sounds/padLaunch.ogg b/core/assets/sounds/padLaunch.ogg new file mode 100644 index 0000000000..b6ca9d8566 Binary files /dev/null and b/core/assets/sounds/padLaunch.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 79c4874a81..bd7aa6cef1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3828,7 +3828,7 @@ public class Blocks{ damage = 0.2f; layer = Layer.bullet - 2f; }}, - Liquids.slag, new LiquidBulletType(Liquids.slag){{ + Liquids.slag, new LiquidBulletType(Liquids.slag){{ lifetime = 49f; speed = 4f; knockback = 1.3f; diff --git a/core/src/mindustry/world/blocks/campaign/LandingPad.java b/core/src/mindustry/world/blocks/campaign/LandingPad.java index 95803981a6..26bba36342 100644 --- a/core/src/mindustry/world/blocks/campaign/LandingPad.java +++ b/core/src/mindustry/world/blocks/campaign/LandingPad.java @@ -3,6 +3,7 @@ package mindustry.world.blocks.campaign; import arc.*; import arc.Graphics.*; import arc.Graphics.Cursor.*; +import arc.audio.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; @@ -52,6 +53,10 @@ public class LandingPad extends Block{ public float liquidPad = 2f; public Color bottomColor = Pal.darkerMetal; + public float landSoundVolume = 0.75f; + //sound duration must be exactly equal to arrivalDuration + public Sound landSound = Sounds.padLand; + public LandingPad(String name){ super(name); @@ -145,6 +150,7 @@ public class LandingPad extends Block{ arriving = config; arrivingTimer = 0f; liquidRemoved = 0f; + landSound.at(x, y, 1f, landSoundVolume); if(state.isCampaign() && !isFake()){ state.rules.sector.info.importCooldownTimers.put(config, 0f); diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 791c7ef483..c6f58739c7 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -30,7 +30,8 @@ import static mindustry.Vars.*; public class LaunchPad extends Block{ /** Time between launches. */ public float launchTime = 1f; - public Sound launchSound = Sounds.none; + public float launchSoundPitchRand = 0.1f; + public Sound launchSound = Sounds.padLaunch; public @Load("@-light") TextureRegion lightRegion; public @Load(value = "@-pod", fallback = "launchpod") TextureRegion podRegion; @@ -145,7 +146,7 @@ public class LaunchPad extends Block{ if((launchCounter += edelta()) >= launchTime && items.total() >= itemCapacity){ //if there are item requirements, use those. consume(); - launchSound.at(x, y); + launchSound.at(x, y, 1f + Mathf.range(launchSoundPitchRand)); LaunchPayload entity = LaunchPayload.create(); items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount))); entity.set(this); diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 014a5874e1..aa69e11714 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -82,7 +82,7 @@ public class Drill extends Block{ liquidCapacity = 5f; hasItems = true; ambientSound = Sounds.drill; - ambientSoundVolume = 0.018f; + ambientSoundVolume = 0.019f; //drills work in space I guess envEnabled |= Env.space; flags = EnumSet.of(BlockFlag.drill);