bugfix: wand shouldn't affect caught monsters

added new levels
2009-01-22 21:54:31 +00:00 · 2009-01-22 21:54:31 +00:00 · cabf1eb80b
parent 4c269d2964
commit cabf1eb80b
5 changed files with 211 additions and 1 deletions
--- a/data/levels/level615.dat
+++ b/data/levels/level615.dat
@ -0,0 +1,57 @@
+bgfile snow1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 8 12
+134 31 12
+7 13 14
+133 25 6
+133 14 6
+6 35 6
+6 3 3
+6 23 25
+6 11 26
+158 20 7
+16 28 4
+16 11 4
+17 32 9
+17 7 9
+1 26 28
+1 11 28
+124 18 28
+124 21 28
+endmonsters
+exitdir 1
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,33,44,44,44,44,44,49,0,0,0,0,0,0,48,44,44,44,44,44,33,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,33,56,56,56,56,56,44,44,44,44,44,44,44,44,56,56,56,56,56,33,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,33,56,56,56,56,56,56,33,33,33,33,33,33,56,56,56,56,56,56,33,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,32,32,32,33,56,56,27,27,56,56,33,33,33,33,33,33,56,56,27,27,56,56,33,32,32,32,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,53,53,53,33,56,56,56,56,56,56,33,33,33,33,33,33,56,56,56,56,56,56,33,53,53,53,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,53,53,53,33,56,56,56,56,56,56,33,33,33,33,33,33,56,56,56,56,56,56,33,53,53,53,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,32,32,32,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,32,32,32,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,86,86,86,86,86,86,86,86,53,53,53,53,86,86,86,86,86,86,86,86,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,68,68,68,68,68,70,0,0,33,
+33,0,0,72,71,71,71,71,71,73,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,0,0,0,0,0,0,0,33,
+layer2
--- a/data/levels/level616.dat
+++ b/data/levels/level616.dat
@ -0,0 +1,72 @@
+bgfile snow1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 16 19
+16 23 19
+23 20 8
+12 22 28
+158 32 4
+158 8 4
+133 35 25
+133 3 24
+7 5 6
+7 32 6
+6 20 26
+16 25 8
+16 26 8
+16 14 8
+16 13 8
+17 18 28
+17 21 28
+16 20 28
+16 19 28
+17 28 28
+17 27 28
+17 12 28
+17 11 28
+15 18 4
+15 19 4
+15 20 4
+15 21 4
+15 3 4
+15 10 4
+15 29 4
+15 36 4
+15 18 15
+15 21 15
+endmonsters
+exitdir -2
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,32,32,32,32,32,32,32,32,0,0,0,0,0,0,32,32,32,32,32,32,0,0,0,0,0,0,32,32,32,32,32,32,32,32,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,32,32,0,0,0,0,32,32,0,0,0,0,32,32,0,0,0,0,32,32,0,0,0,0,32,32,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,32,0,0,0,33,33,0,0,0,32,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,32,33,33,32,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,0,0,0,0,33,33,32,32,32,32,33,33,32,32,32,32,33,33,0,0,0,0,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,11,11,11,11,33,33,33,33,33,33,33,33,33,33,33,33,33,33,11,11,11,11,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,33,33,32,32,32,32,33,33,33,33,33,33,33,33,33,33,33,33,33,33,32,32,32,32,33,33,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,0,0,0,0,0,0,0,33,
+layer2
--- a/data/levels/level617.dat
+++ b/data/levels/level617.dat
@ -0,0 +1,79 @@
+bgfile snow1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+157 34 28
+157 5 28
+157 13 28
+157 27 28
+0 12 22
+134 27 22
+158 17 14
+158 6 19
+158 29 18
+133 8 5
+133 29 3
+12 4 10
+18 22 10
+18 37 10
+17 28 6
+17 29 6
+16 34 10
+16 35 10
+16 19 10
+16 14 10
+16 4 24
+16 6 24
+15 35 24
+15 33 24
+15 4 19
+15 18 19
+15 24 18
+15 35 18
+15 27 14
+15 13 14
+16 25 18
+16 14 14
+16 5 19
+16 34 18
+16 26 14
+16 17 19
+17 6 10
+17 7 10
+23 20 28
+endmonsters
+exitdir -2
+33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
+33,0,0,0,0,0,0,0,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32,32,32,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,33,
+33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32,33,33,33,33,32,0,0,0,0,0,0,0,33,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,0,0,0,0,32,32,32,32,32,32,33,33,33,33,33,33,33,32,32,32,32,32,32,32,33,
+4,0,0,0,0,0,0,0,0,0,0,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,0,4,
+4,0,0,0,0,0,0,0,0,0,0,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,0,4,
+4,0,0,0,0,0,0,0,0,0,0,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,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,0,0,0,0,0,0,0,7,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,88,88,88,88,88,88,88,88,88,88,88,0,0,0,4,
+4,0,0,0,88,88,88,88,88,88,88,88,88,88,88,88,88,88,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,32,32,32,32,0,0,0,0,0,0,0,0,0,0,32,32,32,32,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,0,0,4,
+4,0,0,0,32,32,32,0,0,0,0,33,33,33,33,0,0,0,0,0,0,0,0,0,0,33,33,33,33,0,0,0,0,32,32,32,0,0,0,4,
+4,15,15,15,33,33,33,15,15,15,15,33,33,33,33,15,15,15,15,15,15,15,15,15,15,33,33,33,33,15,15,15,15,33,33,33,15,15,15,4,
+4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,
+4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,
+4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,
+layer2
+35,11,8
--- a/data/map.dat
+++ b/data/map.dat
@ -65,12 +65,14 @@
 611,level611.dat,Off you go
 601,level601.dat,Windswept Peak
 602,level602.dat,Igloo
+617,level617.dat,Icebergs
 608,level608.dat,Wastelands
 610,level610.dat,Squeeze in there
 612,level612.dat,Don't Slip!
 613,level613.dat,Slowness Kills
 606,level606.dat,Icicle
 605,level605.dat,Frosty Towers
+616,level616.dat,Polar Claw
 615,level615.dat,Raaa!
 109,level109.dat,THE END SO FAR
 99,level99.dat,TEST LEVEL
--- a/rc.c
+++ b/rc.c
@ -8659,7 +8659,7 @@ int dofruiteffect(sprite_t *pp, sprite_t *s) {
 		addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&white,&black,POINTSDELAY, TT_NORM);
 		// turn all live monsters into weaker versions
 		for (s2 = sprite; s2 ; s2 = s2->next) {
-			if (ismonster(s2->id) && !s2->dead) {
+			if (ismonster(s2->id) && !s2->dead && !s2->caughtby) {
 				// don't get ones which we just created!
 				if (!strstr(s2->name, "created")) {
 					int newtype = -1;