Duo range buff + graphite ammo buff

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

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"){{

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){
+    public void drawItemSelection(@Nullable UnlockableContent selection){
-        if(selection != null && Core.settings.getBool("displayselection", true)){
+        if(selection != null){
-            TextureRegion region = selection.fullIcon;
+            float dx = x - block.size * tilesize/2f, dy = y + block.size * tilesize/2f, s = iconSmall / 4f;
-            Draw.rect(region, x, y + block.size * tilesize / 2f + 4, 8f * region.ratio(), 8f);
+            Draw.mixcol(Color.darkGray, 1f);
+            Draw.rect(selection.fullIcon, dx, dy - 1, s, s);
+            Draw.reset();
+            Draw.rect(selection.fullIcon, dx, dy, s, s);
         }
     }
 

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);

core/src/mindustry/world/blocks/campaign/LandingPad.java

@@ -341,14 +341,7 @@ public class LandingPad extends Block{
 
         @Override
         public void drawSelect(){
-            if(config != null){
+            drawItemSelection(config);
-
-                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);
-            }
         }
 
         @Override

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){
+            drawItemSelection(sorted);
-                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);
-            }
         }
 
         @Override

core/src/mindustry/world/blocks/production/BeamDrill.java

@@ -231,13 +231,7 @@ public class BeamDrill extends Block{
         @Override
         public void drawSelect(){
 
-            if(lastItem != null){
+            drawItemSelection(lastItem);
-                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);
-            }
         }
 
         @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);

core/src/mindustry/world/blocks/production/Drill.java

@@ -261,13 +261,7 @@ public class Drill extends Block{
 
         @Override
         public void drawSelect(){
-            if(dominantItem != null){
+            drawItemSelection(dominantItem);
-                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);
-            }
         }
 
         @Override