From ffca824474f2ae9702de9c6a77030fc560849e9f Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Mon, 16 Nov 2020 16:11:36 -0800 Subject: [PATCH 1/2] Begin reloading continuous weapons after the bullet finishes. --- core/src/mindustry/content/UnitTypes.java | 2 +- core/src/mindustry/entities/comp/WeaponsComp.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index aee7938ac3..437cdc60d9 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -431,7 +431,7 @@ public class UnitTypes implements ContentList{ firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f; - reload = 320f; + reload = 160f; recoil = 0f; chargeSound = Sounds.lasercharge2; shootSound = Sounds.beam; diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java index ab4321393a..0946b9fc2b 100644 --- a/core/src/mindustry/entities/comp/WeaponsComp.java +++ b/core/src/mindustry/entities/comp/WeaponsComp.java @@ -117,6 +117,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{ }else{ mount.bullet.rotation(weaponRotation + 90); mount.bullet.set(shootX, shootY); + mount.reload = weapon.reload; vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil)); if(weapon.shootSound != Sounds.none && !headless){ if(mount.sound == null) mount.sound = new SoundLoop(weapon.shootSound, 1f); From c72a9166a61ff74cb473d2f60fc628f59e52ccbb Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Mon, 16 Nov 2020 16:22:38 -0800 Subject: [PATCH 2/2] ;) --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index 4d8c2faf6b..39c29ff93a 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -96,6 +96,7 @@ YellOw139 PetrGasparik LeoDog896 Summet +MEEP of Faith jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org)