diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index fb364034b5..99dae10492 100644 Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 7855e14a3a..e9b12cbf39 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -114,13 +114,13 @@ public class TechTree implements ContentList{ node(graphitePress, () -> { node(Items.titanium, with(Items.graphite, 3000, Items.copper, 7000, Items.lead, 7000), () -> { node(pneumaticDrill, () -> { - node(Items.sporePod, with(Items.coal, 5000, Items.graphite, 5000, Items.lead, 5000), () -> { + node(Items.sporePod, with(Items.coal, 4000, Items.graphite, 4000, Items.lead, 4000), () -> { node(cultivator, () -> { }); }); - node(Items.thorium, with(Items.titanium, 10000, Items.lead, 15000, Items.copper, 30000), () -> { + node(Items.thorium, with(Items.titanium, 8000, Items.lead, 15000, Items.copper, 20000), () -> { node(laserDrill, () -> { node(blastDrill, () -> { @@ -136,7 +136,7 @@ public class TechTree implements ContentList{ }); }); - node(Items.pyratite, with(Items.coal, 6000, Items.lead, 10000, Items.sand, 5000), () -> { + node(Items.pyratite, with(Items.coal, 6000, Items.lead, 10000, Items.sand, 4000), () -> { node(pyratiteMixer, () -> { node(Items.blastCompound, with(Items.pyratite, 3000, Items.sporePod, 3000), () -> { node(blastMixer, () -> { @@ -146,10 +146,10 @@ public class TechTree implements ContentList{ }); }); - node(Items.silicon, with(Items.coal, 4000, Items.sand, 4000), () -> { + node(Items.silicon, with(Items.coal, 3000, Items.sand, 4000), () -> { node(siliconSmelter, () -> { - node(Liquids.oil, with(Items.coal, 8000, Items.pyratite, 6000, Items.sand, 20000), () -> { + node(Liquids.oil, with(Items.coal, 8000, Items.pyratite, 6000, Items.sand, 8000), () -> { node(sporePress, () -> { node(coalCentrifuge, () -> { node(multiPress, () -> { @@ -161,7 +161,7 @@ public class TechTree implements ContentList{ node(Items.plastanium, with(Items.titanium, 10000, Items.silicon, 10000), () -> { node(plastaniumCompressor, () -> { - node(Items.phaseFabric, with(Items.thorium, 15000, Items.sand, 30000, Items.silicon, 5000), () -> { + node(Items.phaseFabric, with(Items.thorium, 12000, Items.sand, 8000, Items.silicon, 5000), () -> { node(phaseWeaver, () -> { }); @@ -171,13 +171,13 @@ public class TechTree implements ContentList{ }); }); - node(Items.metaglass, with(Items.sand, 6000, Items.lead, 10000), () -> { + node(Items.metaglass, with(Items.sand, 4000, Items.lead, 10000), () -> { node(kiln, () -> { node(incinerator, () -> { - node(Items.scrap, with(Items.copper, 20000, Items.sand, 10000), () -> { + node(Items.scrap, with(Items.copper, 8000, Items.sand, 4000), () -> { node(Liquids.slag, with(Items.scrap, 4000), () -> { node(melter, () -> { - node(Items.surgeAlloy, with(Items.thorium, 20000, Items.silicon, 30000, Items.lead, 40000), () -> { + node(Items.surgeAlloy, with(Items.thorium, 20000, Items.silicon, 20000, Items.lead, 40000), () -> { node(surgeSmelter, () -> { }); @@ -191,7 +191,7 @@ public class TechTree implements ContentList{ }); }); - node(Liquids.cryofluid, with(Items.titanium, 8000, Items.metaglass, 5000), () -> { + node(Liquids.cryofluid, with(Items.titanium, 8000, Items.metaglass, 4000), () -> { node(cryofluidMixer, () -> { }); diff --git a/core/src/mindustry/game/Waves.java b/core/src/mindustry/game/Waves.java index 6f38db509d..42d6f1bb7b 100644 --- a/core/src/mindustry/game/Waves.java +++ b/core/src/mindustry/game/Waves.java @@ -10,7 +10,7 @@ import mindustry.type.*; import static mindustry.content.UnitTypes.*; public class Waves{ - public static final int waveVersion = 1; + public static final int waveVersion = 2; private Seq spawns; @@ -264,7 +264,7 @@ public class Waves{ {dagger, mace, fortress, scepter, reign}, {nova, pulsar, quasar, vela, corvus}, {crawler, atrax, spiroct, arkyid, toxopid}, - {flare, horizon, rand.chance(0.2) && difficulty > 0.5 ? poly : zenith, rand.chance(0.5) ? quad : antumbra, rand.chance(0.1) ? quad : eclipse} + {flare, horizon, zenith, rand.chance(0.5) ? quad : antumbra, rand.chance(0.1) ? quad : eclipse} }; //required progression: