From 3d48f0f6690b441921207b758d62d452bc64f7ea Mon Sep 17 00:00:00 2001 From: Lucas Delcros Date: Thu, 31 Dec 2015 17:55:00 +0100 Subject: [PATCH] entities spawn is now checked is speciesArray (see issue) --- src/map_generation/map/MapBuilder.java | 3 ++- src/map_generation/tests/MapTests.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/map_generation/map/MapBuilder.java b/src/map_generation/map/MapBuilder.java index b696ced..c23b473 100644 --- a/src/map_generation/map/MapBuilder.java +++ b/src/map_generation/map/MapBuilder.java @@ -164,7 +164,8 @@ public final class MapBuilder implements Serializable{ int jj=rooms.get(room).j1+r.nextInt(rooms.get(room).width); int posY=ii*Point.TileScale; int posX=jj*Point.TileScale; - if(tb[jj][ii].getType() != TileType.WATER) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i)); + //if(tb[jj][ii].getType() != TileType.WATER) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i)); + if(SpeciesArray.canSpawn(Point.construct(posX, posY), "Ronflex")) entities.add(SpeciesArray.create(posX,posY,100,"Ronflex","Monster "+i)); } } diff --git a/src/map_generation/tests/MapTests.java b/src/map_generation/tests/MapTests.java index 5fe02ec..6677dad 100644 --- a/src/map_generation/tests/MapTests.java +++ b/src/map_generation/tests/MapTests.java @@ -32,5 +32,5 @@ public class MapTests { Map map = SurfacesMapGeneration.roomsRandomGeneration(20, 500); assertFalse("The player has spawn on water !", map.getTileAt(map.getPositionPlayerStart()).getType() == TileType.WATER); } - + } -- GitLab