Changeset 559:c4b14a517500


Ignore:
Timestamp:
04/09/11 23:59:40 (12 years ago)
Author:
Neil Muller <drnlmuller@…>
Branch:
default
Phase:
public
Rebase:
34646638643139343636643163626561363461663463656264383936666361663533346336666535
Message:

Parital geisha mission

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • data/npcs/kaneda.json

    r321 r559  
    33    "start" : {
    44        "events" : [
    5             { "matches" : "npcs.kumiko.state ==  'torn'", "next": "state.kumiko" }
     5            { "matches" : "npcs.kumiko.state ==  'kaneda'", "next": "state.kumiko" }
    66        ]
    77    },
  • data/npcs/kumiko.json

    r551 r559  
    77        "text" : "The room smells fresh, I have my best kimono on and I’ve set out my most magnificent vase. Everything is perfect (just like me)!",
    88        "events" : [
    9             { "matches" : "world.items.vase.broken", "next": "state.broken" }
     9            { "matches" : "world.items.vase.broken", "next": "state.complaining" }
    1010        ]
    1111    },
    12     "broken" : {
    13         "text" : "Oh no, my beautiful vase! What will the businessman think to see it broken on the floor?",
     12    "complaining" : {
    1413        "events" : [
    15             { "matches" : "world.missions.fish_in_room", "next": "state.badsmell" }
    16         ]
    17     },
    18     "badsmell" : {
    19         "text" : "Oh my, what is that terrible smell? Rotten fish? Oh, this won’t do at all!",
    20         "events" : [
    21             { "matches" : "world.missions.kumikos_kimono_torn", "next": "state.torn" }
    22         ]
    23     },
    24     "torn" : {
    25         "text" : "What will the businessman think of a ragged dress like this?",
    26         "events" : [
    27             { "matches" : "npcs.kaneda.state == 'kumiko'", "next": "state.kaneda" }
     14            { "matches" : "world.missions.kumikos_kimono_torn and world.missions.kumikos_kimono_torn and world.missions.fish_in_room", "next": "state.kaneda" }
    2815        ]
    2916    },
  • skaapsteker/sprites/items.py

    r551 r559  
    223223    liftable = False
    224224
     225    def smash(self):
     226        if not self._me.broken:
     227            notify('Oh no, my beautiful vase! What will the businessman think '
     228                    'to see it broken on the floor?')
     229        super(Vase, self).smash()
     230
    225231
    226232class Salmon(Item):
  • skaapsteker/sprites/npcs.py

    r551 r559  
    5454    image_dir = 'sprites/kaneda'
    5555
     56    wants_updates = True
     57
    5658    animation_regexes = [
    5759        ("standing", r"^.*_standing.png$"),
     
    7274
    7375    def update(self):
    74         if not self._me.present and self.alive:
    75             self._all_groups = self.groups()
     76        if self.world.missions.kumiko_disgraced and self.alive:
    7677            self.remove()
    77         if self._me.present and not self.alive:
    78             self.add(*self._all_groups)
    7978        super(Kaneda, self).update()
    8079
     
    109108            self.world.missions.kumikos_kimono_torn = True
    110109            notify("Shoo, dirty fox! Oh, look what you've done"
    111                     "- you've made a great big tear in my finest silk kimono")
     110                    "- you've made a great big tear in my finest silk kimono."
     111                    "What will the businessman think of a ragged dress like this?")
    112112
    113113
Note: See TracChangeset for help on using the changeset viewer.