mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

Browse Source
This commit is contained in:
Epowerj 2022-04-17 18:58:39 -04:00
commit 37525861a7
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,6 +585,7 @@ loadout = Loadout
resources = Resources
resources.max = Max
bannedblocks = Banned Blocks
objectives = Objectives
bannedunits = Banned Units
addall = Add All
launch.from = Launching From: [accent]{0}

3
core/src/mindustry/ai/Pathfinder.java
View File

@ -95,7 +95,8 @@ public class Pathfinder implements Runnable{
tiles[i] = packTile(tile);
}
if(state.rules.waveTeam.needsFlowField()){
//don't bother setting up paths unless necessary
if(state.rules.waveTeam.needsFlowField() && !net.client()){
preloadPath(getField(state.rules.waveTeam, costGround, fieldCore));
//preload water on naval maps

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

@ -164,11 +164,16 @@ public class CustomRulesDialog extends BaseDialog{
i -> true,
() -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
() -> {}, () -> {}
)).left().width(300f);
main.row();
)).left().width(300f).row();
main.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f);
main.row();
main.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f).row();
//TODO objectives would be nice
if(experimental && false){
main.button("@objectives", () -> {
}).left().width(300f).row();
}
title("@rules.title.unit");
check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo);
@ -177,8 +182,7 @@ public class CustomRulesDialog extends BaseDialog{
number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0f, 50f);
main.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f);
main.row();
main.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f).row();
title("@rules.title.enemy");
check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);