Mercurial > skaapsteker
changeset 248:129afb4417cf
Some light cleanup.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Thu, 07 Apr 2011 19:44:04 +0200 |
| parents | 8c0c132b422f |
| children | 30ae3c681507 |
| files | skaapsteker/engine.py skaapsteker/gamestate.py skaapsteker/level.py skaapsteker/levelscene.py skaapsteker/menuscene.py skaapsteker/sprites/base.py skaapsteker/sprites/player.py skaapsteker/widgets/text.py |
| diffstat | 8 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/engine.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/engine.py Thu Apr 07 19:44:04 2011 +0200 @@ -5,7 +5,7 @@ import pygame.event from pygame.locals import QUIT, USEREVENT -from skaapsteker.gamestate import GameState +from .gamestate import GameState class Engine(object):
--- a/skaapsteker/gamestate.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/gamestate.py Thu Apr 07 19:44:04 2011 +0200 @@ -1,7 +1,7 @@ import json -from skaapsteker import data -from skaapsteker.sprites.base import find_sprite +from . import data +from .sprites.base import find_sprite class StateProxy(object):
--- a/skaapsteker/level.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/level.py Thu Apr 07 19:44:04 2011 +0200 @@ -2,11 +2,9 @@ from pygame import Rect, Surface, Color, mixer from pygame.sprite import LayeredUpdates -from pygame.locals import SRCALPHA, HWSURFACE from . import data from .constants import Layers -from .sprites import enemies from .sprites.base import TILE_SIZE, find_sprite, Geography from .widgets.text import Text
--- a/skaapsteker/levelscene.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/levelscene.py Thu Apr 07 19:44:04 2011 +0200 @@ -3,20 +3,22 @@ from pygame.locals import (KEYDOWN, KEYUP, K_DOWN, K_ESCAPE, K_LEFT, K_RIGHT, K_SEMICOLON, K_UP, K_p, K_q, K_x, K_z, K_RETURN) +import pygame + from . import options -import engine -import level -import physics -import sprites.player -from skaapsteker.widgets.text import Text -import pygame +from . import engine +from . import level +from . import physics +from .sprites import player +from .widgets.text import Text + class LevelScene(engine.Scene): def __init__(self, game_state, leveldef): super(LevelScene, self).__init__(game_state) - self._player = sprites.player.Player(game_state.world) + self._player = player.Player(game_state.world) self._level = level.Level(leveldef, self._player) self._leveldef = leveldef self._player_dead = False
--- a/skaapsteker/menuscene.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/menuscene.py Thu Apr 07 19:44:04 2011 +0200 @@ -6,6 +6,7 @@ from .levelscene import LevelScene from .widgets.text import Text, TextChoice + class MenuScene(Scene): def __init__(self, game_state, cur_game=None): super(MenuScene, self).__init__(game_state)
--- a/skaapsteker/sprites/base.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/sprites/base.py Thu Apr 07 19:44:04 2011 +0200 @@ -1,12 +1,13 @@ """Basic sprite classes.""" -from pygame import Rect import re -from skaapsteker.physics import Sprite -from skaapsteker.constants import Layers -from skaapsteker import data -from skaapsteker import dialogue +from pygame import Rect + +from ..physics import Sprite +from ..constants import Layers +from .. import data +from .. import dialogue TILE_SIZE = (64, 64)
--- a/skaapsteker/sprites/player.py Thu Apr 07 19:25:48 2011 +0200 +++ b/skaapsteker/sprites/player.py Thu Apr 07 19:44:04 2011 +0200 @@ -3,11 +3,11 @@ import pygame.transform import time -from skaapsteker.sprites.base import TILE_SIZE, PC_LAYER, MONSTER_LAYER -from skaapsteker.physics import Sprite -from skaapsteker.constants import Layers -from skaapsteker.data import get_files, load_image -from skaapsteker.engine import PlayerDied +from ..sprites.base import TILE_SIZE, PC_LAYER, MONSTER_LAYER +from ..physics import Sprite +from ..constants import Layers +from ..data import get_files, load_image +from ..engine import PlayerDied class Player(Sprite):