From ca67b0f43cd4816e57c9432948805c3a7c0ae015 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 May 2022 00:24:44 -0400 Subject: [PATCH] launchCapacityMultiplier per-planet --- core/src/mindustry/Vars.java | 2 -- core/src/mindustry/content/Planets.java | 1 + core/src/mindustry/type/Planet.java | 2 ++ core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index b0f98ae7df..584b76cc7d 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -95,8 +95,6 @@ public class Vars implements Loadable{ public static final float buildingRange = 220f; /** range for moving items */ public static final float itemTransferRange = 220f; - /** multiplier for core item capacity when launching */ - public static final float launchCapacityMultiplier = 0.25f; /** range for moving items for logic units */ public static final float logicItemTransferRange = 45f; /** duration of time between turns in ticks */ diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 409c41ff2e..ea3680534b 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -121,6 +121,7 @@ public class Planets{ new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f) ); + launchCapacityMultiplier = 0.5f; sectorSeed = 2; allowWaves = true; allowWaveSimulation = true; diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 3b4b7e4c1d..766e6bea69 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -75,6 +75,8 @@ public class Planet extends UnlockableContent{ public int startSector = 0; /** Seed for sector base generation on this planet. -1 to use a random one based on ID. */ public int sectorSeed = -1; + /** multiplier for core item capacity when launching */ + public float launchCapacityMultiplier = 0.25f; /** Whether the bloom render effect is enabled. */ public boolean bloom = false; /** Whether this planet is displayed. */ diff --git a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java index b759bffbfe..7969450dcd 100644 --- a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java +++ b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java @@ -7,7 +7,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import mindustry.*; import mindustry.content.*; import mindustry.ctype.*; import mindustry.game.*; @@ -48,7 +47,7 @@ public class LaunchLoadoutDialog extends BaseDialog{ //updates sum requirements Runnable update = () -> { - int cap = lastCapacity = (int)(Vars.launchCapacityMultiplier * selected.findCore().itemCapacity); + int cap = lastCapacity = (int)(sector.planet.launchCapacityMultiplier * selected.findCore().itemCapacity); //cap resources based on core type ItemSeq resources = universe.getLaunchResources();