Fixed empty category
This commit is contained in:
@@ -1791,6 +1791,8 @@ public class Blocks{
|
|||||||
|
|
||||||
duct = new Duct("duct"){{
|
duct = new Duct("duct"){{
|
||||||
requirements(Category.distribution, with(Items.graphite, 1));
|
requirements(Category.distribution, with(Items.graphite, 1));
|
||||||
|
//TODO bad idea? should this just require 1 beryllium?
|
||||||
|
buildVisibility = BuildVisibility.berylliumOnly;
|
||||||
speed = 4f;
|
speed = 4f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ public class PlacementFragment extends Fragment{
|
|||||||
}
|
}
|
||||||
|
|
||||||
void rebuild(){
|
void rebuild(){
|
||||||
currentCategory = Category.turret;
|
currentCategory = Category.distribution;
|
||||||
Group group = toggler.parent;
|
Group group = toggler.parent;
|
||||||
int index = toggler.getZIndex();
|
int index = toggler.getZIndex();
|
||||||
toggler.remove();
|
toggler.remove();
|
||||||
@@ -400,6 +400,8 @@ public class PlacementFragment extends Fragment{
|
|||||||
Seq<Block> blocks = getUnlockedByCategory(cat);
|
Seq<Block> blocks = getUnlockedByCategory(cat);
|
||||||
categoryEmpty[cat.ordinal()] = blocks.isEmpty();
|
categoryEmpty[cat.ordinal()] = blocks.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean needsAssign = categoryEmpty[currentCategory.ordinal()];
|
||||||
|
|
||||||
int f = 0;
|
int f = 0;
|
||||||
for(Category cat : getCategories()){
|
for(Category cat : getCategories()){
|
||||||
@@ -409,6 +411,11 @@ public class PlacementFragment extends Fragment{
|
|||||||
categories.image(Styles.black6);
|
categories.image(Styles.black6);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(needsAssign){
|
||||||
|
currentCategory = cat;
|
||||||
|
needsAssign = false;
|
||||||
|
}
|
||||||
|
|
||||||
categories.button(ui.getIcon(cat.name()), Styles.clearToggleTransi, () -> {
|
categories.button(ui.getIcon(cat.name()), Styles.clearToggleTransi, () -> {
|
||||||
currentCategory = cat;
|
currentCategory = cat;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package mindustry.world.meta;
|
|||||||
|
|
||||||
import arc.func.*;
|
import arc.func.*;
|
||||||
import mindustry.*;
|
import mindustry.*;
|
||||||
|
import mindustry.content.*;
|
||||||
|
|
||||||
public enum BuildVisibility{
|
public enum BuildVisibility{
|
||||||
hidden(() -> false),
|
hidden(() -> false),
|
||||||
@@ -11,6 +12,7 @@ public enum BuildVisibility{
|
|||||||
sandboxOnly(() -> Vars.state == null || Vars.state.rules.infiniteResources),
|
sandboxOnly(() -> Vars.state == null || Vars.state.rules.infiniteResources),
|
||||||
campaignOnly(() -> Vars.state == null || Vars.state.isCampaign()),
|
campaignOnly(() -> Vars.state == null || Vars.state.isCampaign()),
|
||||||
lightingOnly(() -> Vars.state == null || Vars.state.rules.lighting || 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);
|
ammoOnly(() -> Vars.state == null || Vars.state.rules.unitAmmo);
|
||||||
|
|
||||||
private final Boolp visible;
|
private final Boolp visible;
|
||||||
|
|||||||
Reference in New Issue
Block a user