From cc7c2dd79ca34d628fbc5c605f0fb6ca2610dac1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 18 May 2025 12:12:04 -0400 Subject: [PATCH] More WIP sector tech tree changes --- core/assets/planets/serpulo.json | 2 +- .../mindustry/content/SerpuloTechTree.java | 14 +++++----- .../maps/generators/BlankPlanetGenerator.java | 5 ---- .../maps/generators/PlanetGenerator.java | 26 ------------------- .../maps/planet/ErekirPlanetGenerator.java | 6 ----- .../maps/planet/SerpuloPlanetGenerator.java | 2 +- .../maps/planet/TantrosPlanetGenerator.java | 5 ---- gradle.properties | 2 +- 8 files changed, 9 insertions(+), 53 deletions(-) diff --git a/core/assets/planets/serpulo.json b/core/assets/planets/serpulo.json index c0f37c1c8b..4bd8409ec0 100644 --- a/core/assets/planets/serpulo.json +++ b/core/assets/planets/serpulo.json @@ -1 +1 @@ -{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:165,craters:175,coastline:164,navalFortress:37,frontier:215,groundZero:15,mycelialBastion:142,atolls:214,ruinousShores:41,overgrowth:86,testingGrounds:99,frozenForest:219,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:123,nuclearComplex:228,facility32m:1,planetaryTerminal:93,impact0078:270,seaPort:216,geothermalStronghold:264,cruxscape:54,fungalPass:221,tarFields:101,biomassFacility:23},attackSectors:[0,2,5,6,10,11,12,13,16,19,24,25,27,28,30,31,33,34,36,38,47,48,49,51,56,57,59,60,66,67,68,70,71,75,76,78,84,90,104,106,110,114,115,121,124,125,127,128,129,133,138,148,149,154,158,180,182,200,202,204,210,224,225,229,233,234,235,241,243,248,254,255,257,259,265]} \ No newline at end of file +{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:175,coastline:164,navalFortress:165,frontier:215,groundZero:15,mycelialBastion:142,facility32m:268,atolls:217,overgrowth:86,testingGrounds:99,frozenForest:219,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:123,nuclearComplex:228,ruinousShores:41,planetaryTerminal:93,impact0078:270,seaPort:216,geothermalStronghold:264,cruxscape:54,fungalPass:221,tarFields:72,biomassFacility:23},attackSectors:[0,2,5,6,10,11,12,13,16,19,24,25,27,28,30,31,33,34,36,47,48,49,51,56,57,59,60,66,67,68,70,71,75,76,78,82,84,90,104,106,110,114,115,121,124,125,127,128,129,133,138,148,149,154,158,180,182,200,202,204,210,224,225,229,233,234,235,241,243,248,254,255,257,259,265]} \ No newline at end of file diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 68b0a95e93..8bd6b556ac 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -485,7 +485,13 @@ public class SerpuloTechTree{ new Research(cultivator), new Research(coalCentrifuge) ), () -> { + node(atolls, Seq.with( + new SectorComplete(seaPort), + new Research(multiplicativeReconstructor), + new Research(mega) + ), () -> { + }); }); node(overgrowth, Seq.with( @@ -507,14 +513,6 @@ public class SerpuloTechTree{ ), () -> { }); - - node(atolls, Seq.with( - new SectorComplete(windsweptIslands), - new Research(multiplicativeReconstructor), - new Research(mega) - ), () -> { - - }); }); }); }); diff --git a/core/src/mindustry/maps/generators/BlankPlanetGenerator.java b/core/src/mindustry/maps/generators/BlankPlanetGenerator.java index 1b8a4dc9ca..1fcec6fa0b 100644 --- a/core/src/mindustry/maps/generators/BlankPlanetGenerator.java +++ b/core/src/mindustry/maps/generators/BlankPlanetGenerator.java @@ -19,11 +19,6 @@ public class BlankPlanetGenerator extends PlanetGenerator{ return Color.white; } - @Override - public void generateSector(Sector sector){ - - } - @Override public void addWeather(Sector sector, Rules rules){ diff --git a/core/src/mindustry/maps/generators/PlanetGenerator.java b/core/src/mindustry/maps/generators/PlanetGenerator.java index 9faf1fa1d3..5fd3b19931 100644 --- a/core/src/mindustry/maps/generators/PlanetGenerator.java +++ b/core/src/mindustry/maps/generators/PlanetGenerator.java @@ -12,7 +12,6 @@ import mindustry.ctype.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.g3d.*; -import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.type.*; import mindustry.type.Weather.*; import mindustry.ui.*; @@ -28,32 +27,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe /** Should generate sector bases for a planet. */ public void generateSector(Sector sector){ - Ptile tile = sector.tile; - boolean any = false; - float noise = Noise.snoise3(tile.v.x, tile.v.y, tile.v.z, 0.001f, 0.5f); - - if(noise > 0.027){ - any = true; - } - - if(noise < 0.15){ - for(Ptile other : tile.tiles){ - //no sectors near start sector! - if(sector.planet.getSector(other).id == sector.planet.startSector){ - return; - } - - if(sector.planet.getSector(other).generateEnemyBase){ - any = false; - break; - } - } - } - - if(any){ - sector.generateEnemyBase = true; - } } public void getLockedText(Sector hovered, StringBuilder out){ diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index b79f744fdd..94b4dd8992 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -9,7 +9,6 @@ import mindustry.ai.*; import mindustry.content.*; import mindustry.game.*; import mindustry.maps.generators.*; -import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.environment.*; import mindustry.world.meta.*; @@ -34,11 +33,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ defaultLoadout = Loadouts.basicBastion; } - @Override - public void generateSector(Sector sector){ - //no bases right now - } - @Override public float getHeight(Vec3 position){ return Mathf.pow(rawHeight(position), heightPow) * heightMult; diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 5e8e489abc..ccba966da1 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -25,7 +25,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ BaseGenerator basegen = new BaseGenerator(); float scl = 5f; - float waterOffset = 0.07f; + float waterOffset = 0.05f; boolean genLakes = false; Block[][] arr = diff --git a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java index 3bb73e9b11..8925536a83 100644 --- a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java @@ -24,11 +24,6 @@ public class TantrosPlanetGenerator extends PlanetGenerator{ baseSeed = 1; } - @Override - public void generateSector(Sector sector){ - //no bases - } - @Override public float getHeight(Vec3 position){ return 0; diff --git a/gradle.properties b/gradle.properties index f3a62ec065..fcb7e71f43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=23264f9514 +archash=67b872ff4d