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

Disperse turret mostly done

Browse Source
This commit is contained in:
Anuken
2022-02-11 20:08:59 -05:00
parent 64cb5c5879
commit e8c277d7b8
26 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
View File

@@ -109,7 +109,7 @@ public class ContinuousTurret extends Turret{
return;
}
if(cons.canConsume() && !charging){
if(cons.canConsume() && !charging && shootWarmup >= minWarmup){
shoot(peekAmmo());
}
}

2
core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
View File

@@ -95,7 +95,7 @@ public class LaserTurret extends PowerTurret{
return;
}
if(reload <= 0 && (consValid() || cheating()) && !charging){
if(reload <= 0 && (consValid() || cheating()) && !charging && shootWarmup >= minWarmup){
BulletType type = peekAmmo();
shoot(type);

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

@@ -49,6 +49,7 @@ public class Turret extends ReloadTurret{
//visuals
public float ammoEjectBack = 1f;
public float shootWarmupSpeed = 0.1f;
public boolean linearWarmup = false;
public float recoilAmount = 1f;
public float restitution = 0.02f;
public float cooldown = 0.02f;
@@ -83,6 +84,8 @@ public class Turret extends ReloadTurret{
public float xRand = 0f;
/** Currently used for artillery only. */
public float minRange = 0f;
/** Minimum warmup needed to fire. */
public float minWarmup = 0f;
/** Ticks between shots if shots > 1. */
public float burstSpacing = 0;
/** An inflexible and terrible idea. */
@@ -334,8 +337,12 @@ public class Turret extends ReloadTurret{
public void updateTile(){
if(!validateTarget()) target = null;
//TODO make it approach instead and add interp curves to parts
shootWarmup = Mathf.lerpDelta(shootWarmup, isShooting() && cons.canConsume() ? 1f : 0f, shootWarmupSpeed);
float warmupTarget = isShooting() && cons.canConsume() ? 1f : 0f;
if(linearWarmup){
shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed);
}else{
shootWarmup = Mathf.lerpDelta(shootWarmup, warmupTarget, shootWarmupSpeed);
}
wasShooting = false;
@@ -486,7 +493,7 @@ public class Turret extends ReloadTurret{
protected void updateShooting(){
if(reload >= reloadTime && !charging){
if(reload >= reloadTime && !charging && shootWarmup >= minWarmup){
BulletType type = peekAmmo();
shoot(type);