diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d5c051834f..5fdedd7e2c 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4338,7 +4338,7 @@ public class Blocks{ size = 5; plans.add( new AssemblerUnitPlan(UnitTypes.quell, 60f * 60f, PayloadStack.list(UnitTypes.elude, 4, Blocks.berylliumWallLarge, 8)), - new AssemblerUnitPlan(UnitTypes.disrupt, 60f * 60f * 3f, PayloadStack.list(UnitTypes.locus, 6, Blocks.carbideWallLarge, 20)) + new AssemblerUnitPlan(UnitTypes.disrupt, 60f * 60f * 3f, PayloadStack.list(UnitTypes.avert, 6, Blocks.carbideWallLarge, 20)) ); areaSize = 13; @@ -4462,7 +4462,7 @@ public class Blocks{ consumePower(2f); size = 3; //TODO expand this list - filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer, Blocks.reinforcedContainer, Blocks.beamNode); + filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.carbideWallLarge, Blocks.reinforcedLiquidContainer, Blocks.reinforcedContainer, Blocks.beamNode); }}; //yes this block is pretty much useless diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 40d06329d5..f7c4c1392b 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -50,6 +50,7 @@ public class Planets{ new HexSkyMesh(this, 2, 0.15f, 0.14f, 5, Color.valueOf("eba768").a(0.75f), 2, 0.42f, 1f, 0.43f), new HexSkyMesh(this, 3, 0.6f, 0.15f, 5, Color.valueOf("eea293").a(0.75f), 2, 0.42f, 1.2f, 0.45f) ); + sectorSeed = 1; alwaysUnlocked = true; landCloudColor = Color.valueOf("ed6542"); atmosphereColor = Color.valueOf("f07218"); diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 3e1beae2a4..3b4b7e4c1d 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -73,6 +73,8 @@ public class Planet extends UnlockableContent{ public float lightSrcFrom = 0f, lightSrcTo = 0.8f, lightDstFrom = 0.2f, lightDstTo = 1f; /** The default starting sector displayed to the map dialog. */ public int startSector = 0; + /** Seed for sector base generation on this planet. -1 to use a random one based on ID. */ + public int sectorSeed = -1; /** Whether the bloom render effect is enabled. */ public boolean bloom = false; /** Whether this planet is displayed. */ @@ -286,7 +288,7 @@ public class Planet extends UnlockableContent{ } if(generator != null){ - Noise.setSeed(id + 1); + Noise.setSeed(sectorSeed < 0 ? id + 1 : sectorSeed); for(Sector sector : sectors){ generator.generateSector(sector);