GreenXenith
/
zoria
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix map generator

master
GreenXenith 2020-03-04 12:32:22 -08:00
parent 0acd41eacc
commit 2c926d7935
4 changed files with 53 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game.py
View File

@ -5,7 +5,7 @@ from .map import Map
from .player import Player
# Constants
SCALE = 1
SCALE = 3
METER = 32
FPS = 60
@ -35,8 +35,7 @@ player.sprite.set_rect((0, 0, 16, 24))
# TODO: Use asset loader for spritesheets
player.sprite.texture.set_animation(0, 0, 0)
player.set_pos(1.1, 1.1)
player.set_pos(map.generator.rooms[0].x, map.generator.rooms[0].y)
player.set_pos(map.generator.rooms[0].x + 2, map.generator.rooms[0].y + 2)
CENTER = [winsize[0] / 2, winsize[1] / 2]

133
src/generator.py
View File

@ -111,6 +111,7 @@ class Generator():
self.board[row][col] = 1
def get_map(self):
# Map object
map = {
"tiles": [
"floor_cobble.png",
@ -130,14 +131,35 @@ class Generator():
"renderLayers": []
}
# Generate walls
bounds = []
for y in range(self.height):
bounds.append([])
for x in range(self.width):
wall = 0
if self.board[y][x] > 0:
for x2 in range(x - 1, x + 2):
for y2 in range(y - 1, y + 2):
if self.board[y2][x2] == 0:
wall += 1
bounds[y].append(wall)
map["boundaries"] = bounds
# Floor layer
layer1 = self.board.copy()
map["renderLayers"].append(layer1)
layer2 = self.board.copy()
# Wall layer
layer2 = []
for y in range(self.height):
layer2.append([])
for _ in range(self.width):
layer2[y].append(0)
for y in range(1, self.height - 1):
for x in range(1, self.width - 1):
if self.board[y][x] == 1:
tile = 1
tile = 0
if self.board[y][x - 1] == 1 and self.board[y][x + 1] == 1:
if self.board[y - 1][x] == 0:
tile = 2
@ -152,90 +174,33 @@ class Generator():
layer2[y][x] = tile
# for y in range(1, len(layer2) - 1):
# for x in range(1, len(layer2[y]) - 1):
# if layer2[y][x] == 0:
# tile = 0
# if layer2[y - 1][x] != 0 and layer2[y][x - 1] == 0:
# tile = 8
# elif layer2[y - 1][x] != 0 and layer2[y][x + 1] != 0:
# tile = 9
# elif layer2[y + 1][x] != 0 and layer2[y][x - 1] != 0:
# tile = 7
# elif layer2[y + 1][x] != 0 and layer2[y][x + 1] != 0:
# tile = 6
for y in range(1, self.height - 1):
for x in range(1, self.width - 1):
if bounds[y][x] > 0 and layer2[y][x] == 0:
tile = 0
if bounds[y + 1][x] > 0 and bounds[y][x + 1] > 0:
if bounds[y][x] > 1:
tile = 6
else:
tile = 10
elif bounds[y + 1][x] > 0 and bounds[y][x - 1] > 0:
if bounds[y][x] > 1:
tile = 7
else:
tile = 11
elif bounds[y - 1][x] > 0 and bounds[y][x - 1] > 0:
if bounds[y][x] > 1:
tile = 8
else:
tile = 12
elif bounds[y - 1][x] > 0 and bounds[y][x + 1] > 0:
if bounds[y][x] > 1:
tile = 9
else:
tile = 13
# layer2[y][x] = tile
layer2[y][x] = tile
map["renderLayers"].append(layer2)
bounds = []
for y in range(self.height):
bounds.append([])
for _ in range(self.width):
bounds[y].append(0)
map["boundaries"] = bounds
return map
# Drawing
if __name__ == "__main__":
gen = Generator(80)
draw = []
for y in range(gen.height):
draw.append([])
for _ in range(gen.width):
draw[y].append(' ')
for y in range(len(gen.board)):
for x in range(len(gen.board[y])):
if gen.board[y][x] == 1:
char = '.'
if gen.board[y - 1][x] == 0 or gen.board[y + 1][x] == 0:
if gen.board[y][x - 1] == 1 and gen.board[y][x + 1] == 1:
char = '═'
elif gen.board[y][x - 1] == 0 or gen.board[y][x + 1] == 0:
if gen.board[y - 1][x] == 1 and gen.board[y + 1][x] == 1:
char = '║'
draw[y][x] = char
for y in range(len(draw)):
for x in range(len(draw[y])):
if draw[y][x] == '.':
char = '.'
if draw[y - 1][x] == '║' and draw[y][x - 1] == '═':
char = '╝'
elif draw[y - 1][x] == '║' and draw[y][x + 1] == '═':
char = '╚'
elif draw[y + 1][x] == '║' and draw[y][x - 1] == '═':
char = '╗'
elif draw[y + 1][x] == '║' and draw[y][x + 1] == '═':
char = '╔'
draw[y][x] = char
# for room in rooms:
# for w in range(room.width):
# map[room.y][room.x + w] = "═"
# map[room.y + room.height - 1][room.x + w] = "═"
# for h in range(room.height):
# map[room.y + h][room.x] = "║"
# map[room.y + h][room.x + room.width - 1] = "║"
# for h in range(room.height - 2):
# for w in range(room.width - 2):
# map[room.y + h + 1][room.x + w + 1] = " "
# map[room.y][room.x] = "╔"
# map[room.y][room.x + room.width - 1] = "╗"
# map[room.y + room.height - 1][room.x] = "╚"
# map[room.y + room.height - 1][room.x + room.width - 1] = "╝"
# for y in map:
# print(''.join(y))
for y in draw:
print(''.join(str(i) for i in y))

2
src/map.py
View File

@ -22,7 +22,7 @@ class Map:
for y in range(int(math.floor(pos.y)) - 1, int(math.floor(pos.y)) + 2):
for x in range(int(math.floor(pos.x)) - 1, int(math.floor(pos.x)) + 2):
if not (x == pos.x and y == pos.y):
if self.map["boundaries"][y][x] == 1:
if self.map["boundaries"][y][x] > 0:
if pos.x + (rect.width / self.METER) >= x and pos.x <= (x + 1) and \
pos.y + (rect.height / self.METER) >= y and pos.y <= (y + 1):
return True

2
src/player.py
View File

@ -15,7 +15,7 @@ class Player:
vel = Vector(0, 0)
# TODO: Fix diagonal speed
speed = 15 # meters per second
speed = 3 # meters per second
def __init__(self):
self.sprite = Sprite()