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

Stay warmed up while charging (#7410)

Browse Source 
* Stay warmed up while charging

* Same with unit weapons

also add lenearWarmup
This commit is contained in:
MEEPofFaith
2022-08-21 14:11:13 -07:00
committed by GitHub
parent 1c3538321b
commit 9811aa03ec
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/type/Weapon.java
View File

@@ -93,6 +93,8 @@ public class Weapon implements Cloneable{
public float minWarmup = 0f; public float minWarmup = 0f;
/** lerp speed for shoot warmup, only used for parts */ /** lerp speed for shoot warmup, only used for parts */
public float shootWarmupSpeed = 0.1f, smoothReloadSpeed = 0.15f; public float shootWarmupSpeed = 0.1f, smoothReloadSpeed = 0.15f;
/** If true, shoot warmup is linear instead of a curve. */
public boolean linearWarmup = false;
/** random sound pitch range */ /** random sound pitch range */
public float soundPitchMin = 0.8f, soundPitchMax = 1f; public float soundPitchMin = 0.8f, soundPitchMax = 1f;
/** whether shooter rotation is ignored when shooting. */ /** whether shooter rotation is ignored when shooting. */
@@ -253,9 +255,15 @@ public class Weapon implements Cloneable{
float lastReload = mount.reload; float lastReload = mount.reload;
mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0); mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0);
mount.recoil = Mathf.approachDelta(mount.recoil, 0, unit.reloadMultiplier / recoilTime); mount.recoil = Mathf.approachDelta(mount.recoil, 0, unit.reloadMultiplier / recoilTime);
mount.warmup = Mathf.lerpDelta(mount.warmup, (can && mount.shoot) || (continuous && mount.bullet != null) ? 1f : 0f, shootWarmupSpeed);
mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed); mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed);
mount.charge = mount.charging && shoot.firstShotDelay > 0 ? Mathf.approachDelta(mount.charge, 1, 1 / shoot.firstShotDelay) : 0; mount.charge = mount.charging && shoot.firstShotDelay > 0 ? Mathf.approachDelta(mount.charge, 1, 1 / shoot.firstShotDelay) : 0;
float warmupTarget = (can && mount.shoot) || (continuous && mount.bullet != null) || mount.charging ? 1f : 0f;
if(linearWarmup){
mount.warmup = Mathf.approachDelta(mount.warmup, warmupTarget, shootWarmupSpeed);
}else{
mount.warmup = Mathf.lerpDelta(mount.warmup, warmupTarget, shootWarmupSpeed);
}
//rotate if applicable //rotate if applicable
if(rotate && (mount.rotate || mount.shoot) && can){ if(rotate && (mount.rotate || mount.shoot) && can){

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

@@ -343,7 +343,7 @@ public class Turret extends ReloadTurret{
public void updateTile(){ public void updateTile(){
if(!validateTarget()) target = null; if(!validateTarget()) target = null;
float warmupTarget = isShooting() && canConsume() ? 1f : 0f; float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
if(linearWarmup){ if(linearWarmup){
shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f)); shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f));
}else{ }else{