# HG changeset patch # User Neil Muller # Date 1328959161 -7200 # Node ID 098ea4ea0d0d0b6e8bb887e70d97c57b8a3dad4f # Parent ded4324b236e10830791cef2d7f7e9abee3ba75e Rename imports diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/bridge.py --- a/gamelib/scenes/bridge.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/bridge.py Sat Feb 11 13:19:21 2012 +0200 @@ -8,11 +8,11 @@ from albow.music import change_playlist, get_music, PlayList from albow.resource import get_image -from gamelib.cursor import CursorSprite -from gamelib.state import Scene, Item, Thing, Result -from gamelib.sound import get_current_playlist -from gamelib.constants import DEBUG -from gamelib.scenewidgets import (InteractNoImage, InteractRectUnion, +from pyntnclick.cursor import CursorSprite +from pyntnclick.state import Scene, Item, Thing, Result +from pyntnclick.sound import get_current_playlist +from pyntnclick.constants import DEBUG +from pyntnclick.scenewidgets import (InteractNoImage, InteractRectUnion, InteractImage, InteractAnimated, GenericDescThing) diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/crew_quarters.py --- a/gamelib/scenes/crew_quarters.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/crew_quarters.py Sat Feb 11 13:19:21 2012 +0200 @@ -1,8 +1,8 @@ """Crew quarters.""" -from gamelib.cursor import CursorSprite -from gamelib.state import Scene, Item, Thing, Result -from gamelib.scenewidgets import (InteractNoImage, InteractImage, +from pyntnclick.cursor import CursorSprite +from pyntnclick.state import Scene, Item, Thing, Result +from pyntnclick.scenewidgets import (InteractNoImage, InteractImage, InteractAnimated, GenericDescThing) from gamelib.scenes.game_constants import PLAYER_ID diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/cryo.py --- a/gamelib/scenes/cryo.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/cryo.py Sat Feb 11 13:19:21 2012 +0200 @@ -5,9 +5,9 @@ from albow.music import change_playlist, get_music, PlayList from albow.resource import get_image -from gamelib.cursor import CursorSprite -from gamelib.state import Scene, Item, CloneableItem, Thing, Result -from gamelib.scenewidgets import (InteractNoImage, InteractRectUnion, +from pyntnclick.cursor import CursorSprite +from pyntnclick.state import Scene, Item, CloneableItem, Thing, Result +from pyntnclick.scenewidgets import (InteractNoImage, InteractRectUnion, InteractImage, InteractAnimated, GenericDescThing) diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/engine.py --- a/gamelib/scenes/engine.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/engine.py Sat Feb 11 13:19:21 2012 +0200 @@ -1,9 +1,9 @@ """Engine room where things need to be repaired.""" from albow.resource import get_image -from gamelib.cursor import CursorSprite -from gamelib.state import Scene, Item, Thing, Result -from gamelib.scenewidgets import (InteractNoImage, InteractRectUnion, +from pyntnclick.cursor import CursorSprite +from pyntnclick.state import Scene, Item, Thing, Result +from pyntnclick.scenewidgets import (InteractNoImage, InteractRectUnion, InteractImage, InteractAnimated, GenericDescThing) diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/game_widgets.py --- a/gamelib/scenes/game_widgets.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/game_widgets.py Sat Feb 11 13:19:21 2012 +0200 @@ -1,7 +1,7 @@ """Generic, game specific widgets""" -from gamelib.state import Thing, Result +from pyntnclick.state import Thing, Result class Door(Thing): diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/machine.py --- a/gamelib/scenes/machine.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/machine.py Sat Feb 11 13:19:21 2012 +0200 @@ -1,8 +1,8 @@ """Machine room where tools and machines are found.""" -from gamelib.state import Scene, Item, Thing, Result -from gamelib.cursor import CursorSprite -from gamelib.scenewidgets import (InteractNoImage, InteractImage, +from pyntnclick.state import Scene, Item, Thing, Result +from pyntnclick.cursor import CursorSprite +from pyntnclick.scenewidgets import (InteractNoImage, InteractImage, InteractAnimated, GenericDescThing) from gamelib.scenes.game_widgets import Door diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/manual.py --- a/gamelib/scenes/manual.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/manual.py Sat Feb 11 13:19:21 2012 +0200 @@ -2,9 +2,9 @@ from albow.music import change_playlist -from gamelib.state import Scene, Thing -from gamelib.sound import get_current_playlist -from gamelib.scenewidgets import InteractNoImage, InteractImage +from pyntnclick.state import Scene, Thing +from pyntnclick.sound import get_current_playlist +from pyntnclick.scenewidgets import InteractNoImage, InteractImage # classes related the computer detail diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/map.py --- a/gamelib/scenes/map.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/map.py Sat Feb 11 13:19:21 2012 +0200 @@ -7,8 +7,8 @@ Many parts of the ship are derelict and inaccessible. """ -from gamelib.state import Scene, Thing, Result -from gamelib.scenewidgets import InteractRectUnion +from pyntnclick.state import Scene, Thing, Result +from pyntnclick.scenewidgets import InteractRectUnion from gamelib.scenes.game_constants import PLAYER_ID from gamelib.scenes.game_widgets import make_jim_dialog diff -r ded4324b236e -r 098ea4ea0d0d gamelib/scenes/mess.py --- a/gamelib/scenes/mess.py Sat Feb 11 13:10:18 2012 +0200 +++ b/gamelib/scenes/mess.py Sat Feb 11 13:19:21 2012 +0200 @@ -2,11 +2,11 @@ from random import randint -from gamelib.state import Scene, Item, CloneableItem, Thing, Result -from gamelib.cursor import CursorSprite -from gamelib.sound import get_sound -from gamelib import constants -from gamelib.scenewidgets import (InteractNoImage, InteractImage, +from pyntnclick.state import Scene, Item, CloneableItem, Thing, Result +from pyntnclick.cursor import CursorSprite +from pyntnclick.sound import get_sound +from pyntnclick import constants +from pyntnclick.scenewidgets import (InteractNoImage, InteractImage, InteractImageRect, InteractAnimated, GenericDescThing)