Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildVisibility non-enum / Canvas is now shown

Browse Source
This commit is contained in:
Anuken
2022-09-23 12:27:44 -04:00
parent 710fd3484f
commit 8b9cbc2c7c
6 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/logic/CanvasBlock.java
View File

@@ -21,7 +21,7 @@ import static mindustry.Vars.*;
public class CanvasBlock extends Block{
public float padding = 0f;
public int canvasSize = 8;
public int[] palette = {0x634b7dff, 0xc45d9f_ff, 0xe39aac_ff, 0xf0dab1_ff, 0x6461c2_ff, 0x2ba9b4_ff, 0x93d4b5_ff, 0xf0f6e8_ff};
public int[] palette = {0x634b7d_ff, 0xc45d9f_ff, 0xe39aac_ff, 0xf0dab1_ff, 0x6461c2_ff, 0x2ba9b4_ff, 0x93d4b5_ff, 0xf0f6e8_ff};
public int bitsPerPixel;
public IntIntMap colorToIndex = new IntIntMap();

26
core/src/mindustry/world/meta/BuildVisibility.java
View File

@@ -4,17 +4,19 @@ import arc.func.*;
import mindustry.*;
import mindustry.content.*;
public enum BuildVisibility{
hidden(() -> false),
shown(() -> true),
debugOnly(() -> false),
editorOnly(() -> Vars.state.rules.editor),
sandboxOnly(() -> Vars.state == null || Vars.state.rules.infiniteResources),
campaignOnly(() -> Vars.state == null || Vars.state.isCampaign()),
lightingOnly(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
berylliumOnly(() -> !Vars.state.rules.hiddenBuildItems.contains(Items.beryllium)),
ammoOnly(() -> Vars.state == null || Vars.state.rules.unitAmmo),
fogOnly(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor);
public class BuildVisibility{
public static final BuildVisibility
hidden = new BuildVisibility(() -> false),
shown = new BuildVisibility(() -> true),
debugOnly = new BuildVisibility(() -> false),
editorOnly = new BuildVisibility(() -> Vars.state.rules.editor),
sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources),
campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign()),
lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
berylliumOnly = new BuildVisibility(() -> !Vars.state.rules.hiddenBuildItems.contains(Items.beryllium)),
ammoOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.unitAmmo),
fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor);
private final Boolp visible;
@@ -22,7 +24,7 @@ public enum BuildVisibility{
return visible.get();
}
BuildVisibility(Boolp visible){
public BuildVisibility(Boolp visible){
this.visible = visible;
}
}