diff --git a/core/assets/sounds/sap.ogg b/core/assets/sounds/sap.ogg index d84c282d02..9e73a8d516 100644 Binary files a/core/assets/sounds/sap.ogg and b/core/assets/sounds/sap.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2c86834608..30ed08a97f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -728,7 +728,7 @@ public class Blocks implements ContentList{ hasItems = hasPower = true; drawer = new DrawRotator(); ambientSound = Sounds.grinding; - ambientSoundVolume = 0.02f; + ambientSoundVolume = 0.025f; consumes.item(Items.scrap, 1); consumes.power(0.50f); @@ -1229,7 +1229,7 @@ public class Blocks implements ContentList{ thoriumReactor = new NuclearReactor("thorium-reactor"){{ requirements(Category.power, with(Items.lead, 300, Items.silicon, 200, Items.graphite, 150, Items.thorium, 150, Items.metaglass, 50)); ambientSound = Sounds.hum; - ambientSoundVolume = 0.2f; + ambientSoundVolume = 0.24f; size = 3; health = 700; itemDuration = 360f; diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 055b6c71b5..cc572fdfd3 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -365,6 +365,7 @@ public class NetClient implements ApplicationListener{ @Remote(variants = Variant.one) public static void setPosition(float x, float y){ + player.unit().set(x, y); player.set(x, y); } diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index eb4bb4588e..cc0c14b278 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -67,7 +67,7 @@ public class Drill extends Block{ liquidCapacity = 5f; hasItems = true; ambientSound = Sounds.drill; - ambientSoundVolume = 0.015f; + ambientSoundVolume = 0.018f; } @Override @@ -209,6 +209,11 @@ public class Drill extends Block{ return efficiency() > 0.01f && items.total() < itemCapacity; } + @Override + public float ambientVolume(){ + return efficiency() * (size * size) / 4f; + } + @Override public void drawSelect(){ if(dominantItem != null){ diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java index d2dbd5bf69..0ce66cd54c 100644 --- a/core/src/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -2,6 +2,7 @@ package mindustry.world.blocks.production; import arc.graphics.g2d.*; import mindustry.annotations.Annotations.*; +import mindustry.gen.*; import mindustry.graphics.*; import mindustry.world.meta.*; @@ -15,6 +16,8 @@ public class Fracker extends SolidPump{ public Fracker(String name){ super(name); hasItems = true; + ambientSound = Sounds.drill; + ambientSoundVolume = 0.03f; } @Override diff --git a/fastlane/metadata/android/en-US/changelogs/29697.txt b/fastlane/metadata/android/en-US/changelogs/29697.txt new file mode 100644 index 0000000000..d187e2042e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29697.txt @@ -0,0 +1,3 @@ +- Fixed server weather-related crash +- Fixed music not loading on certain systems +- Added sounds for quad unit diff --git a/fastlane/metadata/android/en-US/changelogs/29699.txt b/fastlane/metadata/android/en-US/changelogs/29699.txt new file mode 100644 index 0000000000..d187e2042e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29699.txt @@ -0,0 +1,3 @@ +- Fixed server weather-related crash +- Fixed music not loading on certain systems +- Added sounds for quad unit