Move the action perform logic to Action.perform() on each Action subclass
Rename Object to Entity to avoid name clashes with Python.object
This commit is contained in:
parent
cde6ea2065
commit
5ce26e310b
4 changed files with 49 additions and 57 deletions
|
|
@ -1,14 +1,28 @@
|
|||
#!/usr/bin/env python3
|
||||
# Eryn Wells <eryn@erynwells.me>
|
||||
|
||||
import logging
|
||||
from .engine import Engine
|
||||
from .geometry import Vector
|
||||
from .object import Entity
|
||||
|
||||
LOG = logging.getLogger('events')
|
||||
|
||||
class Action:
|
||||
pass
|
||||
def perform(self, engine: Engine, entity: Entity) -> None:
|
||||
'''
|
||||
Perform this action. This is an abstract method that all subclasses
|
||||
should implement.
|
||||
'''
|
||||
raise NotImplementedError()
|
||||
|
||||
class ExitAction(Action):
|
||||
pass
|
||||
def perform(self, engine: Engine, entity: Entity) -> None:
|
||||
raise SystemExit()
|
||||
|
||||
class RegenerateRoomsAction(Action):
|
||||
pass
|
||||
def perform(self, engine: Engine, entity: Entity) -> None:
|
||||
...
|
||||
|
||||
class MovePlayerAction(Action):
|
||||
class Direction:
|
||||
|
|
@ -22,4 +36,15 @@ class MovePlayerAction(Action):
|
|||
NorthWest = Vector(-1, -1)
|
||||
|
||||
def __init__(self, direction: Direction):
|
||||
self.direction = direction
|
||||
self.direction = direction
|
||||
|
||||
def perform(self, engine: Engine, entity: Entity) -> None:
|
||||
new_player_position = entity.position + self.direction
|
||||
|
||||
position_is_in_bounds = self.map.tile_is_in_bounds(new_player_position)
|
||||
position_is_walkable = self.map.tile_is_walkable(new_player_position)
|
||||
overlaps_an_entity = any(new_player_position.x == obj.x and new_player_position.y == obj.y for obj in engine.entities)
|
||||
|
||||
LOG.debug(f'Attempting to move player to {new_player_position} (in_bounds:{position_is_in_bounds} walkable:{position_is_walkable} overlaps:{overlaps_an_entity})')
|
||||
if position_is_in_bounds and position_is_walkable and not overlaps_an_entity:
|
||||
self.player.move_to(new_player_position)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue