From 6c30f58507936e2785b703a0a68d48477c32a328 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 13 Feb 2022 21:43:45 -0500 Subject: [PATCH] Tech tree tweaks --- core/src/mindustry/content/Blocks.java | 2 ++ core/src/mindustry/content/ErekirTechTree.java | 2 ++ core/src/mindustry/graphics/Drawf.java | 2 +- core/src/mindustry/world/Block.java | 2 +- core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 22ad2db42f..7dcc003325 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3608,6 +3608,7 @@ public class Blocks{ moveTime = 35f; canOverdrive = false; health = 800; + researchCostMultiplier = 4f; }}; reinforcedPayloadRouter = new PayloadRouter("reinforced-payload-router"){{ @@ -3615,6 +3616,7 @@ public class Blocks{ moveTime = 35f; health = 800; canOverdrive = false; + researchCostMultiplier = 4f; }}; payloadMassDriver = new PayloadMassDriver("payload-mass-driver"){{ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 2a065d9564..21d894257a 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -20,6 +20,8 @@ public class ErekirTechTree{ costMultipliers.put(Items.phaseFabric, 4); costMultipliers.put(Items.thorium, 9); costMultipliers.put(Items.graphite, 9); + //oxide is hard to make + costMultipliers.put(Items.oxide, 0.5f); //TODO remove Objective tmpNever = new Research(Items.fissileMatter); diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index d6483b60e3..cb0bc6f44b 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -119,7 +119,7 @@ public class Drawf{ } public static void dashLineDst(Color color, float x, float y, float x2, float y2){ - dashLine(color, x, y, x2, y2, (int)(Mathf.dst(x, y, x2, y2) / tilesize)); + dashLine(color, x, y, x2, y2, (int)(Mathf.dst(x, y, x2, y2) / tilesize * 1.6f)); } public static void dashLine(Color color, float x, float y, float x2, float y2){ diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index c9b96d4698..3b0ea6b32d 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -160,7 +160,7 @@ public class Block extends UnlockableContent implements Senseable{ /** Clipping size of this block. Should be as large as the block will draw. */ public float clipSize = -1f; /** When placeRangeCheck is enabled, this is the range checked for enemy blocks. */ - public float placeOverlapRange = 30f; + public float placeOverlapRange = 60f; /** Max of timers used. */ public int timers = 0; /** Cache layer. Only used for 'cached' rendering. */ diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java index 1ad3ac4a15..59ce1cb3e0 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java @@ -16,7 +16,7 @@ import static mindustry.Vars.*; public class BaseTurret extends Block{ public float range = 80f; - public float placeOverlapMargin = 8 * 6f; + public float placeOverlapMargin = 8 * 7f; public float rotateSpeed = 5; public float coolantUsage = 0.2f;