diff gamelib/scenes/cryo.py @ 125:d3ca34a664fd

Some detail view and data cleanup.
author Jeremy Thurgood <firxen@gmail.com>
date Tue, 24 Aug 2010 18:01:42 +0200
parents 48d24a48d0ce
children 9646e7c8bb97
line wrap: on
line diff
--- a/gamelib/scenes/cryo.py	Tue Aug 24 17:55:47 2010 +0200
+++ b/gamelib/scenes/cryo.py	Tue Aug 24 18:01:42 2010 +0200
@@ -20,7 +20,6 @@
 
     def __init__(self, state):
         super(Cryo, self).__init__(state)
-        self.add_item(Triangle("triangle"))
         self.add_item(TitaniumLeg("titanium_leg"))
         self.add_thing(CryoUnitAlpha())
         self.add_thing(CryoRoomDoor())
@@ -36,11 +35,6 @@
                     " prison officials when we reach the destination."
                     " Please report to the bridge.")
 
-class Triangle(Item):
-    "Test item. Needs to go away at some point."
-
-    INVENTORY_IMAGE = "triangle.png"
-
 
 class TitaniumLeg(Item):
     "Titanium leg, found on a piratical corpse."
@@ -165,13 +159,13 @@
     INITIAL = "info"
 
 
-class CryoTriangle(Thing):
+class TitaniumLegThing(Thing):
     "Triangle in the cryo room."
 
-    NAME = "cryo.triangle"
+    NAME = "cryo.titanium_leg"
 
     INTERACTS = {
-        "triangular": InteractImage(50, 50, "door_open.png"),
+        "triangular": InteractImage(50, 50, "triangle.png"),
         }
 
     INITIAL = "triangular"
@@ -193,8 +187,7 @@
 
     def __init__(self, state):
         super(CryoUnitWithCorpse, self).__init__(state)
-        self.add_thing(CryoTriangle())
-
+        self.add_thing(TitaniumLegThing())
 
 
 SCENES = [Cryo]