Global drone repair / Fixed item bridge

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -2,7 +2,7 @@ package io.anuke.mindustry.ai;
 
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.*;
-import io.anuke.mindustry.content.Items;
+import com.badlogic.gdx.utils.Bits;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -14,10 +14,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
 import io.anuke.ucore.core.Events;
 import io.anuke.ucore.function.Predicate;
-import io.anuke.ucore.util.EnumSet;
-import io.anuke.ucore.util.Geometry;
-import io.anuke.ucore.util.Mathf;
-import io.anuke.ucore.util.ThreadArray;
+import io.anuke.ucore.util.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -33,12 +30,14 @@ public class BlockIndexer{
     private final static int structQuadrantSize = 12;
 
     /**Set of all ores that are being scanned.*/
-    private final ObjectSet<Item> scanOres = ObjectSet.with(Items.copper, Items.coal, Items.lead, Items.thorium, Items.titanium);
+    private final ObjectSet<Item> scanOres = new ObjectSet<Item>(){{addAll(Item.getAllOres());}};
     private final ObjectSet<Item> itemSet = new ObjectSet<>();
     /**Stores all ore quadtrants on the map.*/
     private ObjectMap<Item, ObjectSet<Tile>> ores;
     /**Tags all quadrants.*/
     private Bits[] structQuadrants;
+    /**Stores all damaged tile entities by team.*/
+    private ObjectSet<Tile>[] damagedTiles = new ObjectSet[Team.all.length];
 
     /**Maps teams to a map of flagged tiles by type.*/
     private ObjectSet<Tile>[][] flagMap = new ObjectSet[Team.all.length][BlockFlag.all.length];
@@ -62,7 +61,9 @@ public class BlockIndexer{
         });
 
         Events.on(WorldLoadEvent.class, event -> {
+            damagedTiles = new ObjectSet[Team.all.length];
             flagMap = new ObjectSet[Team.all.length][BlockFlag.all.length];
+
             for(int i = 0; i < flagMap.length; i++){
                 for(int j = 0; j < BlockFlag.all.length; j++){
                     flagMap[i][j] = new ObjectSet<>();
@@ -79,7 +80,13 @@ public class BlockIndexer{
 
             for(int x = 0; x < world.width(); x++){
                 for(int y = 0; y < world.height(); y++){
-                    process(world.tile(x, y));
+                    Tile tile = world.tileWorld(x, y);
+
+                    process(tile);
+
+                    if(tile.entity != null && tile.entity.healthf() < 0.9999f){
+                        notifyTileDamaged(tile.entity);
+                    }
                 }
             }
 
@@ -97,6 +104,28 @@ public class BlockIndexer{
         return flagMap[team.ordinal()];
     }
 
+    /**Returns all damaged tiles by team.*/
+    public ObjectSet<Tile> getDamaged(Team team){
+        returnArray.clear();
+
+        if(damagedTiles[team.ordinal()] == null){
+            damagedTiles[team.ordinal()] = new ObjectSet<>();
+        }
+
+        ObjectSet<Tile> set = damagedTiles[team.ordinal()];
+        for(Tile tile : set){
+            if(tile.entity == null || tile.entity.getTeam() != team || tile.entity.healthf() >= 0.9999f){
+                returnArray.add(tile);
+            }
+        }
+
+        for(Tile tile : returnArray){
+            set.remove(tile);
+        }
+
+        return set;
+    }
+
     /**Get all allied blocks with a flag.*/
     public ObjectSet<Tile> getAllied(Team team, BlockFlag type){
         return flagMap[team.ordinal()][type.ordinal()];
@@ -115,6 +144,15 @@ public class BlockIndexer{
         return returnArray;
     }
 
+    public void notifyTileDamaged(TileEntity entity){
+        if(damagedTiles[entity.getTeam().ordinal()] == null){
+            damagedTiles[entity.getTeam().ordinal()] = new ObjectSet<>();
+        }
+
+        ObjectSet<Tile> set = damagedTiles[entity.getTeam().ordinal()];
+        set.add(entity.tile);
+    }
+
     public TileEntity findTile(Team team, float x, float y, float range, Predicate<Tile> pred){
         TileEntity closest = null;
         float dst = 0;