Store the things also for the rooms, fixes NPE on some room updates

Author: tonihele

src/toniarts/openkeeper/game/component/RoomComponent.java

@@ -17,7 +17,6 @@
 package toniarts.openkeeper.game.component;
 
 import com.simsilica.es.EntityComponent;
-import toniarts.openkeeper.tools.convert.map.Thing;
 
 /**
  * A base room component. This entity is a room
@@ -28,7 +27,6 @@ public class RoomComponent implements EntityComponent {
 
     public short roomId;
     public boolean destroyed = false;
-    public Thing.Room.Direction direction;
 
     public RoomComponent() {
         // For serialization
@@ -38,10 +36,9 @@ public RoomComponent(short roomId) {
         this.roomId = roomId;
     }
 
-    public RoomComponent(short roomId, boolean destroyed, Thing.Room.Direction direction) {
+    public RoomComponent(short roomId, boolean destroyed) {
         this.roomId = roomId;
         this.destroyed = destroyed;
-        this.direction = direction;
     }
 
 }

src/toniarts/openkeeper/game/controller/RoomControllerFactory.java

@@ -95,7 +95,7 @@ public static IRoomController constructRoom(EntityData entityData, KwdFile kwdFi
 
     private static void setRoomComponents(EntityId entity, EntityData entityData, RoomInstance roomInstance) {
         entityData.setComponents(entity,
-                new RoomComponent(roomInstance.getRoom().getRoomId(), roomInstance.isDestroyed(), roomInstance.getDirection()),
+                new RoomComponent(roomInstance.getRoom().getRoomId(), roomInstance.isDestroyed()),
                 new Owner(roomInstance.getOwnerId(), roomInstance.getOwnerId()));
     }
 

src/toniarts/openkeeper/view/map/MapViewController.java

@@ -62,7 +62,6 @@
 import toniarts.openkeeper.view.map.construction.RoomConstructor;
 import toniarts.openkeeper.view.map.construction.SingleQuadConstructor;
 import toniarts.openkeeper.view.map.construction.WaterConstructor;
-import toniarts.openkeeper.world.room.GenericRoom;
 
 /**
  * Loads whole maps, and handles the maps
@@ -85,20 +84,16 @@ public abstract class MapViewController implements ILoader<KwdFile> {
     private List<Node> pages;
     private final KwdFile kwdFile;
     private Node map;
-    //private final MapData mapData;
     private final AssetManager assetManager;
     private final IMapInformation mapClientService;
-    //private final EffectManagerState effectManager;
     private Node roomsNode;
     private final short playerId;
-    // private final WorldState worldState;
-    //private final ObjectLoader objectLoader;
-    // private final List<RoomInstance> rooms = new ArrayList<>(); // The list of rooms
     private final Set<Point> flashedTiles = new HashSet<>();
     private final List<EntityInstance<Terrain>> waterBatches = new ArrayList<>(); // Lakes and rivers
     private final List<EntityInstance<Terrain>> lavaBatches = new ArrayList<>(); // Lakes and rivers, but hot
     private final Map<Point, RoomInstance> roomCoordinates = new HashMap<>(); // A quick glimpse whether room at specific coordinates is already "found"
     private final Map<RoomInstance, Spatial> roomNodes = new HashMap<>(); // Room instances by node
+    private final Map<Point, Thing.Room> roomThings = new HashMap<>();
     private final Map<RoomInstance, RoomConstructor> roomActuals = new HashMap<>(); // Rooms by room constructor
     private final Map<Point, EntityInstance<Terrain>> terrainBatchCoordinates = new HashMap<>(); // A quick glimpse whether terrain batch at specific coordinates is already "found"
 
@@ -553,19 +548,10 @@ private RoomInstance handleRoom(Point p, Room room, Thing.Room thing) {
             return roomInstance;
         }
 
-        RoomInstance roomInstance = new RoomInstance(room, thing);
-        findRoom(p, roomInstance);
+        RoomInstance roomInstance = new RoomInstance(room, thing != null ? thing : roomThings.get(p));
+        findRoom(p, roomInstance, thing);
         findRoomWallSections(roomInstance);
-        //rooms.add(roomInstance);
-
-        // Put the thing attributes in
-//        if (thing != null) {
-//            for (Point roomPoint : roomInstance.getCoordinates()) {
-//                MapTile tile = mapData.getTile(roomPoint);
-//                tile.setPlayerId(thing.getPlayerId());
-//                tile.setHealth((int) (tile.getTerrain().getMaxHealth() * (thing.getInitialHealth() / 100f)));
-//            }
-//        }
+
         Spatial roomNode = handleRoom(roomInstance);
         if (roomNode != null) {
             roomsNode.attachChild(roomNode);
@@ -632,8 +618,6 @@ private void handleTop(IMapTileInformation tile, Terrain terrain, Node pageNode)
         topTileNode.attachChild(spatial);
         setTileMaterialToGeometries(tile, topTileNode);
         AssetUtils.translateToTile(topTileNode, p);
-
-//        tile.setTopNode(topTileNode);
     }
 
     private void handleSide(IMapTileInformation tile, Node pageNode) {
@@ -650,8 +634,6 @@ private void handleSide(IMapTileInformation tile, Node pageNode) {
 
         setTileMaterialToGeometries(tile, sideTileNode);
         AssetUtils.translateToTile(sideTileNode, p);
-
-//        tile.setSideNode(sideTileNode);
     }
 
     public void flashTile(boolean enabled, List<Point> points) {
@@ -736,8 +718,9 @@ public static boolean hasRoomWalls(Room room) {
      *
      * @param p starting point
      * @param roomInstance the room instance
+     * @param thing fixed room item
      */
