# HG changeset patch # User Adrianna Pińska # Date 1302282764 -7200 # Node ID e006ec7b3d8f17b8919c6f4252992ef2b2634974 # Parent 630ebb87b38a636c414246dd56d3dd43d29029d9 proper levels diff -r 630ebb87b38a -r e006ec7b3d8f data/game.json --- a/data/game.json Fri Apr 08 17:32:50 2011 +0200 +++ b/data/game.json Fri Apr 08 19:12:44 2011 +0200 @@ -12,25 +12,30 @@ "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] }, "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] }, "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] }, - "vase": { "type": "Vase", "level": "level2", "pos": [1, 3], "broken": false } + "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false } }, "npcs": { "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" }, - "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" }, - "hattori": { "type": "Hattori", "level": "level3", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" }, - "ichiro": { "type": "Ichiro", "level": "level3", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" }, - "kaneda": { "type": "Kaneda", "level": "level4", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" }, - "kumiko": { "type": "Kumiko", "level": "level4", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" }, - "actor": { "type": "Actor", "level": "level5", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" }, - "sasuke": { "type": "Sasuke", "level": "level5", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" }, - "kitsune": { "type": "Kitsune", "level": "level5", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" } + "guard": { "type": "Guard", "level": "temple_grounds", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" }, + "hattori": { "type": "Hattori", "level": "road", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" }, + "ichiro": { "type": "Ichiro", "level": "road", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" }, + "kaneda": { "type": "Kaneda", "level": "tea_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" }, + "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" }, + "actor": { "type": "Actor", "level": "theatre", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" }, + "sasuke": { "type": "Sasuke", "level": "road", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" }, + "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" } }, "levels": { + "celestial_plane" : "celestial_plane", + "fishmonger_house" : "fishmonger_house", + "geisha_room" : "geisha_room", + "market" : "market", + "road" : "road", + "tea_house" : "tea_house", + "temple_grounds" : "temple_grounds", "temple" : "temple", - "level2" : "level2", - "level3" : "level3", - "level4" : "level4", - "level5" : "level5" + "theatre" : "theatre", + "town" : "town" }, "player": {"level": "temple", "doorway": "starting"} } diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/celestial_plane.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/celestial_plane.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,25 @@ +{ + "description": "The celestial plane", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "fan_gold", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_celestial_plane"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/fishmonger_house.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/fishmonger_house.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,25 @@ +{ + "description": "The fishmonger's house", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "red", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" }, + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "market.to_fishmonger_house"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/geisha_room.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/geisha_room.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,25 @@ +{ + "description": "Kumiko's rooms", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "flower_light", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "tea_house.to_geisha_room"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/level2.json --- a/data/levels/level2.json Fri Apr 08 17:32:50 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -{ - "backgrounds": [ - "background_02_back.png", - "background_02_front.png" - ], - "tileset": "red", - "tiles": [ - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", - "X{..........}XX{...........................}XX{...........}XX{..........}X", - "X............XX..........pq......pq.........XX.............XX........<+bXX", - "X.........<+bXXd=>....<+bXXXXXXXXXXd=>...<+bXXd=>..........XX...........}X", - "X...........................}XX{...........}bd{...<+bd=>...XXd=>.........X", - "X........pq..?...pq..........XX............................XX{........<+bX", - "X.....<+bXXXXXXXXXXd=>...<+bXXX.........pq......pq......<+bXX...........}X", - "X...........}XX{............}XX......<+bXXXXXXXXXXd=>.....}XXd=----->....X", - "X..?.........XX..............XXd=>.........}XX{............XX{...........X", - "XXXXd=>......XX......<---+bXXXX{.........<+bXX..........<+bXX............X", - "X{...........XX.............}XX............}XX............}XXd=--->......X", - "X............XXd=-->.........XXd=->.........XX.............XX{...........X", - "X.....<+bXXXXXX{.......<-+bXXXX{........<+bXXX).........<+bXX............X", - "X...........}XX.............}XX............}XX{............}bd=>.........X", - "X............XXd=---->.......XXd=>..........XX.........pq................X", - "XXXXd=>......XX{.........<+bXXd{........<+bXXX).....<+bXXXXXXXXXXd=>.....X", - "X{...........XX............................}XX{..........................X", - "X............XXd=-->........................XX...........................X", - "X.....<+bXXXXXX{.............pq..........<+bXX)..........<+bd=>....<+bXXXX", - "X...........}XX..............XX............}XX{.........................}X", - "X............XXX=>........<+XXXq...........pXXq..........................X", - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - ], - "enemies": [], - "sprites": [], - "doorways": { - "starting": {"type": "StartingDoorway", "pos": [5, 5], "facing": "right"}, - "to_temple": {"type": "Doorway", "pos": [29, 2], "facing": "right", "leadsto": "temple.to_level2"} - } -} diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/level3.json --- a/data/levels/level3.json Fri Apr 08 17:32:50 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -{ - "backgrounds": [ - "dummy.png", - "dummy-fg.png" - ], - "tileset": "flower_dark", - "tiles": [ - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", - "X{..}bd{............}bXXd{.................}bXXXXXXXXd{........}bXXXXXXXXX", - "X....................}bd{.....................}bXXd{...............}bXXXXX", - "X.........<-+bXXXXq........pXXXd=+bXXXXd=->....}bd{...................}bXX", - "X...............}Xd......(Xd{..........................................}bX", - "XXXq.................()..............................pXXXXXXXq..........}X", - "XXXXXXXq...................................pXXXXXXXXXXd{...}bXd=+bXXq....X", - "X{...}bXXXd=>..<+bXq.............pXXXd=+bXXXd{...................}bXXXXXXX", - "X.................}bXXXd=>..<+bXXXd{....................................}X", - "X............pq........................................pXq...............X", - "X...........pXXq..........pq..................pXXXXXXXXXXXXXq............X", - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - ], - "enemies": [], - "sprites": [], - "doorways": { - "starting": {"type": "StartingDoorway", "pos": [2, 1], "facing": "right"} - } -} diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/level4.json --- a/data/levels/level4.json Fri Apr 08 17:32:50 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -{ - "backgrounds": [ - "dummy.png", - "dummy-fg.png" - ], - "tileset": "fan_green", - "tiles": [ - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", - "X{................}X{...................................................}X", - "X..................X.....................................................X", - "XXXXX)..(XXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXX", - "X{........}X{.............................}X{...........................}X", - "X..........X...............................X.............................X", - "X..(XXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXXX", - "X...........................}X{...........................}X{...........}X", - "X............................X.............................X.............X", - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX)..(XXXXXXXX)..(XXXXXXXXXXXXXXXXXXXXX)..(XX", - "X{..................................}X{.................................}X", - "X....................................X...................................X", - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - ], - "enemies": [], - "sprites": [], - "doorways": { - "starting": {"type": "StartingDoorway", "pos": [5, 2], "facing": "right"} - } -} diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/level5.json --- a/data/levels/level5.json Fri Apr 08 17:32:50 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -{ - "backgrounds": [ - "dummy.png", - "dummy-fg.png" - ], - "tileset": "fan_gold", - "tiles": [ - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", - "X........................................................................X", - "X.................................................().....................X", - "X.....()....................pXXXXXXXXXXq.................................X", - "X......................pq...XXXXXXXXXXXX......pq......pXXXXXXXXXXXq......X", - "X......................bd...bXXd{..}bXXd......bd......XXXXXXXXXXXXX......X", - "X.....................................................bXXd{...}bXXd......X", - "X.........pXXXXXXXXXXq...................................................X", - "X.........XXXXXXXXXXXX....................().............................X", - "X.........bXXd{..}bXXd........pq..........................().............X", - "X.............................bd.........................................X", - "X.....................................pXXXXXXXXXXXXXq....................X", - "X.....................................XXXXXXXXXXXXXXX=--------+XXXXXXXXXXX", - "XXXXXXXXXXXXXX=---->...<-----+bd=----+bXXd{.....}bXXd..........XXXXXXXXXXX", - "XXXXXXXXXXXXXX.................................................bXXd{....}X", - "X{.......}bXXd...........................................................X", - "X.................().....................................................X", - "X.......................................................()...............X", - "X.........................pXXXXXXXXXXXXXXXq..............................X", - "X.........................XXXXXXXXXXXXXXXXX..............................X", - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" - ], - "enemies": [], - "sprites": [], - "doorways": { - "starting": {"type": "StartingDoorway", "pos": [5, 2], "facing": "right"} - } -} diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/market.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/market.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,26 @@ +{ + "description": "The market", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "red", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_market"}, + "to_fishmonger_house": {"type": "Doorway", "pos": [10, 9], "facing": "left", "leadsto": "fishmonger_house.starting"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/road.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/road.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,26 @@ +{ + "description": "The road", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "fan_green", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "temple_grounds.to_road"}, + "to_town": {"type": "Doorway", "pos": [10, 9], "facing": "left", "leadsto": "town.starting"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/tea_house.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/tea_house.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,26 @@ +{ + "description": "The tea house", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "flower_light", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_tea_house"}, + "to_geisha_room": {"type": "Doorway", "pos": [10, 9], "facing": "left", "leadsto": "geisha_room.starting"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/temple.json --- a/data/levels/temple.json Fri Apr 08 17:32:50 2011 +0200 +++ b/data/levels/temple.json Fri Apr 08 19:12:44 2011 +0200 @@ -30,6 +30,6 @@ ], "doorways": { "starting": {"type": "StartingDoorway", "pos": [4, 17], "facing": "right"}, - "to_level2": {"type": "Doorway", "pos": [17, 16], "facing": "left", "leadsto": "level2.to_temple"} + "to_temple_grounds": {"type": "Doorway", "pos": [17, 16], "facing": "left", "leadsto": "temple_grounds.to_temple"} } } diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/temple_grounds.json --- a/data/levels/temple_grounds.json Fri Apr 08 17:32:50 2011 +0200 +++ b/data/levels/temple_grounds.json Fri Apr 08 19:12:44 2011 +0200 @@ -26,6 +26,7 @@ {"type": "RedOni", "pos": [26, 11], "direction": "right" } ], "doorways": { - "starting": {"type": "StartingDoorway", "pos": [3, 2], "facing": "right"} + "starting": {"type": "Doorway", "pos": [3, 2], "facing": "right", "leadsto": "temple.to_temple_grounds"}, + "to_road": {"type": "Doorway", "pos": [3, 11], "facing": "left", "leadsto": "road.starting"} } } diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/theatre.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/theatre.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,25 @@ +{ + "description": "The theatre", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "flower_dark", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "town.to_theatre"}, + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f data/levels/town.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/levels/town.json Fri Apr 08 19:12:44 2011 +0200 @@ -0,0 +1,29 @@ +{ + "description": "The town", + "backgrounds": [ + "background_01_back.png" + ], + "tileset": "fan_green", + "tiles": [ + "XXXXXXXXXXXXXXXXXXXXXX", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "X....................X", + "XXXXXXXXXXXXXXXXXXXXXX" + ], + "enemies": [ + {"type": "RedOni", "pos": [5, 5], "direction": "left" } + ], + "doorways": { + "starting": {"type": "Doorway", "pos": [3, 9], "facing": "right", "leadsto": "road.to_town"}, + "to_theatre": {"type": "Doorway", "pos": [6, 9], "facing": "right", "leadsto": "theatre.starting"}, + "to_tea_house": {"type": "Doorway", "pos": [9, 9], "facing": "right", "leadsto": "tea_house.starting"}, + "to_market": {"type": "Doorway", "pos": [12, 9], "facing": "right", "leadsto": "market.starting"}, + "to_celestial_plane": {"type": "Doorway", "pos": [15, 9], "facing": "left", "leadsto": "celestial_plane.starting"} + } +} \ No newline at end of file diff -r 630ebb87b38a -r e006ec7b3d8f skaapsteker/menuscene.py --- a/skaapsteker/menuscene.py Fri Apr 08 17:32:50 2011 +0200 +++ b/skaapsteker/menuscene.py Fri Apr 08 19:12:44 2011 +0200 @@ -13,12 +13,17 @@ self.widgets.append(Text("MENU:", (50, 50), color='white', size=48)) self.cur_game = cur_game menu_options = [ + ('Starting Cutscene', 'cutscene'), ('Temple', 'temple.starting'), - ('Level 2', 'level2.starting'), - ('Level 3', 'level3.starting'), - ('Level 4', 'level4.starting'), - ('Level 5', 'level5.starting'), - ('Starting Cutscene', 'cutscene'), + ("Temple grounds", "temple_grounds.starting"), + ("Road", "road.starting"), + ("Town", "town.starting"), + ("Tea house", "tea_house.starting"), + ("Kumiko's rooms", "geisha_room.starting"), + ("Market", "market.starting"), + ("Fishmonger's house", "fishmonger_house.starting"), + ("Theatre", "theatre.starting"), + ("Celestial plane", "celestial_plane.starting"), ('Quit', 'quit'), ] if cur_game is not None: diff -r 630ebb87b38a -r e006ec7b3d8f sources/story/list_of_levels.txt --- a/sources/story/list_of_levels.txt Fri Apr 08 17:32:50 2011 +0200 +++ b/sources/story/list_of_levels.txt Fri Apr 08 19:12:44 2011 +0200 @@ -1,50 +1,52 @@ Levels ------ -Temple +Temple - blue * monk and tea -> temple grounds -Temple grounds +Temple grounds - blue * leaving temple -> road -> temple -Road +Road - fan_green * distract samurai * damage cart -> temple grounds -> town -Town +Town - fan_green -> theatre -> tea house -> market -> celestial plane (unlocks later) -Geisha's rooms +Geisha's rooms - flower_light * Embarrass geisha -> tea house -Theatre +Theatre - flower_dark * No play -> town -Market +Market - red * Maneki neko -> Fishmonger's house -Fishmonger's house +Fishmonger's house - red * Fishmonger * Fish for geisha -> market -Tea house +Tea house - flower_light * Business deal -> geisha's rooms -> town -Celestial plane +Celestial plane - fan_gold * fight kitsune -(Maybe add more intermediate levels later) \ No newline at end of file +(Maybe add more intermediate levels later) +* Theatre and backstage? +* Gauntlet of nasty oni before the kitsune room? \ No newline at end of file