mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-30 17:34:23 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken blocks not updating path

Browse Source
This commit is contained in:
Anuken 2018-05-02 17:26:20 -04:00
parent 496498b913
commit 42b3b19a57
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ai/BlockIndexer.java
View File

@ -6,8 +6,8 @@ import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.mindustry.game.EventType.TileChangeEvent;
import io.anuke.mindustry.game.EventType.WorldLoadEvent;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.BlockFlag;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Events;
import io.anuke.ucore.util.EnumSet;

25
core/src/io/anuke/mindustry/ai/Pathfinder.java
View File

@ -20,13 +20,22 @@ import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Vars.world;
public class Pathfinder {
private long maxUpdate = TimeUtils.millisToNanos(5);
private long maxUpdate = TimeUtils.millisToNanos(4);
private PathData[] paths;
private IntArray blocked = new IntArray();
public Pathfinder(){
Events.on(WorldLoadEvent.class, this::clear);
Events.on(TileChangeEvent.class, this::update);
Events.on(TileChangeEvent.class, tile -> {
for(TeamData data : state.teams.getTeams()){
if(data.team != tile.getTeam() && paths[data.team.ordinal()].weights[tile.x][tile.y] >= Float.MAX_VALUE){
update(tile, data.team);
}
}
update(tile, tile.getTeam());
});
}
public void update(){
@ -68,21 +77,21 @@ public class Pathfinder {
private boolean passable(Tile tile, Team team){
return (tile.getWallID() == 0 && !(tile.floor().liquid && (tile.floor().damageTaken > 0 || tile.floor().drownTime > 0))) || (tile.breakable()
&& tile.getTeam() != team);
&& (tile.getTeam() != team || !tile.solid()));
}
private void update(Tile tile){
if(paths[tile.getTeam().ordinal()] != null) {
PathData path = paths[tile.getTeam().ordinal()];
private void update(Tile tile, Team team){
if(paths[team.ordinal()] != null) {
PathData path = paths[team.ordinal()];
if(!passable(tile, tile.getTeam())){
if(!passable(tile, team)){
path.weights[tile.x][tile.y] = Float.MAX_VALUE;
}
path.search ++;
path.frontier.clear();
ObjectSet<Tile> set = world.indexer().getEnemy(tile.getTeam(), BlockFlag.target);
ObjectSet<Tile> set = world.indexer().getEnemy(team, BlockFlag.target);
for(Tile other : set){
path.weights[other.x][other.y] = 0;
path.searches[other.x][other.y] = path.search;

4
core/src/io/anuke/mindustry/game/EventType.java
View File

@ -30,6 +30,10 @@ public class EventType {
void handle(Tile tile);
}
public interface TileRemoveEvent extends Event{
void handle(Tile tile, Team oldTeam);
}
public interface StateChangeEvent extends Event{
void handle(State from, State to);
}