-    private void findRoom(Point p, RoomInstance roomInstance) {
+    private void findRoom(Point p, RoomInstance roomInstance, Thing.Room thing) {
         IMapTileInformation tile = getMapData().getTile(p);
 
         // Get the terrain
@@ -750,18 +733,21 @@ private void findRoom(Point p, RoomInstance roomInstance) {
                     // Add the coordinate
                     roomCoordinates.put(p, roomInstance);
                     roomInstance.addCoordinate(p);
+                    if (thing != null) {
+                        roomThings.put(p, thing);
+                    }
 
                     // Find north
-                    findRoom(new Point(p.x, p.y - 1), roomInstance);
+                    findRoom(new Point(p.x, p.y - 1), roomInstance, thing);
 
                     // Find east
-                    findRoom(new Point(p.x + 1, p.y), roomInstance);
+                    findRoom(new Point(p.x + 1, p.y), roomInstance, thing);
 
                     // Find south
-                    findRoom(new Point(p.x, p.y + 1), roomInstance);
+                    findRoom(new Point(p.x, p.y + 1), roomInstance, thing);
 
                     // Find west
-                    findRoom(new Point(p.x - 1, p.y), roomInstance);
+                    findRoom(new Point(p.x - 1, p.y), roomInstance, thing);
                 }
             }
         }
@@ -869,26 +855,6 @@ public static void setTerrainMaterialLighting(Material material, Terrain terrain
         material.setBoolean("UseMaterialColors", false); // Hmm...
     }
 
-    /**
-     * Get coordinate / room instance mapping
-     *
-     * @return mapping
-     */
-    public HashMap<Point, RoomInstance> getRoomCoordinates() {
-//        return roomCoordinates;
-        return null;
-    }
-
-    /**
-     * Get list of room instances
-     *
-     * @return room instances
-     */
-    protected List<RoomInstance> getRooms() {
-//        return rooms;
-        return null;
-    }
-
     /**
      * Remove all the given room instances (and actually removes them from the
      * scene)
@@ -899,11 +865,7 @@ protected void removeRoomInstances(RoomInstance... instances) {
         for (RoomInstance instance : instances) {
             roomsNode.detachChild(roomNodes.get(instance));
             roomNodes.remove(instance);
-            //rooms.remove(instance);
 
-            // Signal the room
-            //GenericRoom room = roomActuals.get(instance);
-            //room.destroy();
             roomActuals.remove(instance);
             for (Point p : instance.getCoordinates()) {
                 roomCoordinates.remove(p);
@@ -1049,38 +1011,6 @@ protected void updateRoom(RoomInstance roomInstance) {
 
         // Redraw
         updateRoomWalls(roomInstance);
-//        roomActuals.get(roomInstance).construct();
-//        roomsNode.attachChild(roomActuals.get(roomInstance).construct());
-    }
-
-    /**
-     * Get a rooms by knowing its instance
-     *
-     * @return room
-     */
-    public Map<RoomInstance, GenericRoom> getRoomActuals() {
-//        return roomActuals;
-        return null;
-    }
-
-    /**
-     * Get rooms by function.<br> FIXME: Should the player have ready lists?
-     *
-     * @param objectType the function
-     * @param playerId the player id, can be null
-     * @return list of rooms that match the criteria
-     */
-    public List<GenericRoom> getRoomsByFunction(GenericRoom.ObjectType objectType, Short playerId) {
-        List<GenericRoom> roomsList = new ArrayList<>();
-//        for (Entry<RoomInstance, GenericRoom> entry : roomActuals.entrySet()) {
-//            if (playerId != null && entry.getKey().getOwnerId() != playerId) {
-//                continue;
-//            }
-//            if (entry.getValue().hasObjectControl(objectType)) {
-//                roomsList.add(entry.getValue());
-//            }
-//        }
-        return roomsList;
     }
 
     /**