From 541da5c0c94f4df5c4e541ade425828b060cb8f0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 12 Feb 2021 09:09:10 -0500
Subject: [PATCH] Block flag documentation & cleanup

---
 core/assets/bundles/bundle.properties                     | 8 ++++++++
 core/src/mindustry/logic/LStatements.java                 | 2 +-
 core/src/mindustry/world/blocks/power/ImpactReactor.java  | 2 ++
 core/src/mindustry/world/blocks/power/NuclearReactor.java | 2 +-
 core/src/mindustry/world/meta/BlockFlag.java              | 3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 9b3a8136b5..357d5290cc 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1587,6 +1587,14 @@ lenum.building = Building in a specific group.
 
 lenum.core = Any core.
 lenum.storage = Storage building, e.g. Vault.
+lenum.generator = Buildings that generate power.
+lenum.factory = Buildings that transform resources.
+lenum.repair = Repair points.
+lenum.rally = Command center.
+lenum.battery = Any battery.
+lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
+lenum.reactor = Impact/Thorium reactor.
+lenum.turret = Any turret.
 
 sensor.in = The building/unit to sense.
 
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index a9c502cd6a..cfa1345ec2 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -917,7 +917,7 @@ public class LStatements{
                     table.add(" group ").left().self(this::param);;
                     table.button(b -> {
                         b.label(() -> flag.name());
-                        b.clicked(() -> showSelect(b, BlockFlag.all, flag, t -> flag = t, 2, cell -> cell.size(110, 50)));
+                        b.clicked(() -> showSelect(b, BlockFlag.allLogic, flag, t -> flag = t, 2, cell -> cell.size(110, 50)));
                     }, Styles.logict, () -> {}).size(110, 40).color(table.color).left().padLeft(2);
                     row(table);
 
diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java
index 7ecffccd1c..09a7c9acb8 100644
--- a/core/src/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java
@@ -4,6 +4,7 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
@@ -38,6 +39,7 @@ public class ImpactReactor extends PowerGenerator{
         liquidCapacity = 30f;
         hasItems = true;
         outputsPower = consumesPower = true;
+        flags = EnumSet.of(BlockFlag.reactor, BlockFlag.generator);
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java
index 7dd8be9f07..aa7eed3b71 100644
--- a/core/src/mindustry/world/blocks/power/NuclearReactor.java
+++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java
@@ -48,7 +48,7 @@ public class NuclearReactor extends PowerGenerator{
         hasItems = true;
         hasLiquids = true;
         rebuildable = false;
-        flags = EnumSet.of(BlockFlag.reactor);
+        flags = EnumSet.of(BlockFlag.reactor, BlockFlag.generator);
     }
 
     @Override
diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java
index f1778accff..2fad22868e 100644
--- a/core/src/mindustry/world/meta/BlockFlag.java
+++ b/core/src/mindustry/world/meta/BlockFlag.java
@@ -28,4 +28,7 @@ public enum BlockFlag{
     extinguisher;
 
     public final static BlockFlag[] all = values();
+
+    /** Values for logic only. Filters out some internal flags. */
+    public final static BlockFlag[] allLogic = {core, storage, generator, turret, factory, repair, rally, battery, resupply, reactor};
 }