Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-10-06 13:09:53 -04:00
parent 3f53315a07 6e3de78026
commit 60a430025a
5 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/type/Weapon.java
View File

@@ -200,7 +200,7 @@ public class Weapon implements Cloneable{
boolean can = unit.canShoot();
float lastReload = mount.reload;
mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0);
mount.recoil = Math.max(mount.recoil - (Time.delta * recoil * unit.reloadMultiplier) / recoilTime, 0);
mount.recoil = Mathf.approachDelta(mount.recoil, 0, (recoil * unit.reloadMultiplier) / recoilTime);
//rotate if applicable
if(rotate && (mount.rotate || mount.shoot) && can){