From f16894592fe73901ad12eeb23d8cb55801478985 Mon Sep 17 00:00:00 2001 From: rly4498 <68048803+rly4498@users.noreply.github.com> Date: Sat, 23 Jul 2022 01:43:37 +0800 Subject: [PATCH] onShoot on StatusFieldAbility (#7221) * onShoot on StatusFieldAbility allows for more JSON gaming * hmm --- core/src/mindustry/entities/abilities/StatusFieldAbility.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java index ba90b7ae11..4d90de75cf 100644 --- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java +++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java @@ -11,6 +11,7 @@ import mindustry.type.*; public class StatusFieldAbility extends Ability{ public StatusEffect effect; public float duration = 60, reload = 100, range = 20; + public boolean onShoot = false; public Effect applyEffect = Fx.none; public Effect activeEffect = Fx.overdriveWave; public float effectX, effectY; @@ -36,7 +37,7 @@ public class StatusFieldAbility extends Ability{ public void update(Unit unit){ timer += Time.delta; - if(timer >= reload){ + if(timer >= reload && (!onShoot || unit.isShooting)){ Units.nearby(unit.team, unit.x, unit.y, range, other -> { other.apply(effect, duration); applyEffect.at(other, parentizeEffects);