Mercurial > skaapsteker

changeset 535:d7f3329a6bf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix theatre mission.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 10 Apr 2011 00:26:39 +0200
parents 6c939898c1f4
children 03f519443b10
files data/npcs/actor.json skaapsteker/sprites/items.py
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/data/npcs/actor.json	Sun Apr 10 00:22:27 2011 +0200
+++ b/data/npcs/actor.json	Sun Apr 10 00:26:39 2011 +0200
@@ -14,6 +14,6 @@
         "auto_next": "state.gone"
     },
     "gone" : {
-        "no_entry": "drop_item('tail_lightning')"
+        "on_entry": "drop_item('tail_lightning')"
     }
 }
--- a/skaapsteker/sprites/items.py	Sun Apr 10 00:22:27 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sun Apr 10 00:26:39 2011 +0200
@@ -223,6 +223,8 @@
     broken_image_file = 'props/vase-broken.png'
     breaking_sound = 'sounds/vase breaking.ogg', 0.1
 
+    liftable = False
+
 
 class Salmon(Item):
     image_file = 'props/fish.png'
@@ -237,10 +239,24 @@
     whole_image_file = 'props/no-mask-whole.png'
     broken_image_file = 'props/no-mask-broken.png'
 
+    liftable = False
+
+
+    def smash(self):
+        super(NoMask, self).smash()
+        if self.world.items.no_costume.level == '_limbo':
+            self.world.missions.masks_destroyed = True
+
+
 
 class NoCostume(Item):
     image_file = 'props/no-costume.png'
 
+    def player_action(self, player):
+        self.remove()
+        notify("I think I'll hide this away somewhere.")
+        if self.world.items.no_mask.broken:
+            self.world.missions.masks_destroyed = True
 
 
 ##################################################