Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors

F O R C E P R O J E C T O R S
2020-09-19 21:15:45 -04:00
parent cdd1e90d1a 3b8b762a1c
commit b4d83f33e9
4 changed files with 11 additions and 2 deletions
--- a/core/src/mindustry/world/meta/BlockStat.java
+++ b/core/src/mindustry/world/meta/BlockStat.java
@@ -48,6 +48,8 @@ public enum BlockStat{
    targetsGround(StatCategory.shooting),
    damage(StatCategory.shooting),
    ammo(StatCategory.shooting),
+    shieldHealth(StatCategory.shooting),
+    cooldownTime(StatCategory.shooting),

    booster(StatCategory.optional),
    boostEffect(StatCategory.optional),
--- a/core/src/mindustry/world/meta/StatUnit.java
+++ b/core/src/mindustry/world/meta/StatUnit.java
@@ -21,6 +21,7 @@ public enum StatUnit{
    perMinute,
    timesSpeed(false),
    percent(false),
+    shieldHealth,
    none,
    items;