# HG changeset patch # User Jeremy Thurgood # Date 1282930520 -7200 # Node ID 3cedc4f959252088901f1e2fca44d31ebeaec7f3 # Parent 3b4a7842220126165e180fa9fae529c13492b1c3 Ran pyflakes and fixed some minor things. diff -r 3b4a78422201 -r 3cedc4f95925 gamelib/gamescreen.py --- a/gamelib/gamescreen.py Fri Aug 27 19:29:37 2010 +0200 +++ b/gamelib/gamescreen.py Fri Aug 27 19:35:20 2010 +0200 @@ -14,7 +14,7 @@ from cursor import CursorWidget from hand import HandButton from popupmenu import PopupMenu, PopupMenuButton -from state import initial_state, Item, handle_result +from state import initial_state, handle_result from widgets import MessageDialog, BoomButton diff -r 3b4a78422201 -r 3cedc4f95925 gamelib/main.py --- a/gamelib/main.py Fri Aug 27 19:29:37 2010 +0200 +++ b/gamelib/main.py Fri Aug 27 19:35:20 2010 +0200 @@ -14,7 +14,6 @@ import pygame from pygame.locals import SWSURFACE -from albow.dialogs import alert from albow.shell import Shell from menu import MenuScreen diff -r 3b4a78422201 -r 3cedc4f95925 gamelib/scenes/mess.py --- a/gamelib/scenes/mess.py Fri Aug 27 19:29:37 2010 +0200 +++ b/gamelib/scenes/mess.py Fri Aug 27 19:35:20 2010 +0200 @@ -159,14 +159,16 @@ if self.get_data("status") == "blocked": self.set_data("status", "broken") self.set_interact("broken") - return Result("With a flurry of disgusting mutant vegetable chunks," - " you clear the overgrown broccoli away from the access" - " panel and reveal some broken tubes. They look important.", + return Result("With a flurry of disgusting mutant vegetable " + "chunks, you clear the overgrown broccoli away from " + "the access panel and reveal some broken tubes. " + "They look important.", soundfile='chopping.ogg') elif self.get_data("status") == "broken": return Result("It looks broken enough already.") else: - return Return("After all that effort fixing it, chopping it to bits doesn't seem very smart.") + return Result("After all that effort fixing it, chopping it to " + "bits doesn't seem very smart.") def interact_with_pipe(self, item): if self.get_data("status") == "blocked": diff -r 3b4a78422201 -r 3cedc4f95925 gamelib/state.py --- a/gamelib/state.py Fri Aug 27 19:29:37 2010 +0200 +++ b/gamelib/state.py Fri Aug 27 19:35:20 2010 +0200 @@ -3,13 +3,11 @@ from albow.resource import get_image from albow.utils import frame_rect from widgets import BoomLabel -from pygame.locals import BLEND_ADD from pygame.rect import Rect from pygame.color import Color import constants from sound import get_sound -from cursor import HAND # override the initial scene to for debugging DEBUG_SCENE = None diff -r 3b4a78422201 -r 3cedc4f95925 gamelib/widgets.py --- a/gamelib/widgets.py Fri Aug 27 19:29:37 2010 +0200 +++ b/gamelib/widgets.py Fri Aug 27 19:35:20 2010 +0200 @@ -8,7 +8,6 @@ import albow.controls from albow.resource import get_font from pygame.color import Color -from pygame.locals import BLEND_ADD from cursor import CursorWidget