Mercurial > skaapsteker

changeset 482:200d25350d87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 22:03:42 +0200
parents 2f1bafc93177 (diff) fb9258d66137 (current diff)
children b48c194c4af9
files
diffstat 2 files changed, 49 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 21:59:59 2011 +0200
+++ b/data/game.json	Sat Apr 09 22:03:42 2011 +0200
@@ -69,21 +69,21 @@
         "aburage_12": { "type": "Aburage", "level": "road", "pos": [26, 8] },
         "aburage_13": { "type": "Aburage", "level": "road", "pos": [28, 6] },
         "aburage_14": { "type": "Aburage", "level": "road", "pos": [38, 4] },
-        "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_15": { "type": "Aburage", "level": "town", "pos": [65, 1] },
+        "aburage_16": { "type": "Aburage", "level": "town", "pos": [12, 2] },
+        "aburage_17": { "type": "Aburage", "level": "town", "pos": [45, 2] },
+        "aburage_18": { "type": "Aburage", "level": "town", "pos": [28, 6] },
+        "aburage_19": { "type": "Aburage", "level": "town", "pos": [60, 6] },
+        "aburage_20": { "type": "Aburage", "level": "town", "pos": [72, 7] },
+        "aburage_21": { "type": "Aburage", "level": "town", "pos": [45, 8] },
+        "aburage_22": { "type": "Aburage", "level": "town", "pos": [43, 9] },
+        "aburage_23": { "type": "Aburage", "level": "town", "pos": [72, 11] },
+        "aburage_24": { "type": "Aburage", "level": "town", "pos": [28, 12] },
+        "aburage_25": { "type": "Aburage", "level": "town", "pos": [14, 16] },
+        "aburage_26": { "type": "Aburage", "level": "town", "pos": [52, 16] },
+        "aburage_27": { "type": "Aburage", "level": "town", "pos": [29, 17] },
+        "aburage_28": { "type": "Aburage", "level": "town", "pos": [35, 17] },
+        "aburage_29": { "type": "Aburage", "level": "town", "pos": [64, 17] },
         "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] },
@@ -153,30 +153,22 @@
         "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] },
