mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Weapon support for "always-continuous" bullets

Browse Source
This commit is contained in:
Anuken 2022-07-03 14:32:21 -04:00
parent 4d5f16e75d
commit 3e4b754a60
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,10 @@ public class Weapon implements Cloneable{
public float baseRotation = 0f;
/** whether to draw the outline on top. */
public boolean top = true;
/** whether to hold the bullet in place while firing */
/** whether to hold the bullet in place while firing; it will still require reload. */
public boolean continuous;
/** whether this weapon uses continuous fire without reloading; implies continuous = true */
public boolean alwaysContinuous;
/** whether this weapon can be aimed manually by players */
public boolean controllable = true;
/** whether to automatically target relevant units in update(); only works when controllable = false. */
@ -328,10 +330,9 @@ public class Weapon implements Cloneable{
mount.sound.update(bulletX, bulletY, true);
}
//TODO: how do continuous flame bullets work here? a new system is needed
if(mount.bullet.type.optimalLifeFract > 0){
// mount.bullet.time = mount.bullet.lifetime * mount.bullet.type.optimalLifeFract * mount.warmup;
// mount.bullet.keepAlive = true;
if(alwaysContinuous && mount.shoot){
mount.bullet.time = mount.bullet.lifetime * mount.bullet.type.optimalLifeFract * mount.warmup;
mount.bullet.keepAlive = true;
}
}
}else{
@ -357,7 +358,7 @@ public class Weapon implements Cloneable{
(!alternate || wasFlipped == flipSprite) &&
mount.warmup >= minWarmup && //must be warmed up
unit.vel.len() >= minShootVelocity && //check velocity requirements
mount.reload <= 0.0001f && //reload has to be 0
(mount.reload <= 0.0001f || (alwaysContinuous && mount.bullet == null)) && //reload has to be 0, or it has to be an always-continuous weapon
Angles.within(rotate ? mount.rotation : unit.rotation + baseRotation, mount.targetRotation, shootCone) //has to be within the cone
){
shoot(unit, mount, bulletX, bulletY, shootAngle);
@ -458,7 +459,9 @@ public class Weapon implements Cloneable{
@CallSuper
public void init(){
if(alwaysContinuous){
continuous = true;
}
}
public void load(){