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

Fixed turrets with moveWhileCharging = true and accurateDelay = true

Browse Source
This commit is contained in:
Anuken
2023-05-24 16:49:09 -04:00
parent e9fe52d578
commit 5c45df1a69
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,8 @@ public class Turret extends ReloadTurret{
public boolean targetUnderBlocks = true; public boolean targetUnderBlocks = true;
/** If true, the turret will always shoot when it has ammo, regardless of targets in range or any control. */ /** If true, the turret will always shoot when it has ammo, regardless of targets in range or any control. */
public boolean alwaysShooting = false; public boolean alwaysShooting = false;
/** Whether this turret predicts unit movement. */
public boolean predictTarget = true;
/** Function for choosing which unit to target. */ /** Function for choosing which unit to target. */
public Sortf unitSort = UnitSorts.closest; public Sortf unitSort = UnitSorts.closest;
/** Filter for types of units to attack. */ /** Filter for types of units to attack. */
@@ -332,11 +334,15 @@ public class Turret extends ReloadTurret{
var offset = Tmp.v1.setZero(); var offset = Tmp.v1.setZero();
//when delay is accurate, assume unit has moved by chargeTime already //when delay is accurate, assume unit has moved by chargeTime already
if(accurateDelay && pos instanceof Hitboxc h){ if(accurateDelay && !moveWhileCharging && pos instanceof Hitboxc h){
offset.set(h.deltaX(), h.deltaY()).scl(shoot.firstShotDelay / Time.delta); offset.set(h.deltaX(), h.deltaY()).scl(shoot.firstShotDelay / Time.delta);
} }
targetPos.set(Predict.intercept(this, pos, offset.x, offset.y, bullet.speed <= 0.01f ? 99999999f : bullet.speed)); if(predictTarget){
targetPos.set(Predict.intercept(this, pos, offset.x, offset.y, bullet.speed <= 0.01f ? 99999999f : bullet.speed));
}else{
targetPos.set(pos);
}
if(targetPos.isZero()){ if(targetPos.isZero()){
targetPos.set(pos); targetPos.set(pos);