Mercurial > skaapsteker

changeset 445:5c8d090dbeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added backgrounds and tweaked some oni
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 19:52:44 +0200
parents 75a9eb54fbc4
children 4240854e59b0
files data/levels/celestial_plane.json data/levels/fishmonger_house.json data/levels/geisha_room.json data/levels/market.json data/levels/road.json data/levels/tea_house.json data/levels/theatre.json data/levels/town.json sources/story/list_of_levels.txt
diffstat 9 files changed, 50 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/celestial_plane.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/celestial_plane.json	Sat Apr 09 19:52:44 2011 +0200
@@ -15,20 +15,20 @@
         "X.......}bXXq...}bXq................X",
         "X..........}bXq...}XXXXXq.?.........X",
         "X............}bXXXXXXXX.XXXXq.......X",
-        "X...()...............}bXXXXXXq......X",
-        "X............?....?.......}bXXq.....X",
+        "X...()...............}bXXXXXXq?.....X",
+        "X.........?...?...?.......}bXXq.....X",
         "X.........pXXXXXXXXXq......}X.Xq....X",
-        "X.......pXXXXXXXXXXXXXq.....bXXX....X",
+        "X......?pXXXXXXXXXXXXXq.....bXXX?...X",
         "X......pXXd{.......}bXXXq....}XXq...X",
-        "X.....pXXd{.........}bX.X.....X.X...X",
+        "X....?pXXd{.........}bX.X?....X.X...X",
         "X....pXXd{...........}X.Xq....XXX...X",
         "X....X.X..............X..X....X.X...X",
         "X....X.X..............X..X....XXX...X",
         "X....X.X...(q.?.......X.Xd....XXd...X",
         "X....X.X...}bXq......pXXd{....XX{...X",
-        "X....bXXq...}bXq....pXXd{.....XX....X",
+        "X....bXXq...}bXq....pXXd{....?XX....X",
         "X....}bXXq...}bXXXXXXXd{....pXXX....X",
-        "X.....}bXXq.....}bXXd{......X.Xd....X",
+        "X.....}bXXq.....}bXXd{.....?X.Xd....X",
         "X......}bXXq.............pXXXXd{....X",
         "X.......}bXXXq....?....pXXXXd{......X",
         "X........}bXXXXXXXXXXXXXXXd{........X",
@@ -38,13 +38,21 @@
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
-        {"type": "FlyingOni", "pos": [26, 7], "direction": "left" },
-        {"type": "FlyingOni", "pos": [13, 10], "direction": "right" },
+        {"type": "FlyingOni", "pos": [26, 7], "direction": "right" },
+        {"type": "FlyingOni", "pos": [30, 9], "direction": "left" },
+        {"type": "FlyingOni", "pos": [32, 12], "direction": "right" },
         {"type": "FlyingOni", "pos": [18, 10], "direction": "left" },
