Update all 13 tutorial scripts to current enum-based API, refs #167
All tutorial parts (1-13) used the old string-based key/action
comparison API removed in 6d5e99a. Every handle_keys function now
uses mcrfpy.Key.* and mcrfpy.InputState.PRESSED enums.
Additional fixes across all parts:
- Replace manual FOV computation with ColorLayer.draw_fov() which
handles FOV calculation and explored-state tracking in one call
- Replace old grid.add_layer("color") with ColorLayer() constructor
- Fix entity removal bug: entities.remove(index) -> remove(entity_ref)
- Remove manual exploration tracking (draw_fov handles it internally)
- Use tuple positions for compute_fov/is_in_fov: (x, y) not x, y
All 14 parts (0-13) tested and passing in headless mode.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6d5e99a114
commit
1805b985bd
13 changed files with 388 additions and 765 deletions
|
|
@ -567,24 +567,7 @@ class RectangularRoom:
|
|||
self.y2 >= other.y1
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
# Exploration Tracking
|
||||
# =============================================================================
|
||||
|
||||
explored: list[list[bool]] = []
|
||||
|
||||
def init_explored() -> None:
|
||||
global explored
|
||||
explored = [[False for _ in range(GRID_WIDTH)] for _ in range(GRID_HEIGHT)]
|
||||
|
||||
def mark_explored(x: int, y: int) -> None:
|
||||
if 0 <= x < GRID_WIDTH and 0 <= y < GRID_HEIGHT:
|
||||
explored[y][x] = True
|
||||
|
||||
def is_explored(x: int, y: int) -> bool:
|
||||
if 0 <= x < GRID_WIDTH and 0 <= y < GRID_HEIGHT:
|
||||
return explored[y][x]
|
||||
return False
|
||||
# Exploration tracking is handled automatically by ColorLayer.draw_fov()
|
||||
|
||||
# =============================================================================
|
||||
# Dungeon Generation
|
||||
|
|
@ -821,18 +804,12 @@ def get_blocking_entity_at(target_grid: mcrfpy.Grid, x: int, y: int, exclude: mc
|
|||
return None
|
||||
|
||||
def remove_entity(target_grid: mcrfpy.Grid, entity: mcrfpy.Entity) -> None:
|
||||
for i, e in enumerate(target_grid.entities):
|
||||
if e == entity:
|
||||
target_grid.entities.remove(i)
|
||||
break
|
||||
target_grid.entities.remove(entity)
|
||||
if entity in entity_data:
|
||||
del entity_data[entity]
|
||||
|
||||
def remove_item_entity(target_grid: mcrfpy.Grid, entity: mcrfpy.Entity) -> None:
|
||||
for i, e in enumerate(target_grid.entities):
|
||||
if e == entity:
|
||||
target_grid.entities.remove(i)
|
||||
break
|
||||
target_grid.entities.remove(entity)
|
||||
if entity in item_data:
|
||||
del item_data[entity]
|
||||
|
||||
|
|
@ -851,11 +828,7 @@ def clear_entities_except_player(target_grid: mcrfpy.Grid) -> None:
|
|||
del entity_data[entity]
|
||||
if entity in item_data:
|
||||
del item_data[entity]
|
||||
|
||||
for i, e in enumerate(target_grid.entities):
|
||||
if e == entity:
|
||||
target_grid.entities.remove(i)
|
||||
break
|
||||
target_grid.entities.remove(entity)
|
||||
|
||||
# =============================================================================
|
||||
# Level Transition
|
||||
|
|
@ -883,7 +856,6 @@ def descend_stairs() -> bool:
|
|||
clear_entities_except_player(grid)
|
||||
|
||||
# Generate new dungeon
|
||||
init_explored()
|
||||
player_start = generate_dungeon(grid, dungeon_level)
|
||||
|
||||
# Move player to starting position
|
||||
|
|
@ -896,9 +868,7 @@ def descend_stairs() -> bool:
|
|||
spawn_entities_for_level(grid, texture, dungeon_level)
|
||||
|
||||
# Reset FOV
|
||||
for y in range(GRID_HEIGHT):
|
||||
for x in range(GRID_WIDTH):
|
||||
fov_layer.set(x, y, COLOR_UNKNOWN)
|
||||
fov_layer.fill(COLOR_UNKNOWN)
|
||||
|
||||
update_fov(grid, fov_layer, player_start[0], player_start[1])
|
||||
|
||||
|
|
@ -977,7 +947,7 @@ def spawn_entities_for_level(target_grid: mcrfpy.Grid, tex: mcrfpy.Texture, leve
|
|||
|
||||
def save_game() -> bool:
|
||||
"""Save the current game state to a JSON file."""
|
||||
global player, player_inventory, grid, explored, dungeon_level, stairs_position
|
||||
global player, player_inventory, grid, dungeon_level, stairs_position
|
||||
|
||||
try:
|
||||
tiles = []
|
||||
|
|
@ -1026,7 +996,6 @@ def save_game() -> bool:
|
|||
"inventory": player_inventory.to_dict()
|
||||
},
|
||||
"tiles": tiles,
|
||||
"explored": [[explored[y][x] for x in range(GRID_WIDTH)] for y in range(GRID_HEIGHT)],
|
||||
"enemies": enemies,
|
||||
"items": items_on_ground
|
||||
}
|
||||
|
|
@ -1043,7 +1012,7 @@ def save_game() -> bool:
|
|||
|
||||
def load_game() -> bool:
|
||||
"""Load a saved game from JSON file."""
|
||||
global player, player_inventory, grid, explored, dungeon_level
|
||||
global player, player_inventory, grid, dungeon_level
|
||||
global entity_data, item_data, fov_layer, game_over, stairs_position
|
||||
|
||||
if not os.path.exists(SAVE_FILE):
|
||||
|
|
@ -1057,7 +1026,7 @@ def load_game() -> bool:
|
|||
item_data.clear()
|
||||
|
||||
while len(grid.entities) > 0:
|
||||
grid.entities.remove(0)
|
||||
grid.entities.pop(0)
|
||||
|
||||
dungeon_level = save_data.get("dungeon_level", 1)
|
||||
stairs_position = tuple(save_data.get("stairs_position", [0, 0]))
|
||||
|
|
@ -1071,10 +1040,6 @@ def load_game() -> bool:
|
|||
cell.walkable = tile_data["walkable"]
|
||||
cell.transparent = tile_data["transparent"]
|
||||
|
||||
global explored
|
||||
explored_data = save_data["explored"]
|
||||
explored = [[explored_data[y][x] for x in range(GRID_WIDTH)] for y in range(GRID_HEIGHT)]
|
||||
|
||||
player_data = save_data["player"]
|
||||
player = mcrfpy.Entity(
|
||||
grid_pos=(player_data["x"], player_data["y"]),
|
||||
|
|
@ -1114,9 +1079,7 @@ def load_game() -> bool:
|
|||
grid.entities.append(item_entity)
|
||||
item_data[item_entity] = Item.from_dict(item_entry["item"])
|
||||
|
||||
for y in range(GRID_HEIGHT):
|
||||
for x in range(GRID_WIDTH):
|
||||
fov_layer.set(x, y, COLOR_UNKNOWN)
|
||||
fov_layer.fill(COLOR_UNKNOWN)
|
||||
|
||||
update_fov(grid, fov_layer, int(player.x), int(player.y))
|
||||
|
||||
|
|
@ -1168,10 +1131,7 @@ def exit_targeting_mode() -> None:
|
|||
global game_mode, target_cursor, grid
|
||||
|
||||
if target_cursor is not None:
|
||||
for i, e in enumerate(grid.entities):
|
||||
if e == target_cursor:
|
||||
grid.entities.remove(i)
|
||||
break
|
||||
grid.entities.remove(target_cursor)
|
||||
target_cursor = None
|
||||
|
||||
game_mode = GameMode.NORMAL
|
||||
|
|
@ -1186,7 +1146,7 @@ def move_cursor(dx: int, dy: int) -> None:
|
|||
if new_x < 0 or new_x >= GRID_WIDTH or new_y < 0 or new_y >= GRID_HEIGHT:
|
||||
return
|
||||
|
||||
if not grid.is_in_fov(new_x, new_y):
|
||||
if not grid.is_in_fov((new_x, new_y)):
|
||||
message_log.add("You cannot see that location.", COLOR_INVALID)
|
||||
return
|
||||
|
||||
|
|
@ -1380,21 +1340,16 @@ def update_entity_visibility(target_grid: mcrfpy.Grid) -> None:
|
|||
continue
|
||||
|
||||
ex, ey = int(entity.x), int(entity.y)
|
||||
entity.visible = target_grid.is_in_fov(ex, ey)
|
||||
entity.visible = target_grid.is_in_fov((ex, ey))
|
||||
|
||||
def update_fov(target_grid: mcrfpy.Grid, target_fov_layer, player_x: int, player_y: int) -> None:
|
||||
target_grid.compute_fov(player_x, player_y, FOV_RADIUS, mcrfpy.FOV.SHADOW)
|
||||
|
||||
for y in range(GRID_HEIGHT):
|
||||
for x in range(GRID_WIDTH):
|
||||
if target_grid.is_in_fov(x, y):
|
||||
mark_explored(x, y)
|
||||
target_fov_layer.set(x, y, COLOR_VISIBLE)
|
||||
elif is_explored(x, y):
|
||||
target_fov_layer.set(x, y, COLOR_DISCOVERED)
|
||||
else:
|
||||
target_fov_layer.set(x, y, COLOR_UNKNOWN)
|
||||
|
||||
target_fov_layer.draw_fov(
|
||||
(player_x, player_y),
|
||||
radius=FOV_RADIUS,
|
||||
visible=COLOR_VISIBLE,
|
||||
discovered=COLOR_DISCOVERED,
|
||||
unknown=COLOR_UNKNOWN
|
||||
)
|
||||
update_entity_visibility(target_grid)
|
||||
|
||||
# =============================================================================
|
||||
|
|
@ -1466,7 +1421,7 @@ def enemy_turn() -> None:
|
|||
|
||||
ex, ey = int(enemy.x), int(enemy.y)
|
||||
|
||||
if not grid.is_in_fov(ex, ey):
|
||||
if not grid.is_in_fov((ex, ey)):
|
||||
continue
|
||||
|
||||
dx = player_x - ex
|
||||
|
|
@ -1535,9 +1490,8 @@ def generate_new_game() -> None:
|
|||
item_data.clear()
|
||||
|
||||
while len(grid.entities) > 0:
|
||||
grid.entities.remove(0)
|
||||
grid.entities.pop(0)
|
||||
|
||||
init_explored()
|
||||
message_log.clear()
|
||||
|
||||
player_start = generate_dungeon(grid, dungeon_level)
|
||||
|
|
@ -1562,9 +1516,7 @@ def generate_new_game() -> None:
|
|||
|
||||
spawn_entities_for_level(grid, texture, dungeon_level)
|
||||
|
||||
for y in range(GRID_HEIGHT):
|
||||
for x in range(GRID_WIDTH):
|
||||
fov_layer.set(x, y, COLOR_UNKNOWN)
|
||||
fov_layer.fill(COLOR_UNKNOWN)
|
||||
|
||||
update_fov(grid, fov_layer, player_start[0], player_start[1])
|
||||
|
||||
|
|
@ -1587,10 +1539,9 @@ grid = mcrfpy.Grid(
|
|||
zoom=1.0
|
||||
)
|
||||
|
||||
fov_layer = grid.add_layer("color", z_index=-1)
|
||||
for y in range(GRID_HEIGHT):
|
||||
for x in range(GRID_WIDTH):
|
||||
fov_layer.set(x, y, COLOR_UNKNOWN)
|
||||
fov_layer = mcrfpy.ColorLayer(z_index=-1, name="fov")
|
||||
grid.add_layer(fov_layer)
|
||||
fov_layer.fill(COLOR_UNKNOWN)
|
||||
|
||||
scene.children.append(grid)
|
||||
|
||||
|
|
@ -1639,8 +1590,6 @@ message_log.add_to_scene(scene)
|
|||
# Initialize Game
|
||||
# =============================================================================
|
||||
|
||||
init_explored()
|
||||
|
||||
if has_save_file():
|
||||
message_log.add("Found saved game. Loading...", COLOR_INFO)
|
||||
if not load_game():
|
||||
|
|
@ -1656,19 +1605,19 @@ else:
|
|||
# Input Handling
|
||||
# =============================================================================
|
||||
|
||||
def handle_keys(key: str, action: str) -> None:
|
||||
def handle_keys(key, action) -> None:
|
||||
global game_over, game_mode
|
||||
|
||||
if action != "start":
|
||||
if action != mcrfpy.InputState.PRESSED:
|
||||
return
|
||||
|
||||
if key == "R":
|
||||
if key == mcrfpy.Key.R:
|
||||
delete_save()
|
||||
generate_new_game()
|
||||
message_log.add("A new adventure begins!", COLOR_INFO)
|
||||
return
|
||||
|
||||
if key == "Escape":
|
||||
if key == mcrfpy.Key.ESCAPE:
|
||||
if game_mode == GameMode.TARGETING:
|
||||
exit_targeting_mode()
|
||||
message_log.add("Targeting cancelled.", COLOR_INFO)
|
||||
|
|
@ -1679,7 +1628,7 @@ def handle_keys(key: str, action: str) -> None:
|
|||
mcrfpy.exit()
|
||||
return
|
||||
|
||||
if key == "Period" and game_mode == GameMode.NORMAL and not game_over:
|
||||
if key == mcrfpy.Key.PERIOD and game_mode == GameMode.NORMAL and not game_over:
|
||||
save_game()
|
||||
return
|
||||
|
||||
|
|
@ -1691,38 +1640,38 @@ def handle_keys(key: str, action: str) -> None:
|
|||
else:
|
||||
handle_normal_input(key)
|
||||
|
||||
def handle_normal_input(key: str) -> None:
|
||||
if key == "W" or key == "Up":
|
||||
def handle_normal_input(key) -> None:
|
||||
if key == mcrfpy.Key.W or key == mcrfpy.Key.UP:
|
||||
try_move_or_attack(0, -1)
|
||||
elif key == "S" or key == "Down":
|
||||
elif key == mcrfpy.Key.S or key == mcrfpy.Key.DOWN:
|
||||
try_move_or_attack(0, 1)
|
||||
elif key == "A" or key == "Left":
|
||||
elif key == mcrfpy.Key.A or key == mcrfpy.Key.LEFT:
|
||||
try_move_or_attack(-1, 0)
|
||||
elif key == "D" or key == "Right":
|
||||
elif key == mcrfpy.Key.D or key == mcrfpy.Key.RIGHT:
|
||||
try_move_or_attack(1, 0)
|
||||
elif key == "F":
|
||||
elif key == mcrfpy.Key.F:
|
||||
enter_targeting_mode()
|
||||
elif key == "G" or key == ",":
|
||||
elif key == mcrfpy.Key.G or key == mcrfpy.Key.COMMA:
|
||||
pickup_item()
|
||||
elif key == "Period" and mcrfpy.keypressed("LShift"):
|
||||
elif key == mcrfpy.Key.PERIOD and mcrfpy.keyboard.shift:
|
||||
# Shift+. (>) to descend stairs
|
||||
descend_stairs()
|
||||
elif key in ["1", "2", "3", "4", "5"]:
|
||||
index = int(key) - 1
|
||||
elif key in (mcrfpy.Key.NUM_1, mcrfpy.Key.NUM_2, mcrfpy.Key.NUM_3, mcrfpy.Key.NUM_4, mcrfpy.Key.NUM_5):
|
||||
index = [mcrfpy.Key.NUM_1, mcrfpy.Key.NUM_2, mcrfpy.Key.NUM_3, mcrfpy.Key.NUM_4, mcrfpy.Key.NUM_5].index(key)
|
||||
if use_item(index):
|
||||
enemy_turn()
|
||||
update_ui()
|
||||
|
||||
def handle_targeting_input(key: str) -> None:
|
||||
if key == "Up" or key == "W":
|
||||
def handle_targeting_input(key) -> None:
|
||||
if key == mcrfpy.Key.UP or key == mcrfpy.Key.W:
|
||||
move_cursor(0, -1)
|
||||
elif key == "Down" or key == "S":
|
||||
elif key == mcrfpy.Key.DOWN or key == mcrfpy.Key.S:
|
||||
move_cursor(0, 1)
|
||||
elif key == "Left" or key == "A":
|
||||
elif key == mcrfpy.Key.LEFT or key == mcrfpy.Key.A:
|
||||
move_cursor(-1, 0)
|
||||
elif key == "Right" or key == "D":
|
||||
elif key == mcrfpy.Key.RIGHT or key == mcrfpy.Key.D:
|
||||
move_cursor(1, 0)
|
||||
elif key == "Return" or key == "Space":
|
||||
elif key == mcrfpy.Key.ENTER or key == mcrfpy.Key.SPACE:
|
||||
confirm_target()
|
||||
|
||||
scene.on_key = handle_keys
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue