# HG changeset patch
# User Simon Cross <hodgestar+bzr@gmail.com>
# Date 1282942877 -7200
# Node ID eb3cfcaff469cf2d98b99ae069fc5078042f9c4e
# Parent  d9b19449436fa31f5d9014389f84c7ecab64af05
Too long since last commit. Felt like showing off some machine room progress.

diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/machine_room.png
Binary file Resources/images/machine/machine_room.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_0.png
Binary file Resources/images/machine/power_lights_0.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_1.png
Binary file Resources/images/machine/power_lights_1.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_2.png
Binary file Resources/images/machine/power_lights_2.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_3.png
Binary file Resources/images/machine/power_lights_3.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_4.png
Binary file Resources/images/machine/power_lights_4.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_5.png
Binary file Resources/images/machine/power_lights_5.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_6.png
Binary file Resources/images/machine/power_lights_6.png has changed
diff -r d9b19449436f -r eb3cfcaff469 Resources/images/machine/power_lights_7.png
Binary file Resources/images/machine/power_lights_7.png has changed
diff -r d9b19449436f -r eb3cfcaff469 gamelib/scenes/machine.py
--- a/gamelib/scenes/machine.py	Fri Aug 27 22:35:09 2010 +0200
+++ b/gamelib/scenes/machine.py	Fri Aug 27 23:01:17 2010 +0200
@@ -20,6 +20,7 @@
         super(Machine, self).__init__(state)
         self.add_thing(ToMap())
         self.add_thing(LaserWelder())
+        self.add_thing(LaserWelderPowerLights())
         self.add_thing(Grinder())
         self.add_item(TitaniumMachete('machete'))
         self.add_item(TinPipe('tin_pipe'))
@@ -38,6 +39,27 @@
 
     INITIAL = "door"
 
+# welder.slot: 249, 324, 167, 51
+# welder.button: 406, 389, 28, 31
+# welder.power lights: 201, 278, 16, 170
+# manual: 434, 496, 66, 34
+
+# broken power socket: 160, 28, 68, 51
+# working power socket: 587, 23, 82, 50
+# poster: 706, 157, 76, 158
+
+# drill press block: 461, 446, 38, 27
+# drill press:
+#Rect 0 : 
+#   (519, 338, 36, 63),
+#   (545, 348, 93, 46),
+#   (599, 309, 41, 150),
+#   (588, 445, 66, 42),
+#   (616, 479, 41, 14),
+#   (527, 393, 15, 17),
+#   (510, 360, 13, 11),
+#   (532, 331, 14, 11),
+#   (605, 304, 26, 8),
 
 class LaserWelder(Thing):
 
@@ -93,6 +115,22 @@
         return msg
 
 
+class LaserWelderPowerLights(Thing):
+
+    NAME = "machine.welder.lights"
+
+    INTERACTS = {
+        "lights": InteractAnimated(199, 273, ["power_lights_%d.png" % i for i in range(8) + range(6,0,-1)], 10)
+    }
+
+    INITIAL = 'lights'
+
+    def get_description(self):
+        return random.choice([
+            "The power lights pulse expectantly.",
+            ])
+
+
 class TinPipe(Item):
     "A pipe made out of welded-together tins."
 
@@ -106,7 +144,7 @@
     NAME = "machine.grinder"
 
     INTERACTS = {
-        "grind": InteractText(200, 300, "Grinder"),
+        "grind": InteractNoImage(86, 402, 94, 63),
     }
 
     INITIAL = "grind"