diff --git a/data/backgrounds/kitchen2.png b/data/backgrounds/kitchen2.png new file mode 100644 index 0000000..fa0bc6b Binary files /dev/null and b/data/backgrounds/kitchen2.png differ diff --git a/data/levels.dat b/data/levels.dat index 0f8ee27..d59c117 100644 --- a/data/levels.dat +++ b/data/levels.dat @@ -38,11 +38,10 @@ 106,level106.dat,Bunkers 18,level8.5.dat,Look out above... 40,level40.dat,King Snail +41,level41.dat,Basic Kitchen +42,level42.dat,Precarious Loaves +403,level403.dat,Delayed Release +404,level404.dat,Off Cuts +405,level405.dat,Pitfalls 109,level109.dat,THE END SO FAR 99,level99.dat,TEST LEVEL -118,level118.dat,NEW LEVEL -119,level119.dat,NEW LEVEL -120,level120.dat,NEW LEVEL -121,level121.dat,NEW LEVEL -122,level122.dat,NEW LEVEL -123,level123.dat,NEW LEVEL diff --git a/data/world1/level403.dat b/data/world1/level403.dat new file mode 100644 index 0000000..1c7a356 --- /dev/null +++ b/data/world1/level403.dat @@ -0,0 +1,53 @@ +bgfile kitchen1.png +bg 0 +hurryup 30 +help +endhelp +monsters +0 5 25 +132 30 13 488 474 488 220 +1 28 24 +7 20 15 +7 11 9 +18 19 7 +6 6 5 +12 5 17 +1 12 21 +1 34 16 +1 27 28 +1 32 20 +endmonsters +exitdir 1 +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,0,0,0,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,58,58,58,58,58,58,58,58,58,58,58,20,20,20,57,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,57,0,0,0,57,57,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,58,58,58,58,58,58,58,58,58,57,57,57,57, +57,0,0,58,58,58,58,58,58,58,58,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,58,58,58,58,58,58,58,58,58,57,57,57,57, +57,0,0,0,0,0,0,0,0,58,58,58,58,58,58,58,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,58,58,58,58,58,58,58,58,58,57,57,57,57, +57,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,0,0,0,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,0,0,0,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,0,0,0,57,57,58,58,58,58,58,58,58,58,58,57,57,57,57, +layer2 +8,8,8 +20,8,8 diff --git a/data/world1/level404.dat b/data/world1/level404.dat new file mode 100644 index 0000000..fd55b5f --- /dev/null +++ b/data/world1/level404.dat @@ -0,0 +1,68 @@ +bgfile kitchen1.png +bg 0 +hurryup 30 +help +endhelp +monsters +0 6 28 +23 23 14 +132 13 27 260 412 205 384 254 352 206 325 249 296 207 266 249 266 210 296 248 322 209 351 252 381 210 409 256 441 209 441 +6 23 5 +1 25 20 +18 38 10 +6 32 19 +1 8 5 +124 27 11 +124 34 7 +1 6 13 +18 25 28 +18 24 14 +15 6 17 +15 7 17 +15 8 17 +17 1 24 +17 5 21 +17 1 17 +17 5 13 +17 1 9 +17 5 5 +16 21 1 +16 26 1 +16 25 1 +16 22 1 +endmonsters +exitdir 1 +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,57,0,0,0,0,57,60,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,57,0,0,0,0,0,0,57,60,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,59,58,58,58,58,58,58,58,20,20,20,20,20,20,57,58,0,0,0,0,0,0,58,57,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,59,57,57,57,57,57,57,57,0,0,0,0,0,0,0,57,57,58,58,58,58,58,58,57,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,0,0,0,0,0,0,59,58,60,0,0,0,57, +57,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,0,0,0,57, +57,60,0,0,0,0,0,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,57,57,57,0,0,0,57, +57,0,0,0,0,0,0,0,57,57,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,57,57,57,57,57,57,58,58,57, +57,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,57,57,57,57,57,57,57,57,57,57, +57,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,0,0,0,0,0,57,57,57,57, +57,0,0,0,0,59,58,58,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,57,57,0,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,57, +57,60,0,0,0,0,59,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,57,57,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,57,57,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,57,57,57,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,58,58,60,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,59,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,57,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,0,0,0,0,0,0,7,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57, +57,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,57, +layer2 +36,11,8 +36,12,7 +36,13,7 diff --git a/data/world1/level405.dat b/data/world1/level405.dat new file mode 100644 index 0000000..3360d4a --- /dev/null +++ b/data/world1/level405.dat @@ -0,0 +1,73 @@ +bgfile kitchen2.png +bg 0 +hurryup 30 +help +endhelp +monsters +0 3 17 +23 19 9 +132 8 18 234 304 133 304 +6 30 2 +6 26 20 +6 6 5 +6 9 21 +132 31 18 372 304 505 304 +1 19 17 +49 35 6 +15 17 5 +15 20 5 +15 18 5 +15 19 5 +17 17 9 +17 20 9 +17 21 9 +17 16 9 +16 17 13 +16 18 13 +16 19 13 +16 20 13 +17 30 6 +49 9 8 +17 2 8 +17 6 8 +15 34 17 +15 5 17 +15 20 17 +15 17 17 +16 31 6 +16 5 8 +16 35 17 +1 36 17 +endmonsters +exitdir 1 +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,10,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,59,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,11,11,11,11,11,11,11,11,11,57,57,57,57,57,57,11,11,11,11,11,11,11,11,11,11,11,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,58,58,58,58,58,58,58,58,58,57,57,57,57,57,57,58,58,58,58,58,58,58,58,58,58,58,57,57,57,57,57,57,57, +layer2 diff --git a/data/world1/level41.dat b/data/world1/level41.dat new file mode 100644 index 0000000..05dbd9f --- /dev/null +++ b/data/world1/level41.dat @@ -0,0 +1,68 @@ +bgfile kitchen1.png +bg 0 +hurryup 30 +help +endhelp +monsters +0 7 28 +1 35 13 +1 2 13 +132 19 17 312 453 312 44 +16 19 16 +15 18 16 +15 20 16 +15 14 5 +15 7 5 +15 24 20 +16 37 13 +16 2 13 +6 23 8 +49 26 20 +49 12 5 +17 12 21 +17 8 21 +17 2 26 +17 1 25 +17 3 27 +17 38 25 +17 6 13 +16 10 13 +1 5 21 +15 33 19 +15 24 8 +15 23 8 +endmonsters +exitdir 1 +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,59,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,57,57,57,57,57,57,57,57,57, +57,58,58,58,58,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,57, +57,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,57, +57,57,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,57,57,60,0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,0,0,0,29,0,0,0,0,0,0,0,0,0,0,0,0,0,57,57,57,57, +57,57,57,57,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,57,57,57,57, +layer2 +37,20,8 +37,21,7 diff --git a/data/world1/level42.dat b/data/world1/level42.dat new file mode 100644 index 0000000..a06d293 --- /dev/null +++ b/data/world1/level42.dat @@ -0,0 +1,64 @@ +bgfile kitchen1.png +bg 0 +hurryup 30 +help +endhelp +monsters +0 15 22 +23 20 9 +132 16 20 602 336 38 336 +132 28 14 506 240 136 240 +12 35 9 +12 5 9 +49 36 5 +49 2 5 +1 34 13 +1 3 13 +17 33 9 +17 33 5 +17 6 9 +17 6 5 +15 15 9 +15 16 9 +15 24 9 +15 23 9 +15 22 9 +15 17 9 +16 34 22 +16 5 22 +132 6 17 38 288 601 288 +1 29 23 +1 7 23 +endmonsters +exitdir 1 +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,58,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,58,58,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,60,0,0,0,0,0,0,59,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,59,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,58,58,58,58,58,58,58,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57, +57,0,0,0,0,58,0,0,0,0,0,0,59,58,58,58,58,58,58,58,58,58,58,58,58,58,60,0,0,0,0,0,0,0,58,0,0,0,0,57, +57,58,58,58,58,57,58,58,58,58,58,58,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,58,58,58,58,58,58,58,57,58,58,58,58,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57,57, +layer2 diff --git a/defs.h b/defs.h index f0eca58..17380c7 100644 --- a/defs.h +++ b/defs.h @@ -212,7 +212,7 @@ #define MAXHISCORES 10 #define MAXHISCORENAME 12 -#define MAXWAYPOINTS 10 +#define MAXWAYPOINTS 30 #define HISCORE_DISPLAYTIME 10 // how many secs to display hiscores for diff --git a/edit.c b/edit.c index 2537e8e..7427741 100644 --- a/edit.c +++ b/edit.c @@ -372,14 +372,38 @@ int main (int argc, char **argv) { } } else if (state == LS_WAYPOINTS) { // add waypoint at selected position - // TODO: lock x/y with keys... if (toggletimer == 0) { - waypointm->wayx[waypointm->numwaypoints] = mx; - waypointm->wayy[waypointm->numwaypoints] = my; + double thisx,thisy,lastx,lasty,xdiff,ydiff; + thisx = mx; + thisy = my; + if (waypointm->numwaypoints == 0) { // the first one + lastx = waypointm->x; + lasty = waypointm->y; + } else { + lastx = waypointm->wayx[waypointm->numwaypoints-1]; + lasty = waypointm->wayy[waypointm->numwaypoints-1]; + } + + // lock vert or horizontal + xdiff = abs(lastx - thisx); + ydiff = abs(lasty - thisy); + + // x diff lots? + if (xdiff >= 3*ydiff) { + // lock y + thisy = lasty; + } else if (ydiff >= 3*xdiff) { + // lock x + thisx = lastx; + } + + waypointm->wayx[waypointm->numwaypoints] = thisx; + waypointm->wayy[waypointm->numwaypoints] = thisy; waypointm->numwaypoints++; sprintf(tempm, "Waypoint #%d added at %d,%d",waypointm->numwaypoints,mx,my); setstatustext(tempm, &blue); toggletimer = 20; + drawsprites(); // update waypoint lines } } else if (state == LS_SAVE) { // get pos @@ -818,8 +842,19 @@ void drawsprites(void) { // waypoint selection mode if (state == LS_WAYPOINTS) { if (waypointm == s) { + int i; + double curx,cury; drawbox16(screen, s->x - s->img->w/2,s->y - s->img->h, s->x + s->img->w/2, s->y, &red, NULL); + // show waypoints + curx = s->x; cury = s->y; + for (i = 0; i < s->numwaypoints; i++) { + drawline16(screen, curx,cury,s->wayx[i],s->wayy[i], red); + drawbox16(screen, s->wayx[i]-1,s->wayy[i]-1, + s->wayx[i]+1,s->wayy[i]+1, &red, &red); + + curx = s->wayx[i]; cury = s->wayy[i]; + } } } } diff --git a/rc.c b/rc.c index f834b9d..660c0f9 100644 --- a/rc.c +++ b/rc.c @@ -1817,6 +1817,8 @@ int movesprite(sprite_t *s) { // caught or dead sprites can move, in case // the player catches something before level start time if ((!s->caughtby) && (!s->dead)) return B_FALSE; + } else if (s->id == P_PLATFORM) { + return B_FALSE; } }