Mercurial > skaapsteker

changeset 456:2dcaaf6abb9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
began to place tofu
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 20:49:20 +0200
parents 5d59238f8996
children de224d9fb943
files data/game.json data/levels/temple.json data/levels/temple_grounds.json
diffstat 3 files changed, 109 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 20:48:52 2011 +0200
+++ b/data/game.json	Sat Apr 09 20:49:20 2011 +0200
@@ -54,8 +54,106 @@
         "haiku3": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "With no leaves to blow." },
         "haiku4": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "And it passes by." },
         "haiku5": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "The Galaxy." },
-        "aburage_00": { "type": "Aburage", "level": "temple", "pos": [12, 2] },
-        "aburage_01": { "type": "Aburage", "level": "temple", "pos": [14, 2] }
+        "aburage_00": { "type": "Aburage", "level": "temple", "pos": [17, 6] },
+        "aburage_01": { "type": "Aburage", "level": "temple", "pos": [8, 7] },
+        "aburage_02": { "type": "Aburage", "level": "temple", "pos": [5, 4] },
+        "aburage_03": { "type": "Aburage", "level": "temple", "pos": [1, 12] },
+        "aburage_04": { "type": "Aburage", "level": "temple", "pos": [10, 15] },
+        "aburage_05": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
+        "aburage_06": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
+        "aburage_07": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
+        "aburage_08": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
+        "aburage_09": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
+        "aburage_10": { "type": "Aburage", "level": "road", "pos": [1, 1] },
+        "aburage_11": { "type": "Aburage", "level": "road", "pos": [1, 1] },
+        "aburage_12": { "type": "Aburage", "level": "road", "pos": [1, 1] },
+        "aburage_13": { "type": "Aburage", "level": "road", "pos": [1, 1] },
+        "aburage_14": { "type": "Aburage", "level": "road", "pos": [1, 1] },
+        "aburage_15": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_16": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_17": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_18": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_19": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_20": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_21": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_22": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_23": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_24": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_25": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_26": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_27": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_28": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_29": { "type": "Aburage", "level": "town", "pos": [1, 1] },
+        "aburage_30": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_31": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_32": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_33": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_34": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_35": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_36": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_37": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_38": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_39": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_40": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_41": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_42": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_43": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_44": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_45": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_46": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_47": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_48": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_49": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
+        "aburage_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_60": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_61": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_62": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_63": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_64": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_65": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_66": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_67": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_68": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_69": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_70": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_71": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_72": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_73": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_74": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_75": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_76": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_77": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_78": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_79": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
+        "aburage_80": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_81": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_82": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_83": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_84": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_85": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_86": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_87": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_88": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_89": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_90": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_91": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_92": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_93": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_94": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_95": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_96": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_97": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_98": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] },
+        "aburage_99": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 1] }
     },
     "npcs": {
         "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
--- a/data/levels/temple.json	Sat Apr 09 20:48:52 2011 +0200
+++ b/data/levels/temple.json	Sat Apr 09 20:49:20 2011 +0200
@@ -9,18 +9,18 @@
         "XXd{....}bd{....}bXX",
         "Xd{..........?...}bX",
         "X{..........(X)...}X",
-        "X..................X",
+        "X....?.............X",
         "X..<+bd=>.........?X",
-        "X.................pX",
-        "X?...........<--+bXX",
+        "X................?pX",
+        "X?......?....<--+bXX",
         "Xq..?..pq.........}X",
         "XXXXXd=-->.........X",
         "X{................?X",
         "X..........pq..?..pX",
-        "X.........<--+bXXXXX",
+        "X?........<--+bXXXXX",
         "Xq................}X",
         "XXd=-->............X",
-        "X{.................X",
+        "X{........?........X",
         "Xq..?.....pq...?..pX",
         "XXXXXXXXXXXXXXXXXXXX"
     ],
--- a/data/levels/temple_grounds.json	Sat Apr 09 20:48:52 2011 +0200
+++ b/data/levels/temple_grounds.json	Sat Apr 09 20:49:20 2011 +0200
@@ -20,10 +20,10 @@
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
-        {"type": "RedOni", "pos": [19, 2], "direction": "left" },
-        {"type": "RedOni", "pos": [35, 5], "direction": "right" },
-        {"type": "RedOni", "pos": [10, 8], "direction": "left" },
-        {"type": "RedOni", "pos": [26, 11], "direction": "right" }
+        {"type": "PatrollingOni", "pos": [19, 2], "direction": "left" },
+        {"type": "PatrollingOni", "pos": [35, 5], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [10, 8], "direction": "left" },
+        {"type": "PatrollingOni", "pos": [26, 11], "direction": "right" }
     ],
     "doorways": {
         "starting": {"type": "Doorway", "pos": [3, 2], "facing": "right", "leadsto": "temple.to_temple_grounds"},