From 3fcb24377a4f2f51ddc952ad2e1f32a4cb961df9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 14 May 2025 09:59:37 -0400 Subject: [PATCH] progress --- core/assets/planets/serpulo.json | 2 +- .../mindustry/content/SerpuloTechTree.java | 130 +++++++++--------- core/src/mindustry/game/Schematics.java | 1 - 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/core/assets/planets/serpulo.json b/core/assets/planets/serpulo.json index 9f774858ea..ec1a946753 100644 --- a/core/assets/planets/serpulo.json +++ b/core/assets/planets/serpulo.json @@ -1 +1 @@ -{presets:{windsweptIslands:97,stainedMountains:86,weatheredChannels:39,craters:220,extractionOutpost:165,coastline:108,navalFortress:216,frontier:222,groundZero:175,mycelialBastion:168,atolls:212,ruinousShores:101,testingGrounds:3,frozenForest:219,fungalPass:23,geothermalStronghold:264,infestedCanyons:210,desolateRift:123,nuclearComplex:130,facility32m:1,planetaryTerminal:93,impact0078:227,seaPort:214,cruxscape:54,biomassFacility:221},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,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:165,craters:175,coastline:164,navalFortress:37,frontier:215,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:227,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,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 diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index 2d8a395b3c..68b0a95e93 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -533,71 +533,7 @@ public class SerpuloTechTree{ new Research(steamGenerator) ), () -> { - node(tarFields, Seq.with( - new SectorComplete(windsweptIslands), - new Research(coalCentrifuge), - new Research(conduit), - new Research(wave) - ), () -> { - node(impact0078, Seq.with( - new SectorComplete(tarFields), - new Research(Items.thorium), - new Research(lancer), - new Research(salvo), - new Research(coreFoundation) - ), () -> { - node(desolateRift, Seq.with( - new SectorComplete(impact0078), - new Research(thermalGenerator), - new Research(thoriumReactor), - new Research(coreNucleus) - ), () -> { - node(planetaryTerminal, Seq.with( - new SectorComplete(desolateRift), - new SectorComplete(nuclearComplex), - new SectorComplete(overgrowth), - new SectorComplete(extractionOutpost), - new SectorComplete(saltFlats), - new Research(risso), - new Research(minke), - new Research(bryde), - new Research(sei), - new Research(omura), - new Research(spectre), - new Research(advancedLaunchPad), - new Research(massDriver), - new Research(impactReactor), - new Research(additiveReconstructor), - new Research(exponentialReconstructor), - new Research(tetrativeReconstructor) - ), () -> { - node(geothermalStronghold, Seq.with( - new Research(omura), - new Research(navanax), - new Research(eclipse), - new Research(oct), - new Research(reign), - new Research(corvus), - new Research(toxopid) - ), () -> { - }); - - node(cruxscape, Seq.with( - new Research(omura), - new Research(navanax), - new Research(eclipse), - new Research(oct), - new Research(reign), - new Research(corvus), - new Research(toxopid) - ), () -> { - - }); - }); - }); - }); - }); node(facility32m, Seq.with( new Research(plastaniumCompressor), @@ -605,6 +541,72 @@ public class SerpuloTechTree{ new Research(salvo), new SectorComplete(windsweptIslands) ), () -> { + node(tarFields, Seq.with( + new SectorComplete(facility32m), + new Research(coalCentrifuge), + new Research(conduit), + new Research(wave) + ), () -> { + node(impact0078, Seq.with( + new SectorComplete(tarFields), + new Research(Items.thorium), + new Research(lancer), + new Research(salvo), + new Research(coreFoundation) + ), () -> { + node(desolateRift, Seq.with( + new SectorComplete(impact0078), + new Research(thermalGenerator), + new Research(thoriumReactor), + new Research(coreNucleus) + ), () -> { + node(planetaryTerminal, Seq.with( + new SectorComplete(desolateRift), + new SectorComplete(nuclearComplex), + new SectorComplete(overgrowth), + new SectorComplete(extractionOutpost), + new SectorComplete(saltFlats), + new Research(risso), + new Research(minke), + new Research(bryde), + new Research(sei), + new Research(omura), + new Research(spectre), + new Research(advancedLaunchPad), + new Research(massDriver), + new Research(impactReactor), + new Research(additiveReconstructor), + new Research(exponentialReconstructor), + new Research(tetrativeReconstructor) + ), () -> { + node(geothermalStronghold, Seq.with( + new Research(omura), + new Research(navanax), + new Research(eclipse), + new Research(oct), + new Research(reign), + new Research(corvus), + new Research(toxopid) + ), () -> { + + }); + + node(cruxscape, Seq.with( + new Research(omura), + new Research(navanax), + new Research(eclipse), + new Research(oct), + new Research(reign), + new Research(corvus), + new Research(toxopid) + ), () -> { + + }); + }); + }); + }); + }); + node(extractionOutpost, Seq.with( new SectorComplete(windsweptIslands), new SectorComplete(fungalPass), diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 620434d144..acab4144c1 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -63,7 +63,6 @@ public class Schematics implements Loadable{ private long lastClearTime; public Schematics(){ - Events.on(ClientLoadEvent.class, event -> { errorTexture = new Texture("sprites/error.png"); });