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

Rule cleanup/clarification

Browse Source
This commit is contained in:
Anuken
2022-10-06 14:17:55 -04:00
parent a7c7238cc8
commit b69cf34494
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,7 +644,9 @@ resources.max = Max
bannedblocks = Banned Blocks bannedblocks = Banned Blocks
objectives = Objectives objectives = Objectives
bannedunits = Banned Units bannedunits = Banned Units
whitelist = Whitelist rules.hidebannedblocks = Hide Banned Blocks
bannedunits.whitelist = Banned Units As Whitelist
bannedblocks.whitelist = Banned Blocks As Whitelist
addall = Add All addall = Add All
launch.from = Launching From: [accent]{0} launch.from = Launching From: [accent]{0}
launch.capacity = Launching Item Capacity: [accent]{0} launch.capacity = Launching Item Capacity: [accent]{0}

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

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