Changeset 457:de224d9fb943


Ignore:
Timestamp:
04/09/11 18:49:53 (12 years ago)
Author:
Adrianna Pińska <adrianna.pinska@…>
Branch:
default
Parents:
456:2dcaaf6abb9c (diff), 454:95527fd29872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/levels/temple.json

    r453 r457  
    1010        "Xd{..........?...}bX",
    1111        "X{..........(X)...}X",
    12         "X..................X",
     12        "X....?.............X",
    1313        "X..<+bd=>.........?X",
    14         "X.................pX",
    15         "X?...........<--+bXX",
     14        "X................?pX",
     15        "X?......?....<--+bXX",
    1616        "Xq..?..pq.........}X",
    1717        "XXXXXd=-->.........X",
    1818        "X{................?X",
    1919        "X..........pq..?..pX",
    20         "X.........<--+bXXXXX",
     20        "X?........<--+bXXXXX",
    2121        "Xq................}X",
    2222        "XXd=-->............X",
    23         "X{.................X",
     23        "X{........?........X",
    2424        "Xq..?.....pq...?..pX",
    2525        "XXXXXXXXXXXXXXXXXXXX"
  • data/levels/temple.json

    r456 r457  
    3232        "starting": {"type": "StartingDoorway", "pos": [4, 16], "facing": "right"},
    3333        "to_temple_grounds": {"type": "Doorway", "pos": [17, 16], "facing": "left", "leadsto": "temple_grounds.starting"}
     34    },
     35    "music" : {
     36        "track" : "ambient japanese music 1.ogg",
     37        "volume" : 1.0
    3438    }
    3539}
Note: See TracChangeset for help on using the changeset viewer.