mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-31 15:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Block flag documentation & cleanup

Browse Source
This commit is contained in:
Anuken
2021-02-12 09:09:10 -05:00
parent 21f642ad0c
commit 541da5c0c9
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/assets/bundles/bundle.properties
View File

@ -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.

2
core/src/mindustry/logic/LStatements.java
View File

@ -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);

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@ -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

2
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@ -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

3
core/src/mindustry/world/meta/BlockFlag.java
View File

@ -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};
}