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

Conveyor upgrade system (#3912)

Browse Source 
* conveyor/conduit upgrading system

* style
This commit is contained in:
Slava0135
2020-12-15 18:52:20 +03:00
committed by GitHub
parent 4b1c55b876
commit 0c581c520f
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/input/InputHandler.java
View File

@@ -32,6 +32,7 @@ import mindustry.ui.fragments.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.ConstructBlock.*;
import mindustry.world.blocks.distribution.*;
import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.power.*;
import mindustry.world.blocks.storage.CoreBlock.*;
@@ -1161,7 +1162,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
if(diagonal){
points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
Tile start = world.tile(startX, startY);
Tile end = world.tile(endX, endY);
if(block != null && block instanceof Autotiler
&& start.build instanceof ChainedBuilding && end.build instanceof ChainedBuilding
&& block.canReplace(end.build.block) && block.canReplace(start.build.block)){
points = Placement.upgradeLine(startX, startY, endX, endY);
}else{
points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
}
}else{
points = Placement.normalizeLine(startX, startY, endX, endY);
}

17
core/src/mindustry/input/Placement.java
View File

@@ -5,7 +5,9 @@ import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.pooling.*;
import mindustry.gen.*;
import mindustry.world.*;
import mindustry.world.blocks.distribution.*;
import static mindustry.Vars.*;
@@ -23,7 +25,6 @@ public class Placement{
/** Normalize a diagonal line into points. */
public static Seq<Point2> pathfindLine(boolean conveyors, int startX, int startY, int endX, int endY){
Pools.freeAll(points);
points.clear();
if(conveyors && Core.settings.getBool("conveyorpathfinding")){
if(astar(startX, startY, endX, endY)){
@@ -54,6 +55,20 @@ public class Placement{
return points;
}
public static Seq<Point2> upgradeLine(int startX, int startY, int endX, int endY){
Pools.freeAll(points);
points.clear();
Building building = world.tile(startX, startY).build;
points.add(Pools.obtain(Point2.class, Point2::new).set(startX, startY));
while(building.tile.x != endX || building.tile.y != endY){
ChainedBuilding chained = (ChainedBuilding)building;
if(chained.next() == null) return pathfindLine(true, startX, startY, endX, endY);
building = chained.next();
points.add(Pools.obtain(Point2.class, Point2::new).set(building.tile.x, building.tile.y));
}
return points;
}
private static float tileHeuristic(Tile tile, Tile other){
Block block = control.input.block;