Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-06-29 09:48:31 -04:00
parent f17719f08e cc41b99c75
commit c64b6092d7
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/type/UnitType.java
View File

@@ -684,8 +684,8 @@ public class UnitType extends UnlockableContent{
if(pathCost == null){
pathCost =
example instanceof WaterMovec ? ControlPathfinder.costNaval :
allowLegStep ? ControlPathfinder.costLegs :
naval ? ControlPathfinder.costNaval :
allowLegStep || example instanceof Crawlc ? ControlPathfinder.costLegs :
hovering ? ControlPathfinder.costHover :
ControlPathfinder.costGround;
}

5
core/src/mindustry/world/blocks/defense/RegenProjector.java
View File

@@ -5,7 +5,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
@@ -55,9 +54,11 @@ public class RegenProjector extends Block{
x *= tilesize;
y *= tilesize;
x += offset;
y += offset;
Drawf.dashSquare(baseColor, x, y, range * tilesize);
indexer.eachBlock(Vars.player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
indexer.eachBlock(player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
Drawf.selected(t, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)));
});
}