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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
This commit is contained in:
Anuken
2021-06-17 10:44:51 -04:00
parent c623e66694 15affaad9b
commit afe963ca5d
21 changed files with 871 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,8 @@ public class CustomRulesDialog extends BaseDialog{
check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
check("@rules.buildai", b -> rules.teams.get(rules.waveTeam).ai = rules.teams.get(rules.waveTeam).infiniteResources = b, () -> rules.teams.get(rules.waveTeam).ai);
check("@rules.corecapture", b -> rules.coreCapture = b, () -> rules.coreCapture);
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
check("@rules.polygoncoreprotection", b -> rules.polygonCoreProtection = b, () -> rules.polygonCoreProtection);
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200), () -> !rules.polygonCoreProtection);
title("@rules.title.environment");
check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions);