From 643506e39b6dfd444b82b0b590f56d212462f78e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 13 Jan 2025 23:46:44 -0500
Subject: [PATCH] Misc fixes

---
 core/src/mindustry/ai/Pathfinder.java         | 11 +++++++++--
 core/src/mindustry/content/Blocks.java        | 11 ++++++-----
 core/src/mindustry/editor/WaveInfoDialog.java |  1 -
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
index c6a2ed0528..615568aed7 100644
--- a/core/src/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -39,7 +39,8 @@ public class Pathfinder implements Runnable{
     public static final int
         costGround = 0,
         costLegs = 1,
-        costNaval = 2;
+        costNaval = 2,
+        costHover = 3;
 
     public static final Seq<PathCost> costTypes = Seq.with(
         //ground
@@ -63,7 +64,13 @@ public class Pathfinder implements Runnable{
             PathTile.health(tile) * 5 +
             (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
             (PathTile.deep(tile) ? 0 : 1) +
-            (PathTile.damages(tile) ? 35 : 0)
+            (PathTile.damages(tile) ? 35 : 0),
+
+        //hover
+        (team, tile) ->
+            (((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 +
+            PathTile.health(tile) * 5 +
+            (PathTile.nearSolid(tile) ? 2 : 0)
     );
 
     /** tile data, see PathTileStruct - kept as a separate array for threading reasons */
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 7bc14ddaa6..6300222ebf 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -4112,7 +4112,7 @@ public class Blocks{
                 hitEffect = despawnEffect = Fx.hitSquaresColor;
                 buildingDamageMultiplier = 0.2f;
             }},
-            Items.oxide, new BasicBulletType(8f, 95){{
+            Items.oxide, new BasicBulletType(8f, 120){{
                 knockback = 3f;
                 width = 25f;
                 hitSize = 7f;
@@ -4456,6 +4456,7 @@ public class Blocks{
                 reloadMultiplier = 0.85f;
                 speed = 9.5f;
                 width = height = 16;
+                pierceCap = 2;
                 shrinkY = 0.3f;
                 backSprite = "large-bomb-back";
                 sprite = "mine-bullet";
@@ -4982,7 +4983,8 @@ public class Blocks{
                             fragSpread = 37f;
                             fragBullet = new BulletType(){{
                                 shootEffect = Fx.shootBig;
-                                smokeEffect = Fx.shootSmokeMissile;
+                                smokeEffect = Fx.shootSmokeMissileColor;
+                                hitColor = engineColor;
                                 ammoMultiplier = 1f;
 
                                 spawnUnit = new MissileUnitType("scathe-missile-surge-split"){{
@@ -4994,9 +4996,8 @@ public class Blocks{
                                     engineLayer = Layer.effect;
                                     engineSize = 2.2f;
                                     engineOffset = 8f;
-                                    rotateSpeed = 1.35f;
+                                    rotateSpeed = 1.4f;
                                     trailLength = 12;
-                                    //missileAccelTime = 20f;
                                     lowAltitude = true;
                                     loopSound = Sounds.missileTrail;
                                     loopSoundVolume = 0.6f;
@@ -5016,7 +5017,7 @@ public class Blocks{
                                         shootOnDeath = true;
                                         shake = 10f;
                                         bullet = new ExplosionBulletType(340f, 35f){{
-                                            lightning = 5;
+                                            lightning = 6;
                                             lightningDamage = 35f;
                                             lightningLength = 8;
 
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index e36bada5ae..b4bc26acc2 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -47,7 +47,6 @@ public class WaveInfoDialog extends BaseDialog{
         });
         hidden(() -> state.rules.spawns = groups);
 
-        onResize(this::setup);
         addCloseButton();
 
         buttons.button("@waves.edit", Icon.edit, () -> {