Add disarmed status effect that disarms (#4762)

* Add disarmed status effect that disarms

* Update core/src/mindustry/entities/comp/StatusComp.java

Co-authored-by: Anuken <arnukren@gmail.com>

* Rename disarms -> disarm

Co-authored-by: Anuken <arnukren@gmail.com>
This commit is contained in:
Patrick 'Quezler' Mounier
2021-02-23 15:51:43 +01:00
committed by GitHub
parent 2f836d779a
commit aabbfd624a
5 changed files with 18 additions and 5 deletions

View File

@@ -20,6 +20,7 @@ abstract class StatusComp implements Posc, Flyingc{
private transient Bits applied = new Bits(content.getBy(ContentType.status).size);
@ReadOnly transient float speedMultiplier = 1, damageMultiplier = 1, healthMultiplier = 1, reloadMultiplier = 1;
@ReadOnly transient boolean disarmed = false;
@Import UnitType type;
@@ -111,6 +112,7 @@ abstract class StatusComp implements Posc, Flyingc{
applied.clear();
speedMultiplier = damageMultiplier = healthMultiplier = reloadMultiplier = 1f;
disarmed = false;
if(statuses.isEmpty()) return;
@@ -132,6 +134,9 @@ abstract class StatusComp implements Posc, Flyingc{
healthMultiplier *= entry.effect.healthMultiplier;
damageMultiplier *= entry.effect.damageMultiplier;
reloadMultiplier *= entry.effect.reloadMultiplier;
disarmed |= entry.effect.disarm;
entry.effect.update(self(), entry.time);
}
}