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

Certain team-specific rules

Browse Source
This commit is contained in:
Anuken
2020-06-15 12:00:32 -04:00
parent 90b0650af9
commit b5660a50ca
61 changed files with 291 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,6 @@ public class CustomRulesDialog extends BaseDialog{
title("$rules.title.enemy");
check("$rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
check("$rules.enemyCheat", b -> rules.enemyCheat = b, () -> rules.enemyCheat);
number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
title("$rules.title.environment");

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

@@ -338,7 +338,7 @@ public class SchematicsDialog extends BaseDialog{
for(ItemStack s : arr){
r.image(s.item.icon(Cicon.small)).left();
r.label(() -> {
Tilec core = player.closestCore();
Tilec core = player.core();
if(core == null || state.rules.infiniteResources || core.items().has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
return (core.items().has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items().get(s.item), s.amount) + "[lightgray]/" + s.amount;
}).padLeft(2).left().padRight(4);