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

FlakDelay (#7281)

Browse Source
This commit is contained in:
MEEPofFaith
2022-08-03 14:08:53 -07:00
committed by GitHub
parent 3138f05cc2
commit ff28daa3a4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/bullet/FlakBulletType.java
View File

@@ -6,7 +6,7 @@ import mindustry.entities.*;
import mindustry.gen.*; import mindustry.gen.*;
public class FlakBulletType extends BasicBulletType{ public class FlakBulletType extends BasicBulletType{
public float explodeRange = 30f, explodeDelay = 5f, flakInterval = 6f; public float explodeRange = 30f, explodeDelay = 5f, flakDelay = 0f, flakInterval = 6f;
public FlakBulletType(float speed, float damage){ public FlakBulletType(float speed, float damage){
super(speed, damage, "shell"); super(speed, damage, "shell");
@@ -27,9 +27,9 @@ public class FlakBulletType extends BasicBulletType{
super.update(b); super.update(b);
//don't check for targets if primed to explode //don't check for targets if primed to explode
if(b.fdata >= 0 && b.timer(2, flakInterval)){ if(b.time >= flakDelay && b.fdata >= 0 && b.timer(2, flakInterval)){
Units.nearbyEnemies(b.team, Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x, b.y), unit -> { Units.nearbyEnemies(b.team, Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x, b.y), unit -> {
//fadata < 0 means it's primed to explode //fdata < 0 means it's primed to explode
if(b.fdata < 0f || !unit.checkTarget(collidesAir, collidesGround)) return; if(b.fdata < 0f || !unit.checkTarget(collidesAir, collidesGround)) return;
if(unit.within(b, explodeRange + unit.hitSize/2f)){ if(unit.within(b, explodeRange + unit.hitSize/2f)){