diff --git a/build.gradle b/build.gradle index 32148e554b..369b8f4e18 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ allprojects{ ext{ versionNumber = '7' - if(!project.hasProperty("versionModifier")) versionModifier = 'alpha' + if(!project.hasProperty("versionModifier")) versionModifier = 'beta' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94' diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index aa8e185e92..ad64fbe654 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1161,7 +1161,7 @@ rules.wavetimer = Wave Timer rules.wavesending = Wave Sending rules.waves = Waves rules.attack = Attack Mode -rules.rtsai = RTS AI [scarlet](WIP) +rules.rtsai = RTS AI [red](WIP) rules.rtsminsquadsize = Min Squad Size rules.rtsmaxsquadsize = Max Squad Size rules.rtsminattackweight = Min Attack Weight @@ -1187,7 +1187,7 @@ rules.buildspeedmultiplier = Build Speed Multiplier rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier rules.waitForWaveToEnd = Waves Wait for Enemies rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) -rules.unitammo = Units Require Ammo +rules.unitammo = Units Require Ammo [red](may be removed) rules.enemyteam = Enemy Team rules.playerteam = Player Team rules.title.waves = Waves diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4579a47303..8e1601dc6d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4192,7 +4192,7 @@ public class Blocks{ frontColor = Color.white; backColor = trailColor = hitColor = Color.sky; trailChance = 0.44f; - ammoMultiplier = 2f; + ammoMultiplier = 3f; lifetime = 34f; rotationOffset = 90f; diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index f44503d17e..24b158e046 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -9,6 +9,7 @@ import arc.scene.ui.ImageButton.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; +import mindustry.*; import mindustry.content.*; import mindustry.ctype.*; import mindustry.game.*; @@ -149,7 +150,17 @@ public class CustomRulesDialog extends BaseDialog{ number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true); title("@rules.title.resourcesbuilding"); - check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources); + check("@rules.infiniteresources", b -> { + rules.infiniteResources = b; + + //reset to serpulo if any env was enabled + if(!b && rules.hiddenBuildItems.isEmpty()){ + rules.env = Planets.serpulo.defaultEnv; + rules.hiddenBuildItems.clear(); + rules.hiddenBuildItems.addAll(Planets.serpulo.hiddenItems); + setup(); + } + }, () -> rules.infiniteResources); check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore); check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions); check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed); @@ -241,11 +252,13 @@ public class CustomRulesDialog extends BaseDialog{ } t.button("@rules.anyenv", style, () -> { - //unlocalized for now - ui.showInfo("[accent]'Any' environment, or 'mixed tech', is no longer allowed.[]\n\nReasoning: Serpulo and Erekir tech were never meant to be used in the same map. They are not compatible or remotely balanced.\nI have received far too many complains in this regard."); - - //rules.env = Vars.defaultEnv; - //rules.hiddenBuildItems.clear(); + if(!rules.infiniteResources){ + //unlocalized for now + ui.showInfo("[accent]'Any' environment, or 'mixed tech', is no longer allowed outside of sandbox.[]\n\nReasoning: Serpulo and Erekir tech were never meant to be used in the same map. They are not compatible or remotely balanced.\nI have received far too many complains in this regard."); + }else{ + rules.env = Vars.defaultEnv; + rules.hiddenBuildItems.clear(); + } }).group(group).checked(b -> rules.hiddenBuildItems.size == 0); }).left().fill(false).expand(false, false).row();