Mercurial > skaapsteker
changeset 432:e65f6783a9f7
placed fire on the road; animation not yet hooked up
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 18:51:11 +0200 |
| parents | b753ea36909e |
| children | fe99a4e04b2b |
| files | data/game.json data/levels/road.json skaapsteker/sprites/items.py |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/data/game.json Sat Apr 09 18:46:28 2011 +0200 +++ b/data/game.json Sat Apr 09 18:51:11 2011 +0200 @@ -39,6 +39,7 @@ "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2], "brewed": false }, "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] }, "fan": { "type": "Fan", "level": "temple", "pos": [18, 5] }, + "signal_fire": { "type": "SignalFire", "level": "road", "pos": [16, 6], "litness": false }, "kindling": { "type": "Kindling", "level": "road", "pos": [37, 3] }, "oil": { "type": "Oil", "level": "road", "pos": [17, 8] }, "cannon": { "type": "Cannon", "level": "road", "pos": [57, 8], "broken": false },
--- a/data/levels/road.json Sat Apr 09 18:46:28 2011 +0200 +++ b/data/levels/road.json Sat Apr 09 18:51:11 2011 +0200 @@ -11,7 +11,7 @@ "X|..(Xd{}bXXXXXXd{.........}bXXXXXXq.?..XX{............}XXXXXXX{..........X", "X.........}bXd{...................}bXXq.Xd..............bXXXXXd.......s.?.X", "Xq................(XXXXXq............}XXX{................}XXX{.......pXXXX", - "XXXXq.s.......s.....|.}bXXXq..........XXd|.....pq..........XXd|.....pXXXXXX", + "XXXXq.s.......s.?...|.}bXXXq..........XXd|.....pq..........XXd|.....pXXXXXX", "XXXXXXq..?....pXXXX).....}bXXq........bd{....pXXXXq........bd{....pXXXXXXXX", "XXXXXXXXXXXXXXXX{?...?.....}XXXq....??.....pXXXXXXXXq...?.?.....pXXXXXXXXXX", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
--- a/skaapsteker/sprites/items.py Sat Apr 09 18:46:28 2011 +0200 +++ b/skaapsteker/sprites/items.py Sat Apr 09 18:51:11 2011 +0200 @@ -132,7 +132,7 @@ # TODO: Finish this thing's behaviour class SignalFire(Item): - image_file = 'dummy.png' + image_file = 'props/signal_fire/signal_fire_unlit.png' def setup(self, litness, **opts): super(SignalFire, self).setup(**opts)