Changeset 219:c83f021cc327


Ignore:
Timestamp:
04/06/11 23:07:15 (12 years ago)
Author:
Adrianna Pińska <adrianna.pinska@…>
Branch:
default
Phase:
public
Message:

screwed up merge fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r217 r219  
    99    },
    1010    "items": {
    11         "tealeaf": { "type": "TeaLeaf", "level": "level1", "pos": [1, 7] },
    12         "teacup": { "type": "TeaCup", "level": "level1", "pos": [18, 10] },
    13         "teapot": { "type": "TeaPot", "level": "level1", "pos": [13, 2] }
     11        "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
     12        "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
     13        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] }
    1414    },
    1515    "npcs": {
    16         "monk": { "type": "Monk", "level": "level1", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
     16        "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
    1717        "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" }
    1818    },
    1919    "levels": {
    20         "level1" : "level1",
     20        "temple" : "temple",
    2121        "level2" : "level2",
    2222        "level3" : "level3",
Note: See TracChangeset for help on using the changeset viewer.