eryn/going-rogue
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor events into their own package

Browse source 
Most of the existing actions are game actions (they control the player character)
so they live in actions.game. Eventually, there will be modules for different
kinds of actions that only apply to, e.g. modal UI.
This commit is contained in:
Eryn Wells 2022-05-28 08:52:54 -07:00
parent 46af8863b1
commit ae1c7f5ce2
6 changed files with 114 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

11
erynrl/events.py
View file

@ -7,7 +7,8 @@ from typing import Optional, TYPE_CHECKING
import tcod
from . import log
from .actions import Action, ExitAction, RegenerateRoomsAction, BumpAction, WaitAction
from .actions.action import Action
from .actions.game import ExitAction, RegenerateRoomsAction, BumpAction, WaitAction
from .geometry import Direction, Point
if TYPE_CHECKING:
@ -46,7 +47,7 @@ class EventHandler(tcod.event.EventDispatch[Action]):
self.engine.process_input_action(action)
def ev_quit(self, event: tcod.event.Quit) -> Optional[Action]:
return ExitAction(self.engine.hero)
return ExitAction()
class MainGameEventHandler(EventHandler):
'''
@ -80,7 +81,7 @@ class MainGameEventHandler(EventHandler):
case tcod.event.KeySym.y:
action = BumpAction(hero, Direction.NorthWest)
case tcod.event.KeySym.ESCAPE:
action = ExitAction(hero)
action = ExitAction()
case tcod.event.KeySym.SPACE:
action = RegenerateRoomsAction(hero)
case tcod.event.KeySym.PERIOD:
@ -100,11 +101,9 @@ class GameOverEventHandler(EventHandler):
def ev_keydown(self, event: tcod.event.KeyDown) -> Optional[Action]:
action: Optional[Action] = None
hero = self.engine.hero
sym = event.sym
match sym:
case tcod.event.KeySym.ESCAPE:
action = ExitAction(hero)
action = ExitAction()
return action