From b1b84fe380f6da2d827d9af4be8792f765420a34 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 11 Nov 2020 18:11:38 -0500 Subject: [PATCH] Minor sound changes --- core/assets/sounds/sap.ogg | Bin 7620 -> 10947 bytes core/src/mindustry/content/Blocks.java | 4 ++-- core/src/mindustry/core/NetClient.java | 1 + .../world/blocks/production/Drill.java | 7 ++++++- .../world/blocks/production/Fracker.java | 3 +++ .../android/en-US/changelogs/29697.txt | 3 +++ .../android/en-US/changelogs/29699.txt | 3 +++ 7 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29697.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29699.txt diff --git a/core/assets/sounds/sap.ogg b/core/assets/sounds/sap.ogg index d84c282d02c00e3374fdee15eca09cc846d32b7c..9e73a8d5161f7fd5fba2ffeee5cb207f355603c4 100644 GIT binary patch delta 9492 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 b|MRz47#3{WwC?vV^GK$KdHa|cco-M}c=@5K delta 6155 zcmX>cdc-=_KRrE|fr$YMc1eE=05M&0Z|ML4CRbq#tufX zPB0rpfOLXnzQ?4j5eWH@0!~g$x0VoLU|?_z3h@jMv2`peO3cYoa4an@$;{ihzLT|H z*^y1MMWCx_f>WMt1c%`>71o88YzvP_v@91e=CR~eDw*J@Zo6ZWX$@qB8*;p7~~!Vt*7&|rAN@Q6gwInR>|T+SJC&Yg0?Qhn*F zRhJ1RKc2JrlIO`KQzX2*<}MLR?p({j(7?c6&(OfYz3{>WQAP(528JY_ATG_;DM9Bn zpG^olW%yJk$jfs1oZxeo9I`E^4B6&33urEt2|lNJT&CrWv@sX>%zX*r<$BKF%1j}JuMu1H6--5m~ZGdRbOFW z-!CDd^}?>9qM?_k`G#)IJ#UhFGbHq`Sm@Plskg=I!l#wqH};Jb3%z>HH*{<1^=Y;7 z*K%WLK+WY}f=KKxeuP$Kl|wR+#{S4%^u)h1p`P2663Un6r?X4aw=t7d7e zTD5Z3w%k?g)-3=wr#8KRy-R;fsbXMg>D?)@kHb?Vzvsr6&x`)vx+&Ls|JvWD z3SaNK^uzLezRb>TxiXvcr1!7=eeAQgeWFF*()3x|a#yWdJA2jY*PHUR53hOc6c}0? zJ2mybd2FP3-hK1F=UKFJdy9s5g4PB;}kZ=h7`8nPNY$=L?qbIe9HzBI50(8+OL?fRwn<(-3#VN3@~Yq18Wfddcx_Hlj_H(3 zQJ$K|CVA!P9*c_h*;*A<44>VK>am=1Damu?(Mdr)y2oZk=j>cIEi1?H*{q=Mt

1=a_!G614_oiTBoP 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 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