From 135c780f35255fd67111157283bc56a4c935c99a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 14 Nov 2020 19:06:21 -0500 Subject: [PATCH] Fixed #3400 --- core/assets/sounds/noammo.ogg | Bin 0 -> 4690 bytes core/src/mindustry/content/UnitTypes.java | 9 +++++++-- core/src/mindustry/core/Control.java | 5 +++++ core/src/mindustry/type/Weapon.java | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 core/assets/sounds/noammo.ogg diff --git a/core/assets/sounds/noammo.ogg b/core/assets/sounds/noammo.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4472dab237a8b928661db0e88e8a3b71a81e017d GIT binary patch literal 4690 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

1=a_!G614_ohxgWNQN{f`zlJd|9B5!> zaA@F6T>vUVK-t!@Bj}uGra;jdOD#^PGnVQri+r3kHABxha;R=SXQ`=q^qM7y>QXUp zE#0GG*_xVL#j|TLrv4RhKd`FmTB*Ffip@m=Yng09KA9@FejV zwkec^7-~I+3OUSUQ1eIdi_dN&(>$Nvb}VVMP;Ae$-r=jm7QS&v$U(3x&)_|Neb8#4GK#{ zl6wr>M3TA;pU-jT&^$V$_?+f42~g`~N>UG~{n29xZo?j%0TPn|5p#AOq$tK&Ji>oqHmrCY9mth(Xop}F*0RJZQ2 z057k#TW=)wn6?E4WvxAWBWaD{l1o83y2m7v*DRcJEh^jam_)X&=GJRTJzI}OWqYpN zdM&Bj^jZ`*!-Kp6h6axfg>6%pY(8}H0XVJ|85vldz@ZK57zA}0K3@PzEs8E)hRV$-FfHCxNhFfuSGa4;AMC>l39Fp5Z= zU}#`&VbNq*u;IW3!x$EpCqhPCJY2_HiZ5j{GYGVt;F;JF!6PKRs&P@06+=W!!U^^U zp5ERq-P|vX4zR}FDOG4uU{UNi$|y3Sp;1g`uQgaOcb0XG+B5GxCiurv4NkVL4~!Wqa&?v@!`kJDlRE4OO8BYQ3Xqb2o4TV z4;9p_VqoCl0QZntZbO6^Ks{uTHTR|-wdK??GBq$VJa$-_hwmzr%8CvDsu`Z1xz`hJ z`F52oztruDbN=Vbk}l=fd%uv;`roWLQEEq&A)^e_#k~1O%`P_Bq5+w{G0< zxF+uDKKt9%Bvqkll%EOFJnULg}8-Z@iSO)u1%d^D))4f6#ER7_u+>Z zv_I^=Zh3%3hw;|7l5L`Acp9YtSN;5d@tjDq)K1rDeijqX#@w~5`%rMn$JcMt=E;VB zRV`5`fBCN#>tSdxxUWB5?pI9q*({%V9#?WwUgYGzigI#qPGxA^R^MTj%B8jl67b<%GB!Z!*tb^!_=4g*o+JeGFp> z6RUyb@l_JGX>0)+Ha=P`T2_-K z^e)*;A1dEXIHuA3e!Jeiq>>5C(@sp>NLFJ@4Y# zuAcTTjsL1A^c{4wo08rX`(59m|4H;k`gB3o&kh@>+NK(XwA`3Ci&uA>yhL2kj0qpB z=iHus|KwxoRh4|#m(IWb;(=t=l%A^7*G%%1=B#44m-^?sPW&teK7({nT4rGIImf>I TX4#iRU$Qp!bWdNu-kbpdK|P6_ literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 4a0949a17a..aee7938ac3 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1247,7 +1247,7 @@ public class UnitTypes implements ContentList{ mineTier = 3; health = 500; armor = 5f; - speed = 2.4f; + speed = 2.5f; accel = 0.06f; drag = 0.017f; lowAltitude = true; @@ -1257,7 +1257,7 @@ public class UnitTypes implements ContentList{ hitSize = 15f; engineSize = 3f; payloadCapacity = (2 * 2) * tilePayload; - buildSpeed = 2.5f; + buildSpeed = 2.6f; ammoType = AmmoTypes.power; @@ -1405,6 +1405,7 @@ public class UnitTypes implements ContentList{ y = -5f; rotate = true; ejectEffect = Fx.casing1; + shootSound = Sounds.missile; bullet = new MissileBulletType(2.7f, 12, "missile"){{ width = 8f; height = 8f; @@ -1451,6 +1452,7 @@ public class UnitTypes implements ContentList{ rotateSpeed = 5f; inaccuracy = 10f; ejectEffect = Fx.casing1; + shootSound = Sounds.shoot; bullet = Bullets.flakLead; }}); @@ -1463,6 +1465,7 @@ public class UnitTypes implements ContentList{ rotateSpeed = 2f; shake = 1.5f; ejectEffect = Fx.casing2; + shootSound = Sounds.bang; bullet = Bullets.artilleryIncendiary; }}); }}; @@ -1499,6 +1502,7 @@ public class UnitTypes implements ContentList{ shots = 1; inaccuracy = 3f; ejectEffect = Fx.casing3; + shootSound = Sounds.artillery; bullet = new ArtilleryBulletType(3.2f, 12){{ trailMult = 0.8f; @@ -1537,6 +1541,7 @@ public class UnitTypes implements ContentList{ shotDelay = 3f; inaccuracy = 5f; velocityRnd = 0.1f; + shootSound = Sounds.missile; ejectEffect = Fx.none; bullet = new MissileBulletType(2.7f, 12){{ diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index f0aeed065e..8d43863be2 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -280,6 +280,11 @@ public class Control implements ApplicationListener, Loadable{ public void playSector(@Nullable Sector origin, Sector sector){ ui.loadAnd(() -> { + if(saves.getCurrent() != null && state.isGame()){ + control.saves.getCurrent().save(); + control.saves.resetSave(); + } + ui.planet.hide(); SaveSlot slot = sector.save; sector.planet.setLastSector(sector); diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 6d7434e51b..348e70b7b2 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -75,7 +75,7 @@ public class Weapon{ /** sound used for weapons that have a delay */ public Sound chargeSound = Sounds.none; /** sound played when there is nothing to shoot */ - public Sound noAmmoSound = Sounds.click; + public Sound noAmmoSound = Sounds.noammo; /** displayed region (autoloaded) */ public TextureRegion region; /** heat region, must be same size as region (optional) */