Mercurial > pyntnclick
changeset 529:a6f9b6edb6c7
PEP-8 gamescreen and state.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Sat, 11 Feb 2012 11:57:14 +0200 |
| parents | 0ce08d5e2acb |
| children | fe51223e0c8d |
| files | gamelib/gamescreen.py gamelib/state.py |
| diffstat | 2 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/gamescreen.py Fri Sep 10 18:47:17 2010 +0200 +++ b/gamelib/gamescreen.py Sat Feb 11 11:57:14 2012 +0200 @@ -22,7 +22,8 @@ sel_width = 2 def __init__(self, screen): - PaletteView.__init__(self, (BUTTON_SIZE, BUTTON_SIZE), 1, 6, scrolling=True) + PaletteView.__init__(self, (BUTTON_SIZE, BUTTON_SIZE), 1, 6, + scrolling=True) self.screen = screen self.state = screen.state self.state_widget = screen.state_widget @@ -74,7 +75,7 @@ def mouse_down(self, event): self.mouse_move(event) - if event.button != 1: # We have a right/middle click + if event.button != 1: # We have a right/middle click self.state.cancel_doodah(self.screen) elif self.subwidgets: self.clear_detail() @@ -155,7 +156,7 @@ bw = self.border_width self.image_rect = rect self.image_rect.topleft = (bw, bw) - self.set_rect(rect.inflate(bw*2, bw*2)) + self.set_rect(rect.inflate(bw * 2, bw * 2)) self.close.rect.midbottom = rect.midbottom def draw(self, surface): @@ -163,14 +164,16 @@ overlay = scene_surface.convert_alpha() overlay.fill(Color(0, 0, 0, 191)) scene_surface.blit(overlay, (0, 0)) - self.state.current_detail.draw(surface.subsurface(self.image_rect), self) + self.state.current_detail.draw( + surface.subsurface(self.image_rect), self) def mouse_down(self, event): self.mouse_move(event) - if event.button != 1: # We have a right/middle click + if event.button != 1: # We have a right/middle click self.state.cancel_doodah(self.screen) else: - result = self.state.interact_detail(self.global_to_local(event.pos)) + result = self.state.interact_detail( + self.global_to_local(event.pos)) handle_result(result, self) def mouse_move(self, event):
--- a/gamelib/state.py Fri Sep 10 18:47:17 2010 +0200 +++ b/gamelib/state.py Sat Feb 11 11:57:14 2012 +0200 @@ -18,10 +18,12 @@ # whether to show debugging rects DEBUG_RECTS = False + class Result(object): """Result of interacting with a thing""" - def __init__(self, message=None, soundfile=None, detail_view=None, style=None, close_detail=False, end_game=False): + def __init__(self, message=None, soundfile=None, detail_view=None, + style=None, close_detail=False, end_game=False): self.message = message self.sound = None if soundfile: @@ -39,7 +41,9 @@ scene_widget.show_message(self.message, self.style) if self.detail_view: scene_widget.show_detail(self.detail_view) - if self.close_detail and hasattr(scene_widget, 'parent') and hasattr(scene_widget.parent, 'clear_detail'): + if (self.close_detail + and hasattr(scene_widget, 'parent') + and hasattr(scene_widget.parent, 'clear_detail')): scene_widget.parent.clear_detail() if self.end_game: scene_widget.end_game() @@ -283,7 +287,7 @@ if description is not None: w, h = description.size sub = screen.get_root().surface.subsurface( - Rect(400-w/2, 5, w, h)) + Rect(400 - w / 2, 5, w, h)) description.draw_all(sub) def _cache_background(self): @@ -383,7 +387,6 @@ return None - class Thing(StatefulGizmo, InteractiveMixin): """Base class for things in a scene that you can interact with."""