Merge remote-tracking branch 'origin/master'

2020-02-22 19:32:10 -05:00
parent 2cd69230e0 ae66ca468d
commit 501e909039
14 changed files with 39 additions and 24 deletions
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -172,6 +172,7 @@ public class CustomRulesDialog extends FloatingDialog{
        number("$rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));

        title("$rules.title.experimental");
+        number("$rules.solarpowermultiplier", f -> rules.solarPowerMultiplier = f, () -> rules.solarPowerMultiplier);
        check("$rules.lighting", b -> rules.lighting = b, () -> rules.lighting);

        main.addButton(b -> {