Changeset 284:8cac6ff88a9d


Ignore:
Timestamp:
04/08/11 18:41:05 (12 years ago)
Author:
Simon Cross <hodgestar@…>
Branch:
default
Phase:
public
Rebase:
36366332316532393961343233323434353831363538313761373032613064313862323733623239
Message:

Rename the void level to _limbo. Add teacupfull to _limbo. Change monk state change check to world.fox.item == 'teacupfull'.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r274 r284  
    1313        "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
    1414        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] },
     15        "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
    1516        "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false }
    1617    },
  • data/npcs/monk.json

    r198 r284  
    2020        "text" : "Oh, what I wouldn’t do for a cup of tea.",
    2121        "events" : [
    22             { "matches" : "world.fox_has_tea", "next": "state.got_tea" }
     22            { "matches" : "world.fox.item == 'tea'", "next": "state.got_tea" }
    2323        ]
    2424    },
  • skaapsteker/sprites/player.py

    r273 r284  
    297297            print "I already have", my_item
    298298            return
    299         getattr(self.the_world.items, item.name).level = "gone"
     299        getattr(self.the_world.items, item.name).level = "_limbo"
    300300        self.the_world.fox.item = item.name
    301301        item.kill()
Note: See TracChangeset for help on using the changeset viewer.