-        {"type": "FlyingOni", "pos": [18, 24], "direction": "right" },
-        {"type": "FlyingOni", "pos": [12, 28], "direction": "left" },
-        {"type": "FlyingOni", "pos": [18, 28], "direction": "right" },
-        {"type": "FlyingOni", "pos": [24, 28], "direction": "left" }
+        {"type": "FlyingOni", "pos": [10, 10], "direction": "right" },
+        {"type": "FlyingOni", "pos": [7, 12], "direction": "left" },
+        {"type": "FlyingOni", "pos": [5, 14], "direction": "right" },
+        {"type": "FlyingOni", "pos": [29, 20], "direction": "left" },
+        {"type": "FlyingOni", "pos": [27, 22], "direction": "right" },
+        {"type": "FlyingOni", "pos": [25, 14], "direction": "left" },
+        {"type": "PatrollingOni", "pos": [14, 10], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [18, 24], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [12, 28], "direction": "left" },
+        {"type": "PatrollingOni", "pos": [18, 28], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [24, 28], "direction": "left" }
     ],
     "doorways": {
         "starting": {"type": "Doorway", "pos": [16, 4], "facing": "right", "leadsto": "town.to_celestial_plane"}
--- a/data/levels/fishmonger_house.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/fishmonger_house.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The fishmonger's house",
     "backgrounds": [
-        "background_01_back.png"
+        "background_04_back.png",
+        "background_04_front.png"
     ],
     "tileset": "red",
     "tiles": [
--- a/data/levels/geisha_room.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/geisha_room.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "Kumiko's rooms",
     "backgrounds": [
-        "background_01_back.png"
+        "background_02_back.png",
+        "background_02_front.png"
     ],
     "tileset": "flower_light",
     "tiles": [
--- a/data/levels/market.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/market.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The market",
     "backgrounds": [
-        "background_01_back.png"
+        "background_04_back.png",
+        "background_04_front.png"
     ],
     "tileset": "red",
     "tiles": [
--- a/data/levels/road.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/road.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The road",
     "backgrounds": [
-        "background_01_back.png"
+        "background_03_back.png",
+        "background_03_front.png"
     ],
     "tileset": "fan_green",
     "tiles": [
--- a/data/levels/tea_house.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/tea_house.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The tea house",
     "backgrounds": [
-        "background_01_back.png"
+        "background_02_back.png",
+        "background_02_front.png"
     ],
     "tileset": "flower_light",
     "tiles": [
--- a/data/levels/theatre.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/theatre.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The theatre",
     "backgrounds": [
-        "background_01_back.png"
+        "background_02_back.png",
+        "background_02_front.png"
     ],
     "tileset": "flower_dark",
     "tiles": [
@@ -12,16 +13,18 @@
         "X.....pXXXXXXXXXXq.....X",
         "X.....Xd{h.!..h}bX.....X",
         "X=>...X{........}X...<+X",         
-        "X....?X..........X?....X",        
+        "X...?.X..........X.?...X",        
         "X...<+d..........b=>...X",
         "X...........?..........X",
         "X=>.......?pq?.......<+X",
-        "X........pXXXXq........X",
+        "X...?....pXXXXq....?...X",
         "XXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
-        {"type": "RedOni", "pos": [5, 7], "direction": "left" },
-        {"type": "RedOni", "pos": [18, 7], "direction": "right" }
+        {"type": "RedOni", "pos": [4, 7], "direction": "left" },
+        {"type": "RedOni", "pos": [19, 7], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [4, 11], "direction": "left" },
+        {"type": "PatrollingOni", "pos": [19, 11], "direction": "right" }
     ],
     "doorways": {
         "starting": {"type": "Doorway", "pos": [11, 3], "facing": "right", "leadsto": "town.to_theatre"}
--- a/data/levels/town.json	Sat Apr 09 19:25:31 2011 +0200
+++ b/data/levels/town.json	Sat Apr 09 19:52:44 2011 +0200
@@ -1,7 +1,8 @@
 {
     "description": "The town",
     "backgrounds": [
-        "background_01_back.png"
+        "background_03_back.png",
+        "background_03_front.png"
     ],
     "tileset": "fan_green",                                                                                  
     "tiles": [
--- a/sources/story/list_of_levels.txt	Sat Apr 09 19:25:31 2011 +0200
+++ b/sources/story/list_of_levels.txt	Sat Apr 09 19:52:44 2011 +0200
@@ -1,50 +1,50 @@
 Levels
 ------
 
-Temple - blue - DONE
+Temple DONE
 * monk and tea
 -> temple grounds
 
-Temple grounds - blue - DONE
+Temple grounds  DONE
 * leaving temple
 -> road
 -> temple
 
-Road - fan_green - DONE
+Road DONE
 * distract samurai
 * damage cart
 -> temple grounds
 -> town
 
-Town - fan_green - DONE
+Town DONE
 -> theatre
 -> tea house
 -> market
 -> celestial plane (unlocks later)
 
-Geisha's rooms - flower_light - DONE
+Geisha's rooms DONE
 * Embarrass geisha
 -> tea house
 
-Theatre - flower_dark - DONE
+Theatre DONE
 * No play
 -> town
 
-Market - red - DONE
+Market DONE
 * Maneki neko
 -> Fishmonger's house
 
-Fishmonger's house - red - DONE
+Fishmonger's house DONE
 * Fishmonger
 * Fish for geisha
 -> market
 
-Tea house - flower_light - DONE
+Tea house DONE
 * Business deal
 -> geisha's rooms
 -> town
 
-Celestial plane - fan_gold
+Celestial plane DONE
 * fight kitsune
 
 (Maybe add more intermediate levels later)