From 8771504cbe1b79e6cf681d863188c9b8fb86cbeb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 5 Apr 2025 12:59:26 -0400 Subject: [PATCH] Duo range buff + graphite ammo buff --- core/assets/bundles/bundle.properties | 1 - core/src/mindustry/content/Blocks.java | 17 +++++++++++++---- .../mindustry/entities/comp/BuildingComp.java | 11 +++++++---- .../ui/dialogs/SettingsMenuDialog.java | 3 +-- .../world/blocks/campaign/LandingPad.java | 9 +-------- .../world/blocks/payloads/PayloadRouter.java | 9 +-------- .../world/blocks/production/BeamDrill.java | 10 ++-------- .../world/blocks/production/Drill.java | 8 +------- 8 files changed, 26 insertions(+), 42 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 69711b4756..134839949f 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1231,7 +1231,6 @@ setting.bloomblur.name = Bloom Blur setting.effects.name = Display Effects setting.destroyedblocks.name = Display Destroyed Blocks setting.blockstatus.name = Display Block Status -setting.displayselection.name = Display Block Configs on Hover setting.conveyorpathfinding.name = Conveyor Placement Pathfinding setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Save Interval diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5e2311bab2..96db3e160a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3075,17 +3075,26 @@ public class Blocks{ Items.graphite, new BasicBulletType(3.5f, 18){{ width = 9f; height = 12f; - reloadMultiplier = 0.6f; ammoMultiplier = 4; lifetime = 60f; + rangeChange = 16f; + + hitColor = backColor = trailColor = Color.valueOf("858a9b"); + frontColor = Color.valueOf("dae1ee"); }}, Items.silicon, new BasicBulletType(3f, 12){{ width = 7f; height = 9f; - homingPower = 0.1f; + homingPower = 0.2f; reloadMultiplier = 1.5f; ammoMultiplier = 5; lifetime = 60f; + + trailLength = 5; + trailWidth = 1.5f; + + hitColor = backColor = trailColor = Color.valueOf("707594"); + frontColor = Color.valueOf("999ba0"); }} ); @@ -3107,7 +3116,7 @@ public class Blocks{ recoil = 0.5f; shootY = 3f; reload = 20f; - range = 110; + range = 160; shootCone = 15f; ammoUseEffect = Fx.casing1; health = 250; @@ -3116,7 +3125,7 @@ public class Blocks{ coolant = consumeCoolant(0.1f); researchCostMultiplier = 0.05f; - limitRange(); + limitRange(5f); }}; scatter = new ItemTurret("scatter"){{ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index eaf5020e19..b6f2be2763 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1203,10 +1203,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, block.drawOverlay(x, y, rotation); } - public void drawItemSelection(UnlockableContent selection){ - if(selection != null && Core.settings.getBool("displayselection", true)){ - TextureRegion region = selection.fullIcon; - Draw.rect(region, x, y + block.size * tilesize / 2f + 4, 8f * region.ratio(), 8f); + public void drawItemSelection(@Nullable UnlockableContent selection){ + if(selection != null){ + float dx = x - block.size * tilesize/2f, dy = y + block.size * tilesize/2f, s = iconSmall / 4f; + Draw.mixcol(Color.darkGray, 1f); + Draw.rect(selection.fullIcon, dx, dy - 1, s, s); + Draw.reset(); + Draw.rect(selection.fullIcon, dx, dy, s, s); } } diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index ce99608f4c..4fb56d595a 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -400,7 +400,7 @@ public class SettingsMenuDialog extends BaseDialog{ graphics.sliderPref("unitlaseropacity", 100, 0, 100, 5, s -> s + "%"); graphics.sliderPref("bridgeopacity", 100, 0, 100, 5, s -> s + "%"); - + graphics.sliderPref("maxmagnificationmultiplierpercent", 100, 100, 200, 25, s -> { if(ui.settings != null){ Core.settings.put("maxzoomingamemultiplier", (float)s / 100.0f); @@ -468,7 +468,6 @@ public class SettingsMenuDialog extends BaseDialog{ graphics.checkPref("drawlight", true); graphics.checkPref("destroyedblocks", true); graphics.checkPref("blockstatus", false); - graphics.checkPref("displayselection", true); graphics.checkPref("playerchat", true); if(!mobile){ graphics.checkPref("coreitems", true); diff --git a/core/src/mindustry/world/blocks/campaign/LandingPad.java b/core/src/mindustry/world/blocks/campaign/LandingPad.java index dbff30f05e..180825e9b3 100644 --- a/core/src/mindustry/world/blocks/campaign/LandingPad.java +++ b/core/src/mindustry/world/blocks/campaign/LandingPad.java @@ -341,14 +341,7 @@ public class LandingPad extends Block{ @Override public void drawSelect(){ - if(config != null){ - - float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f; - Draw.mixcol(Color.darkGray, 1f); - Draw.rect(config.fullIcon, dx, dy - 1, s, s); - Draw.reset(); - Draw.rect(config.fullIcon, dx, dy, s, s); - } + drawItemSelection(config); } @Override diff --git a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java index e2219de3cf..ae165faa64 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java @@ -1,6 +1,5 @@ package mindustry.world.blocks.payloads; -import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; @@ -158,13 +157,7 @@ public class PayloadRouter extends PayloadConveyor{ @Override public void drawSelect(){ - if(sorted != null){ - float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f; - Draw.mixcol(Color.darkGray, 1f); - Draw.rect(sorted.fullIcon, dx, dy - 1, s, s); - Draw.reset(); - Draw.rect(sorted.fullIcon, dx, dy, s, s); - } + drawItemSelection(sorted); } @Override diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java index 008953ff51..9921e4d7cf 100644 --- a/core/src/mindustry/world/blocks/production/BeamDrill.java +++ b/core/src/mindustry/world/blocks/production/BeamDrill.java @@ -231,13 +231,7 @@ public class BeamDrill extends Block{ @Override public void drawSelect(){ - if(lastItem != null){ - float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f; - Draw.mixcol(Color.darkGray, 1f); - Draw.rect(lastItem.fullIcon, dx, dy - 1, s, s); - Draw.reset(); - Draw.rect(lastItem.fullIcon, dx, dy, s, s); - } + drawItemSelection(lastItem); } @Override @@ -247,7 +241,7 @@ public class BeamDrill extends Block{ if(lasers[0] == null) updateLasers(); warmup = Mathf.approachDelta(warmup, Mathf.num(efficiency > 0), 1f / 60f); - + updateFacing(); float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency); diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index cd54b6f0c5..12ef7bace5 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -261,13 +261,7 @@ public class Drill extends Block{ @Override public void drawSelect(){ - if(dominantItem != null){ - float dx = x - size * tilesize/2f, dy = y + size * tilesize/2f, s = iconSmall / 4f; - Draw.mixcol(Color.darkGray, 1f); - Draw.rect(dominantItem.fullIcon, dx, dy - 1, s, s); - Draw.reset(); - Draw.rect(dominantItem.fullIcon, dx, dy, s, s); - } + drawItemSelection(dominantItem); } @Override