-        "tail_shapeshift": { "type": "ShapeshiftTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_fireball": { "type": "FireballTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_sprint": { "type": "SprintTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_invisibility": { "type": "InvisibilityTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_flight": { "type": "FlightTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_shield": { "type": "ShieldTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_steal": { "type": "StealTail", "level": "_limbo", "pos": [1, 1] },
-        "tail_lightning": { "type": "LightningTail", "level": "_limbo", "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", "facing": null },
-        "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.json", "state": "start", "facing": null, "block": true },
-        "hattori": { "type": "Hattori", "level": "road", "pos": [37, 8], "dsm": "npcs/hattori.json", "state": "start", "facing": "left", "block": true },
-        "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "facing": "right", "block": true },
-        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start", "facing": null, "block": true },
-        "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": null },
-        "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start" , "facing": null},
-        "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" , "facing": null},
-        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" , "facing": null},
-        "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" , "facing": null},
-        "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" , "facing": null},
-        "actor": { "type": "Actor", "level": "theatre", "pos": [12, 9], "dsm": "npcs/actor.json", "state": "start" , "facing": null},
-        "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [17, 20], "dsm": "npcs/kitsune.json", "state": "start" , "facing": null}
+        "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
+        "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.json", "state": "start", "block": true },
+        "hattori": { "type": "Hattori", "level": "road", "pos": [37, 8], "dsm": "npcs/hattori.json", "state": "start", "block": true },
+        "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "block": true },
+        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start", "block": true },
+        "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
+        "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start" },
+        "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
+        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
+        "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
+        "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" },
+        "actor": { "type": "Actor", "level": "theatre", "pos": [12, 9], "dsm": "npcs/actor.json", "state": "start" },
+        "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [17, 20], "dsm": "npcs/kitsune.json", "state": "start" }
     },
     "levels": {
         "celestial_plane" : "celestial_plane",
--- a/data/levels/town.json	Sat Apr 09 21:59:59 2011 +0200
+++ b/data/levels/town.json	Sat Apr 09 22:03:42 2011 +0200
@@ -7,29 +7,35 @@
     "tileset": "fan_green",                                                                                  
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-        "X{..........}X{............................}X{............}X{...........}X",
-        "X............X..............................X..............X....<bd>.....X",
+        "X{..........}X{............................}X{............}X{....?......}X",
+        "X...........?X..............................X?.............X....<bd>.....X",
         "X.........<+bXd=>......<+bq..?..pd=>.....<+bXd=>...........X.............X",         
         "X........................}bXXXXXd{.........................Xd=>..........X",
-        "X......<+bq..?..pd=>........}X{............................X{........<-+bX",
-        "X........}bXXXXXd{...........X......p=-+bq..?..pd=>.....<+bX....?.......}X",
-        "X...<bd>....}X{..........<+bXX...<+bd...}bXXXXXd{.........}Xd=----->.....X",
-        "X..?.........X...<bd>.......}X.............}X{.............X{.........<+bX",
-        "XXXq.........X.........?.....Xd=->..........Xd........<--+bX............}X",
-        "X{}bd=>......X.......<---+bXXX{......<---+bXX{............}Xd=--->.......X",       
-        "X.........?..Xd=->..........}X.............}X....<bd>......X{............X",
-        "X........pXXXX{..............Xd=>...........Xd=>........<+bd.........<+bXX",
+        "X......<+bq..?..pd=>........}X{.......?....................X{........<-+bX",
+        "X........}bXXXXXd{..........?X......p=-+bq..?..pd=>.....<+bX?...?.......}X",
+        "X...<bd>....}X{..........<+bXX...<+bd...}bXXXXXd{.........}Xd=----->....?X",
+        "X..?.........X...<bd>.......}X.............}X{?.......?....X{.........<+bX",
+        "XXXq.........X.........?.....Xd=->.........?Xd........<--+bX............}X",
+        "X{}bd=>......X.......<---+bXXX{......<---+bXX{.....?......}Xd=--->.......X",       
+        "X.........?..Xd=->..........}X.............}X....<bd>......X{...........?X",
+        "X........pXXXX{.............?Xd=>...........Xd=>........<+bd.........<+bXX",
         "X.....<+bd{.}X..........<+bXXX{........<-+bXX{..........................}X",
         "X............Xd=--->........}X.............}X......<--+bq..?...?.pd=>....X",
         "XXXq.?.......X{..............Xd=-->.........Xd=>.......}bXXXXXXXXd{......X",
-        "X{}bd=>......X.........<--+bXd{.......<--+bXX{....pq................pq...X",    
-        "X............Xd=-->........................}X....<+bd=>..........p=-+bq..X",
+        "X{}bd=>......X?........<--+bXd{.......<--+bXX{....pq?...............pq...X",    
+        "X.........?..Xd=-->..........?.....?.......}X....<+bd=>.........?p=-+bq..X",
         "X........pXXXX{.............pq....<bd>......X............pq...<+bd...}bXXX",
         "X.....<+bd{}bd........<---+bd=>..........<+bd.........<+bd=>............}X",
-        "X........................................................................X",
+        "X.................?..............................?.......................X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
-    "enemies": [                                                                              
+    "enemies": [                           
+        {"type": "FlyingOni", "pos": [10, 17], "direction": "left" },    
+        {"type": "FlyingOni", "pos": [51, 10], "direction": "right" },                          
+        {"type": "FlyingOni", "pos": [54, 8], "direction": "left" },    
+        {"type": "FlyingOni", "pos": [38, 5], "direction": "right" },                          
+        {"type": "FlyingOni", "pos": [18, 20], "direction": "left" },    
+        {"type": "FlyingOni", "pos": [49, 20], "direction": "right" },                                                                            
         {"type": "PatrollingOni", "pos": [3, 8], "direction": "left" },    
         {"type": "PatrollingOni", "pos": [10, 11], "direction": "right" },
         {"type": "PatrollingOni", "pos": [23, 9], "direction": "left" },