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 literal 10947 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 a27?+056iN$(&JiTeH?gN0}en80RIcx2iKSY delta 6155 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

Jdw=owjJS#&8ZzA?ueENYd^znZKEATTarf8u z*Pc&9Yi~$oSFv?+fto+LHI*%CP);qo_4;JP<)ramuWskt9=z+n^lK-?=Us7Evykkh z#oynD0%|f1$(b4-bqH7dIe^aTu?L%*o+M_`_Q)x$vRQ^v)Rrg244JgmnM*;ib0-X4 zhy5ex|64~vVU8|Jl5J!M?;TZb`;y)~@G#+?>StBDSsr<##&3Q))~ri$ODs}tDurwOjhRnH=X&_PYTUGi_=k*~wN-1CZQjJn8)oxo}P~BgwnSBy) z($3*>&{FyOwX)THUH`qxx5+3RoSYR*uGv@?&2fBri!oLyJXFALW&UeM(=~g=_>0d*!IP>5d`dLqMOXEiInG_lyw(C`YCJa>b zown2L{*?!S#=F(NFQf1~G_2Rs?5CwnrX>0e|2%6fs}A7KTreQNEo=1NK8lO0n3qyr zdr{Wj?yu&gP+V=Y_f>^U(un5jGGBsUk8KW5wJ#;HGbu9h@Z%k(lb(3&-YEhNc zT=$*&+uDoHCClfHKhe{Ov!;7*WsXn2W=MD7J9pyt0w3)tD%&>?ztAQ2C};hw)+o{3 z=m=8W9PHwrElf$!qP5obd^y>z-)Ga2O?fPNTje3${?JO1+ihC9>rm()3QLpX#;u8v~L|7PTcSZD00x(#>^KH57Qo%5#&GLWH_qXcJ)Nvn1$ zBI;ZN`}o8u1v;K<>?|Zm;zLg)V-D-x?0{CsZ`;ye^|H^OOt?gr!&tUj!>V*|luO2H zvFII8Ht(~V{n-#Y8T^h@4Qb8py_0$Y6)`q&@`6#yM@0Cis|c4W;WC`x>Q=t#7CI`o}Y|PsY=&#t@UG*`ALj zU&}PmruXbh3m{$a`ghwO)UE|TS`|*5&ewe$6f_pu3w>2xp2I`-_{`@UNrGk}Mi^=E!zK3m&R)Nw)o$)@!`Os8y0 zcv?-%yc2l_njpbPKf@YXECFNIN0(=Jp-Qp6CcNg@l9+R}K^teD09mqtpjNo7|#zSlgj#rDQ5 zS2yB5bGG=NH1Ingu>&M$pD}m6+qJ<8WV|l%a}RZ1W`}lS1T@z8xEO%3(zkMBgV9K! z;!=SiOZpoA^}N~r)&u)qtCZ(gQhdZ5mFUWCbPuix;~hqee6&9DrHN-JJ~0=)5%P=M zLPs0-Wtn_yZ&DM@OU%50J1acH?IzWx9$)#(V zr*Cd36yx2BFV~*2(E-$!F1@MveBwKUwm zHY-Q|vXifd4_^1#th&fxa?Ufx>LqKWtx9hL#fQPB!5A&P`g>NjDe!%d@?F0GRmGVD zg$LJ$?*z#tpOtOv`Yz}*L(^k-%ZB@t$XTZ4MB)Ry*R=yLiL0^ICxt}}lLeQ(zgr@X zDCg^TXIHOP_$-iW$hs9qAwyXGy&&UufjmzkmNSS zQB?`68+c;aG;?c|FY{ZG_W6%-!-*U^R?RieUyPoJpF?#HTFI~XlsG9!3qIYIxySaQ zeC)i*AFp5&EzejM3^}bsu>faU={ZFXC%TOz^da-2pS0BnmbP)g99wGdng+2V{I- z&1>V*>CZ*OyGRn#?2C+@D-=)3L$EpzC P0?&hQItYqE0%-mR)pHQg 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