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

Additional fixes

Browse Source
This commit is contained in:
Anuken
2018-12-23 23:58:24 -05:00
parent 44e4ffbe62
commit 22b7086bea
56 changed files with 350 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/ai/BlockIndexer.java
+1 -2
View File
@@ -5,7 +5,6 @@ import io.anuke.arc.collection.*;
import io.anuke.arc.function.Predicate;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Geometry;
import io.anuke.arc.math.geom.Vector2;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -174,7 +173,7 @@ public class BlockIndexer{
TileEntity e = other.entity;
float ndst = Vector2.dst(x, y, e.x, e.y);
float ndst = Mathf.dst(x, y, e.x, e.y);
if(ndst < range && (closest == null || ndst < dst)){
dst = ndst;
closest = e;
core/src/io/anuke/mindustry/ai/Pathfinder.java
+3 -3
View File
@@ -4,7 +4,7 @@ import io.anuke.arc.Events;
import io.anuke.arc.collection.IntArray;
import io.anuke.arc.collection.Queue;
import io.anuke.arc.math.geom.Geometry;
import io.anuke.arc.math.geom.GridPoint2;
import io.anuke.arc.math.geom.Point2;
import io.anuke.arc.util.Structs;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -62,7 +62,7 @@ public class Pathfinder{
Tile target = null;
float tl = 0f;
for(GridPoint2 point : Geometry.d8){
for(Point2 point : Geometry.d8){
int dx = tile.x + point.x, dy = tile.y + point.y;
Tile other = world.tile(dx, dy);
@@ -150,7 +150,7 @@ public class Pathfinder{
float cost = path.weights[tile.x][tile.y];
if(cost < Float.MAX_VALUE){
for(GridPoint2 point : Geometry.d4){
for(Point2 point : Geometry.d4){
int dx = tile.x + point.x, dy = tile.y + point.y;
Tile other = world.tile(dx, dy);