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

Whitelist Option + Hiding Banned Blocks Rules (#7553)

Browse Source 
* Whitelist Option

* Hide banned blocks rule
This commit is contained in:
MEEPofFaith
2022-10-06 11:14:48 -07:00
committed by GitHub
parent 4ac3eb1c9a
commit a7c7238cc8
9 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -180,7 +180,9 @@ public class CustomRulesDialog extends BaseDialog{
() -> {}, () -> {}
)).left().width(300f).row();
check("@rules.hidebannedblocks", b -> rules.hideBannedBlocks = b, () -> rules.hideBannedBlocks);
main.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f).row();
check("@whitelist", b -> rules.blockWhitelist = b, () -> rules.blockWhitelist);
//TODO objectives would be nice
if(experimental && false){
@@ -198,6 +200,7 @@ public class CustomRulesDialog extends BaseDialog{
number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
main.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f).row();
check("@whitelist", b -> rules.unitWhitelist = b, () -> rules.unitWhitelist);
title("@rules.title.enemy");
check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);

2
core/src/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -74,7 +74,7 @@ public class DatabaseDialog extends BaseDialog{
Image image = unlocked(unlock) ? new Image(unlock.uiIcon).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray);
//banned cross
if(state.isGame() && (unlock instanceof UnitType u && u.isBanned() || unlock instanceof Block b && state.rules.bannedBlocks.contains(b))){
if(state.isGame() && (unlock instanceof UnitType u && u.isBanned() || unlock instanceof Block b && state.rules.isBanned(b))){
list.stack(image, new Image(Icon.cancel){{
setColor(Color.scarlet);
touchable = Touchable.disabled;