mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 12:49:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes

Browse Source
This commit is contained in:
Anuken 2025-01-13 23:46:44 -05:00
parent 59e64ab37c
commit 643506e39b
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/ai/Pathfinder.java
View File

@ -39,7 +39,8 @@ public class Pathfinder implements Runnable{
public static final int public static final int
costGround = 0, costGround = 0,
costLegs = 1, costLegs = 1,
costNaval = 2; costNaval = 2,
costHover = 3;
public static final Seq<PathCost> costTypes = Seq.with( public static final Seq<PathCost> costTypes = Seq.with(
//ground //ground
@ -63,7 +64,13 @@ public class Pathfinder implements Runnable{
PathTile.health(tile) * 5 + PathTile.health(tile) * 5 +
(PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) + (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
(PathTile.deep(tile) ? 0 : 1) + (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 */ /** tile data, see PathTileStruct - kept as a separate array for threading reasons */

11
core/src/mindustry/content/Blocks.java
View File

@ -4112,7 +4112,7 @@ public class Blocks{
hitEffect = despawnEffect = Fx.hitSquaresColor; hitEffect = despawnEffect = Fx.hitSquaresColor;
buildingDamageMultiplier = 0.2f; buildingDamageMultiplier = 0.2f;
}}, }},
Items.oxide, new BasicBulletType(8f, 95){{ Items.oxide, new BasicBulletType(8f, 120){{
knockback = 3f; knockback = 3f;
width = 25f; width = 25f;
hitSize = 7f; hitSize = 7f;
@ -4456,6 +4456,7 @@ public class Blocks{
reloadMultiplier = 0.85f; reloadMultiplier = 0.85f;
speed = 9.5f; speed = 9.5f;
width = height = 16; width = height = 16;
pierceCap = 2;
shrinkY = 0.3f; shrinkY = 0.3f;
backSprite = "large-bomb-back"; backSprite = "large-bomb-back";
sprite = "mine-bullet"; sprite = "mine-bullet";
@ -4982,7 +4983,8 @@ public class Blocks{
fragSpread = 37f; fragSpread = 37f;
fragBullet = new BulletType(){{ fragBullet = new BulletType(){{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
smokeEffect = Fx.shootSmokeMissile; smokeEffect = Fx.shootSmokeMissileColor;
hitColor = engineColor;
ammoMultiplier = 1f; ammoMultiplier = 1f;
spawnUnit = new MissileUnitType("scathe-missile-surge-split"){{ spawnUnit = new MissileUnitType("scathe-missile-surge-split"){{
@ -4994,9 +4996,8 @@ public class Blocks{
engineLayer = Layer.effect; engineLayer = Layer.effect;
engineSize = 2.2f; engineSize = 2.2f;
engineOffset = 8f; engineOffset = 8f;
rotateSpeed = 1.35f; rotateSpeed = 1.4f;
trailLength = 12; trailLength = 12;
//missileAccelTime = 20f;
lowAltitude = true; lowAltitude = true;
loopSound = Sounds.missileTrail; loopSound = Sounds.missileTrail;
loopSoundVolume = 0.6f; loopSoundVolume = 0.6f;
@ -5016,7 +5017,7 @@ public class Blocks{
shootOnDeath = true; shootOnDeath = true;
shake = 10f; shake = 10f;
bullet = new ExplosionBulletType(340f, 35f){{ bullet = new ExplosionBulletType(340f, 35f){{
lightning = 5; lightning = 6;
lightningDamage = 35f; lightningDamage = 35f;
lightningLength = 8; lightningLength = 8;

1
core/src/mindustry/editor/WaveInfoDialog.java
View File

@ -47,7 +47,6 @@ public class WaveInfoDialog extends BaseDialog{
}); });
hidden(() -> state.rules.spawns = groups); hidden(() -> state.rules.spawns = groups);
onResize(this::setup);
addCloseButton(); addCloseButton();
buttons.button("@waves.edit", Icon.edit, () -> { buttons.button("@waves.edit", Icon.edit, () -> {