ld44/slime-blood-and-pain
ld44/slime-blood-and-pain
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/Steffo99/LD44

Browse source
This commit is contained in:
Lorenzo Balugani 2019-04-27 17:18:59 +02:00
commit c53e5acdd2
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Assets/Scripts/Map.cs
View file

@ -42,11 +42,11 @@ public class MapRoom {
start.y = end.y; start.y = end.y;
end.y = swap; end.y = swap;
} }
if(end.x - start.x > maxRoomSize) { while(end.x - start.x > maxRoomSize) {
end.x--; end.x--;
start.x++; start.x++;
} }
if(end.y - start.y > maxRoomSize) { while(end.y - start.y > maxRoomSize) {
end.y--; end.y--;
start.y++; start.y++;
} }
@ -139,6 +139,9 @@ public class Map : MonoBehaviour
[BeforeStartAttribute] [BeforeStartAttribute]
public int maxRoomSize = 6; public int maxRoomSize = 6;
[BeforeStartAttribute]
public int maxRoomIterations = 100;
[BeforeStartAttribute] [BeforeStartAttribute]
public Sprite wallSprite; public Sprite wallSprite;
@ -161,10 +164,10 @@ public class Map : MonoBehaviour
return tile; return tile;
} }
private void InitTile(int x, int y, bool walkable, Sprite tile_sprite, bool roomPart) { private void InitTile(int x, int y, bool walkable, Sprite tileSprite, bool roomPart) {
Tile tile = GetTile(x, y); Tile tile = GetTile(x, y);
tile.walkable = walkable; tile.walkable = walkable;
tile.sprite = tile_sprite; tile.sprite = tileSprite;
tile.roomPart = roomPart; tile.roomPart = roomPart;
} }
@ -174,6 +177,7 @@ public class Map : MonoBehaviour
GameObject tileObject = Instantiate(tilePrefab, transform); GameObject tileObject = Instantiate(tilePrefab, transform);
tileObject.transform.position = new Vector3(x, y, 0); tileObject.transform.position = new Vector3(x, y, 0);
tiles[x, y] = tileObject; tiles[x, y] = tileObject;
tileObject.name = "Tile [" + x.ToString() + ", " + y.ToString() + "]";
Tile tile = tileObject.GetComponent<Tile>(); Tile tile = tileObject.GetComponent<Tile>();
tile.walkable = false; tile.walkable = false;
tile.sprite = wallSprite; tile.sprite = wallSprite;
@ -193,7 +197,7 @@ public class Map : MonoBehaviour
//Returns true if the room can be safely placed //Returns true if the room can be safely placed
for(int x = Mathf.Clamp(mr.start.x-1, 0, mapSize-1); x <= Mathf.Clamp(mr.end.x+1, 0, mapSize-1); x++) { for(int x = Mathf.Clamp(mr.start.x-1, 0, mapSize-1); x <= Mathf.Clamp(mr.end.x+1, 0, mapSize-1); x++) {
for(int y = Mathf.Clamp(mr.start.y-1, 0, mapSize-1); y <= Mathf.Clamp(mr.end.y+1, 0, mapSize-1); y++) { for(int y = Mathf.Clamp(mr.start.y-1, 0, mapSize-1); y <= Mathf.Clamp(mr.end.y+1, 0, mapSize-1); y++) {
if(GetTile(x, y).walkable) { if(GetTile(x, y).roomPart) {
return false; return false;
} }
} }
@ -233,15 +237,17 @@ public class Map : MonoBehaviour
private void GenerateMap() { private void GenerateMap() {
FillWithWalls(); FillWithWalls();
while(rooms.Count < roomsToGenerate) { int roomIterations = 0;
while(rooms.Count < roomsToGenerate && roomIterations < maxRoomIterations) {
roomIterations++;
MapRoom room = new MapRoom(mapSize, maxRoomSize); MapRoom room = new MapRoom(mapSize, maxRoomSize);
if(ScanRoom(room)) { if(ScanRoom(room)) {
PlaceRoom(room); PlaceRoom(room);
rooms.Add(room); rooms.Add(room);
} }
if(rooms.Count > 1) { if(rooms.Count > 1) {
MapRoom from = rooms[rooms.Count-1]; MapRoom from = rooms[rooms.Count-2];
MapRoom to = room; MapRoom to = rooms[rooms.Count-1];
try { try {
MapCorridor corridor = new MapCorridor(from, to, mapSize); MapCorridor corridor = new MapCorridor(from, to, mapSize);
PlaceCorridor(corridor); PlaceCorridor(corridor);