From 181ad1016c5d0b8f3b10f834509d5fdcfb330016 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 30 Oct 2020 16:05:40 -0400 Subject: [PATCH] Reduced tech costs / Added missing blocks to fungal pass --- core/assets/maps/fungalPass.msav | Bin 10618 -> 10624 bytes core/src/mindustry/content/TechTree.java | 20 ++++++++++---------- core/src/mindustry/game/Waves.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index fb364034b5fec7efaa4d692de457a7dd8b7d6339..99dae10492b2b1f580143bd706105409dc08fd45 100644 GIT binary patch literal 10624 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 literal 10618 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 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: