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

Crash fix

Browse Source
This commit is contained in:
Anuken
2022-02-11 12:19:15 -05:00
parent 4a216056d0
commit 7ba42cb26e
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -86,7 +86,7 @@ public class Turret extends ReloadTurret{
/** Ticks between shots if shots > 1. */
public float burstSpacing = 0;
/** An inflexible and terrible idea. */
public boolean alternate = false;
public boolean alternate = false, widthSpread = false;
/** If true, this turret will accurately target moving targets with respect to charge time. */
public boolean accurateDelay = false;
@@ -544,21 +544,25 @@ public class Turret extends ReloadTurret{
}else{
//otherwise, use the normal shot pattern(s)
if(alternate){
float i = (shotCounter % shots) - (shots-1)/2f;
if(alternate || widthSpread){
int count = !widthSpread ? 1 : shots;
bulletOffset.trns(rotation - 90, (spread) * i + Mathf.range(xRand), shootLength);
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy));
for(int c = 0; c < count; c++){
float i = (shotCounter % shots) - (shots-1)/2f;
bulletOffset.trns(rotation - 90, (spread) * i + Mathf.range(xRand), shootLength);
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy));
shotCounter ++;
}
}else{
bulletOffset.trns(rotation, shootLength, Mathf.range(xRand));
for(int i = 0; i < shots; i++){
bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (i - (int)(shots / 2f)) * spread);
shotCounter ++;
}
}
shotCounter++;
recoil = recoilAmount;
heat = 1f;
effects();