Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-10-12 18:25:43 -04:00
6 changed files with 296 additions and 284 deletions

View File

@@ -418,7 +418,7 @@ public class Turret extends ReloadTurret{
tr.trns(rotation, shootLength);
recoil = recoilAmount;
heat = 1f;
bullet(type, rotation + Mathf.range(inaccuracy));
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy));
effects();
charging = false;
});
@@ -448,7 +448,7 @@ public class Turret extends ReloadTurret{
float i = (shotCounter % shots) - (shots-1)/2f;
tr.trns(rotation - 90, spread * i + Mathf.range(xRand), shootLength);
bullet(type, rotation + Mathf.range(inaccuracy));
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy));
}else{
tr.trns(rotation, shootLength, Mathf.range(xRand));