Mercurial > skaapsteker

changeset 451:7f198761a7be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
boss kitsune
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 20:25:37 +0200
parents e2b43fe37ac4
children 2e9e24d0e594 5d59238f8996
files data/game.json data/levels/celestial_plane.json data/sprites/boss_kitsune.png skaapsteker/sprites/npcs.py
diffstat 4 files changed, 24 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 20:14:19 2011 +0200
+++ b/data/game.json	Sat Apr 09 20:25:37 2011 +0200
@@ -70,7 +70,7 @@
         "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": [10, 3], "dsm": "npcs/kitsune.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/celestial_plane.json	Sat Apr 09 20:14:19 2011 +0200
+++ b/data/levels/celestial_plane.json	Sat Apr 09 20:25:37 2011 +0200
@@ -13,24 +13,24 @@
         "X....}bXq..}bXq.?......()...........X",
         "X......}bq...}bXXq..................X",
         "X.......}bXXq...}bXq................X",
-        "X..........}bXq...}XXXXXq.?.........X",
-        "X............}bXXXXXXXX.XXXXq.......X",
-        "X...()...............}bXXXXXXq?.....X",
+        "X..?.......}bXq...}XXXXXq.?.........X",
+        "X............}bXXXXXXXX.XXXq........X",
+        "X...()...............}bXXXXXq.?.....X",
         "X.........?...?...?.......}bXXq.....X",
-        "X.........pXXXXXXXXXq......}X.Xq....X",
-        "X......?pXXXXXXXXXXXXXq.....bXXX?...X",
-        "X......pXXd{.......}bXXXq....}XXq...X",
-        "X....?pXXd{.........}bX.X?....X.X...X",
+        "X.........pXXXXXXXXXq......}X.X.?...X",
+        "X......?.pXXXXXXXXXXXXq.....bXXXq...X",
+        "X......pXXd{.......}bXXXq....}XXX...X",
+        "X....?.XXd{.........}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.?..X.X..............X..X....XXX.?.X",
+        "X....X.X...(q.........X.Xd....XXd...X",
+        "X....X.X...}bq?......pXXd{....XX{...X",
+        "X....bXXq...}bq..?..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.?.....}bXXXq....?....pXXXXd{....?.X",
         "X........}bXXXXXXXXXXXXXXXd{........X",
         "X...().....}bXXXXXXXXXXXd{.....()...X",
         "X...................................X",
@@ -40,14 +40,18 @@
     "enemies": [
         {"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": [32, 11], "direction": "right" },
+        {"type": "PatrollingOni", "pos": [18, 10], "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": "FlyingOni", "pos": [28, 20], "direction": "left" },
+        {"type": "FlyingOni", "pos": [26, 22], "direction": "right" },
+        {"type": "FlyingOni", "pos": [3, 7], "direction": "right" },
+        {"type": "FlyingOni", "pos": [2, 17], "direction": "left" },
+        {"type": "FlyingOni", "pos": [2, 24], "direction": "right" },
+        {"type": "FlyingOni", "pos": [34, 17], "direction": "left" },
+        {"type": "FlyingOni", "pos": [34, 24], "direction": "right" },
         {"type": "PatrollingOni", "pos": [14, 10], "direction": "right" },
         {"type": "PatrollingOni", "pos": [18, 24], "direction": "right" },
         {"type": "PatrollingOni", "pos": [12, 28], "direction": "left" },
Binary file data/sprites/boss_kitsune.png has changed
--- a/skaapsteker/sprites/npcs.py	Sat Apr 09 20:14:19 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sat Apr 09 20:25:37 2011 +0200
@@ -60,5 +60,5 @@
 class Kitsune(NPC):
     image_dir = 'sprites'
     animation_regexes = [
-        ("being_evil", "dummy.png"),
+        ("being_evil", "boss_kitsune.png"),
     ]