mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sector base shift + impossible requirements

Browse Source
This commit is contained in:
Anuken 2022-05-08 00:43:38 -04:00
parent f055e35729
commit a5b6c2a03a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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");

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

@ -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);