WIP descriptions

This commit is contained in:
Anuken
2022-08-29 12:08:12 -04:00
parent cef63bae3a
commit d7f4b15d3d
5 changed files with 127 additions and 9 deletions
@@ -66,6 +66,8 @@ public class Turret extends ReloadTurret{
public boolean accurateDelay = true;
/** If false, this turret can't move while charging. */
public boolean moveWhileCharging = true;
/** How long warmup is maintained even if this turret isn't shooting. */
public float warmupMaintainTime = 0f;
/** pattern used for bullets */
public ShootPattern shoot = new ShootPattern();
@@ -206,7 +208,7 @@ public class Turret extends ReloadTurret{
public Seq<AmmoEntry> ammo = new Seq<>();
public int totalAmmo;
public float curRecoil, heat, logicControlTime = -1;
public float shootWarmup, charge;
public float shootWarmup, charge, warmupHold = 0f;
public int totalShots;
public boolean logicShooting = false;
public @Nullable Posc target;
@@ -344,6 +346,14 @@ public class Turret extends ReloadTurret{
if(!validateTarget()) target = null;
float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
if(warmupTarget > 0){
warmupHold = 1f;
}
if(warmupHold > 0f){
warmupHold -= Time.delta / warmupMaintainTime;
warmupTarget = 1f;
}
if(linearWarmup){
shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f));
}else{
@@ -38,8 +38,8 @@ public class VariableReactor extends PowerGenerator{
rebuildable = false;
explosionRadius = 12;
explosionDamage = 1000;
explosionRadius = 16;
explosionDamage = 1500;
explodeEffect = new MultiEffect(Fx.bigShockwave, new WrapEffect(Fx.titanSmoke, Color.valueOf("e3ae6f")));
explodeSound = Sounds.explosionbig;