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

Allow mixtech in sandbox / Beta release tag

Browse Source
This commit is contained in:
Anuken
2022-10-03 22:23:46 -04:00
parent 3684dfcf0a
commit 49b789fc39
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -34,7 +34,7 @@ allprojects{
ext{ ext{
versionNumber = '7' versionNumber = '7'
if(!project.hasProperty("versionModifier")) versionModifier = 'alpha' if(!project.hasProperty("versionModifier")) versionModifier = 'beta'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94' steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'

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

@@ -1161,7 +1161,7 @@ rules.wavetimer = Wave Timer
rules.wavesending = Wave Sending rules.wavesending = Wave Sending
rules.waves = Waves rules.waves = Waves
rules.attack = Attack Mode rules.attack = Attack Mode
rules.rtsai = RTS AI [scarlet](WIP) rules.rtsai = RTS AI [red](WIP)
rules.rtsminsquadsize = Min Squad Size rules.rtsminsquadsize = Min Squad Size
rules.rtsmaxsquadsize = Max Squad Size rules.rtsmaxsquadsize = Max Squad Size
rules.rtsminattackweight = Min Attack Weight rules.rtsminattackweight = Min Attack Weight
@@ -1187,7 +1187,7 @@ rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves Wait for Enemies rules.waitForWaveToEnd = Waves Wait for Enemies
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles) 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.enemyteam = Enemy Team
rules.playerteam = Player Team rules.playerteam = Player Team
rules.title.waves = Waves rules.title.waves = Waves

2
core/src/mindustry/content/Blocks.java
View File

@@ -4192,7 +4192,7 @@ public class Blocks{
frontColor = Color.white; frontColor = Color.white;
backColor = trailColor = hitColor = Color.sky; backColor = trailColor = hitColor = Color.sky;
trailChance = 0.44f; trailChance = 0.44f;
ammoMultiplier = 2f; ammoMultiplier = 3f;
lifetime = 34f; lifetime = 34f;
rotationOffset = 90f; rotationOffset = 90f;

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

@@ -9,6 +9,7 @@ import arc.scene.ui.ImageButton.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.game.*; 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); number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
title("@rules.title.resourcesbuilding"); 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.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions); check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed); check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
@@ -241,11 +252,13 @@ public class CustomRulesDialog extends BaseDialog{
} }
t.button("@rules.anyenv", style, () -> { t.button("@rules.anyenv", style, () -> {
//unlocalized for now if(!rules.infiniteResources){
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."); //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.");
//rules.env = Vars.defaultEnv; }else{
//rules.hiddenBuildItems.clear(); rules.env = Vars.defaultEnv;
rules.hiddenBuildItems.clear();
}
}).group(group).checked(b -> rules.hiddenBuildItems.size == 0); }).group(group).checked(b -> rules.hiddenBuildItems.size == 0);
}).left().fill(false).expand(false, false).row(); }).left().fill(false).expand(false, false).row();