john/McRogueFace
1
0
Fork 0
Code Issues 32 Pull requests Projects Releases Wiki Activity

crypt of sokoban layer API change updates

Browse source
This commit is contained in:
John McCardle 2026-02-14 11:04:19 -05:00
commit 945cce3f88
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/scripts/cos_level.py
View file

@ -105,9 +105,7 @@ class Level:
self.height = height self.height = height
#self.graph = [(0, 0, width, height)] #self.graph = [(0, 0, width, height)]
self.graph = RoomGraph( (0, 0, width, height) ) self.graph = RoomGraph( (0, 0, width, height) )
# #150 - Create grid with explicit layers for color and tilesprite self.grid = mcrfpy.Grid(grid_size=(width, height), texture=t, pos=(10, 5), size=(1014, 700))
self.grid = mcrfpy.Grid(grid_size=(width, height), texture=t, pos=(10, 5), size=(1014, 700),
layers={"color": "color", "tilesprite": "tile"})
self.highlighted = -1 #debug view feature self.highlighted = -1 #debug view feature
self.walled_rooms = [] # for tracking "hallway rooms" vs "walled rooms" self.walled_rooms = [] # for tracking "hallway rooms" vs "walled rooms"
@ -183,8 +181,7 @@ class Level:
# self.grid.at((0, y)).walkable = False # self.grid.at((0, y)).walkable = False
self.grid.at((self.width-1, y)).walkable = False self.grid.at((self.width-1, y)).walkable = False
def dig_path(self, start:"Tuple[int, int]", end:"Tuple[int, int]", walkable=True, color=None, sprite=None): def dig_path(self, start:"Tuple[int, int]", end:"Tuple[int, int]", walkable=True, sprite=None):
#print(f"Digging: {start} -> {end}")
# get x1,y1 and x2,y2 coordinates: top left and bottom right points on the rect formed by two random points, one from each of the 2 rooms # get x1,y1 and x2,y2 coordinates: top left and bottom right points on the rect formed by two random points, one from each of the 2 rooms
x1 = min([start[0], end[0]]) x1 = min([start[0], end[0]])
x2 = max([start[0], end[0]]) x2 = max([start[0], end[0]])
@ -200,8 +197,6 @@ class Level:
try: try:
if walkable: if walkable:
self.grid.at((x, ty)).walkable = walkable self.grid.at((x, ty)).walkable = walkable
if color:
self.grid.at((x, ty)).color = color
if sprite is not None: if sprite is not None:
self.grid.at((x, ty)).tilesprite = sprite self.grid.at((x, ty)).tilesprite = sprite
except: except:
@ -210,8 +205,6 @@ class Level:
try: try:
if walkable: if walkable:
self.grid.at((tx, y)).walkable = True self.grid.at((tx, y)).walkable = True
if color:
self.grid.at((tx, y)).color = color
if sprite is not None: if sprite is not None:
self.grid.at((tx, y)).tilesprite = sprite self.grid.at((tx, y)).tilesprite = sprite
except: except:
@ -264,7 +257,7 @@ class Level:
if prev_room: if prev_room:
start = room_coord(prev_room, margin=2) start = room_coord(prev_room, margin=2)
end = room_coord(room, margin=2) end = room_coord(room, margin=2)
self.dig_path(start, end, color=(0, 64, 0)) self.dig_path(start, end)
prev_room = room prev_room = room
# Tile painting # Tile painting

1
src/scripts/cos_tiles.py
View file

@ -147,7 +147,6 @@ def wfc_pass(grid, possibilities=None):
grid.at((x, y)).tilesprite = matches[0] grid.at((x, y)).tilesprite = matches[0]
else: else:
grid.at((x, y)).tilesprite = -1 grid.at((x, y)).tilesprite = -1
grid.at((x, y)).color = (32 * len(matches), 32 * len(matches), 32 * len(matches))
possibilities[(x,y)] = matches possibilities[(x,y)] = matches
if len(possibilities) == len(old_possibilities): if len(possibilities) == len(old_possibilities):