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

Fixed #7841

Browse Source
This commit is contained in:
Anuken
2022-11-07 15:07:32 -05:00
parent 927566e038
commit 09b65fddb8
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/content/Planets.java
View File

@@ -71,16 +71,17 @@ public class Planets{
//TODO SHOULD there be lighting? //TODO SHOULD there be lighting?
updateLighting = false; updateLighting = false;
defaultAttributes.set(Attribute.heat, 0.8f);
ruleSetter = r -> { ruleSetter = r -> {
r.waveTeam = Team.malis; r.waveTeam = Team.malis;
r.placeRangeCheck = false; //TODO true or false? r.placeRangeCheck = false;
r.attributes.set(Attribute.heat, 0.8f);
r.showSpawns = true; r.showSpawns = true;
r.fog = true; r.fog = true;
r.staticFog = true; r.staticFog = true;
r.lighting = false; r.lighting = false;
r.coreDestroyClear = true; r.coreDestroyClear = true;
r.onlyDepositCore = true; //TODO not sure r.onlyDepositCore = true;
}; };
unlockedOnLand.add(Blocks.coreBastion); unlockedOnLand.add(Blocks.coreBastion);
@@ -139,7 +140,6 @@ public class Planets{
ruleSetter = r -> { ruleSetter = r -> {
r.waveTeam = Team.crux; r.waveTeam = Team.crux;
r.placeRangeCheck = false; r.placeRangeCheck = false;
r.attributes.clear();
r.showSpawns = false; r.showSpawns = false;
}; };
iconColor = Color.valueOf("7d4dff"); iconColor = Color.valueOf("7d4dff");

5
core/src/mindustry/type/Planet.java
View File

@@ -18,6 +18,7 @@ import mindustry.graphics.g3d.*;
import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.graphics.g3d.PlanetGrid.*;
import mindustry.maps.generators.*; import mindustry.maps.generators.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -69,6 +70,8 @@ public class Planet extends UnlockableContent{
public boolean accessible = true; public boolean accessible = true;
/** Environment flags for sectors on this planet. */ /** Environment flags for sectors on this planet. */
public int defaultEnv = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen; public int defaultEnv = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen;
/** Environment attributes. */
public Attributes defaultAttributes = new Attributes();
/** If true, a day/night cycle is simulated. */ /** If true, a day/night cycle is simulated. */
public boolean updateLighting = true; public boolean updateLighting = true;
/** Day/night cycle parameters. */ /** Day/night cycle parameters. */
@@ -182,6 +185,8 @@ public class Planet extends UnlockableContent{
public void applyRules(Rules rules){ public void applyRules(Rules rules){
ruleSetter.get(rules); ruleSetter.get(rules);
rules.attributes.clear();
rules.attributes.add(defaultAttributes);
rules.env = defaultEnv; rules.env = defaultEnv;
rules.hiddenBuildItems.clear(); rules.hiddenBuildItems.clear();
rules.hiddenBuildItems.addAll(hiddenItems); rules.hiddenBuildItems.addAll(hiddenItems);

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

@@ -250,6 +250,8 @@ public class CustomRulesDialog extends BaseDialog{
for(Planet planet : new Planet[]{Planets.serpulo, Planets.erekir}){ for(Planet planet : new Planet[]{Planets.serpulo, Planets.erekir}){
t.button(planet.localizedName, style, () -> { t.button(planet.localizedName, style, () -> {
rules.env = planet.defaultEnv; rules.env = planet.defaultEnv;
rules.attributes.clear();
rules.attributes.add(planet.defaultAttributes);
rules.hiddenBuildItems.clear(); rules.hiddenBuildItems.clear();
rules.hiddenBuildItems.addAll(planet.hiddenItems); rules.hiddenBuildItems.addAll(planet.hiddenItems);
}).group(group).checked(b -> rules.env == planet.defaultEnv); }).group(group).checked(b -> rules.env == planet.defaultEnv);