Changeset 535:d7f3329a6bf8


Ignore:
Timestamp:
04/09/11 22:26:39 (12 years ago)
Author:
Jeremy Thurgood <firxen@…>
Branch:
default
Phase:
public
Message:

Fix theatre mission.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/npcs/actor.json

    r502 r535  
    1515    },
    1616    "gone" : {
    17         "no_entry": "drop_item('tail_lightning')"
     17        "on_entry": "drop_item('tail_lightning')"
    1818    }
    1919}
  • skaapsteker/sprites/items.py

    r532 r535  
    224224    breaking_sound = 'sounds/vase breaking.ogg', 0.1
    225225
     226    liftable = False
     227
    226228
    227229class Salmon(Item):
     
    238240    broken_image_file = 'props/no-mask-broken.png'
    239241
     242    liftable = False
     243
     244
     245    def smash(self):
     246        super(NoMask, self).smash()
     247        if self.world.items.no_costume.level == '_limbo':
     248            self.world.missions.masks_destroyed = True
     249
     250
    240251
    241252class NoCostume(Item):
    242253    image_file = 'props/no-costume.png'
    243254
     255    def player_action(self, player):
     256        self.remove()
     257        notify("I think I'll hide this away somewhere.")
     258        if self.world.items.no_mask.broken:
     259            self.world.missions.masks_destroyed = True
    244260
    245261
Note: See TracChangeset for help on using the changeset viewer.