From 608e25c2ee7cd5706e7855fa9c678b3903b9af48 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 23 Jan 2022 15:45:40 -0500 Subject: [PATCH] Research tweaks --- core/assets/maps/onset.msav | Bin 32522 -> 32522 bytes .../src/mindustry/content/ErekirTechTree.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/onset.msav b/core/assets/maps/onset.msav index 9ea9f672f97a3d4142ff4448383d648db3d591de..a3d93eda5e9bb2d02e1ad750e3c6c6ce0c930ac1 100644 GIT binary patch delta 5501 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 erekirSector = Seq.with(new OnPlanet(Planets.erekir)); var costMultipliers = new ObjectFloatMap(); - costMultipliers.put(Items.silicon, 7); + costMultipliers.put(Items.silicon, 8); costMultipliers.put(Items.surgeAlloy, 4); costMultipliers.put(Items.phaseFabric, 4); - costMultipliers.put(Items.thorium, 8); - costMultipliers.put(Items.graphite, 6); + costMultipliers.put(Items.thorium, 9); + costMultipliers.put(Items.graphite, 8); Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> { context().researchCostMultipliers = costMultipliers;