From 4ee2ac224b013ba1561adf2cfbfe439fa9974890 Mon Sep 17 00:00:00 2001
From: Rob Pearce <rob@nethack.net>
Date: Tue, 14 Apr 2009 01:40:48 +0000
Subject: [PATCH] - Snake spit is now slightly higher (so it can fit over 1
 tile barriers) - Added new levels

---
 data/levels/bathhouse.dat     | 187 +++++++++++++++++++++++++++++++
 data/levels/chamberofdoom.dat |   2 +-
 data/levels/dontjump.dat      | 201 ++++++++++++++++++++++++++++++++++
 data/levels/dungeon.dat       |   6 +-
 data/map.dat                  |   4 +-
 rc.c                          |   3 +-
 website/map.dat               |   4 +-
 7 files changed, 400 insertions(+), 7 deletions(-)
 create mode 100644 data/levels/bathhouse.dat
 create mode 100644 data/levels/dontjump.dat

diff --git a/data/levels/bathhouse.dat b/data/levels/bathhouse.dat
new file mode 100644
index 0000000..ae478b8
--- /dev/null
+++ b/data/levels/bathhouse.dat
@@ -0,0 +1,187 @@
+bgfile sky1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 13 26
+134 24 26
+23 8 21
+60 8 14
+60 23 5
+6 37 4
+6 34 9
+172 4 11
+6 12 10
+7 7 5
+7 26 15
+12 27 21
+12 13 21
+133 21 12
+133 4 1
+158 18 6
+158 14 16
+endmonsters
+exitdir -2
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,99,75,99,75,99,75,99,75,99,97,98,98,98,98,74,74,98,97,75,75,97,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,99,0,99,0,99,0,99,0,99,0,99,75,97,98,98,74,74,75,75,99,99,75,75,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,99,0,99,0,99,0,99,0,99,0,99,75,97,98,98,74,74,75,99,100,100,99,75,74,
+74,98,98,98,98,98,98,74,74,74,32,32,32,32,32,32,75,99,75,99,75,99,75,99,75,99,97,33,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,74,74,74,74,74,74,74,74,74,74,74,33,98,98,98,98,98,98,98,98,98,98,97,33,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,74,33,98,98,98,98,98,98,98,98,98,98,97,33,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,74,33,98,98,98,98,98,98,98,98,98,98,97,33,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,74,33,33,33,33,33,33,33,33,33,33,33,33,33,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,98,97,98,97,98,97,98,97,98,97,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,98,98,75,99,75,99,75,99,75,99,75,99,75,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,97,75,99,0,99,0,99,0,99,0,99,0,99,75,97,98,98,98,98,98,98,98,98,98,98,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,97,75,99,0,99,0,99,0,99,0,99,0,99,75,97,98,98,98,98,98,98,98,98,98,98,98,98,74,74,75,99,0,0,99,75,74,
+74,98,98,98,74,33,75,99,75,99,75,99,75,99,75,99,75,32,32,32,32,32,32,74,74,98,98,98,98,98,98,98,97,75,99,0,0,99,75,74,
+74,98,98,98,74,33,98,98,98,98,98,98,98,98,98,98,98,33,74,74,74,74,74,74,74,74,74,74,98,98,98,98,98,97,97,75,75,97,97,74,
+74,98,98,98,74,33,98,98,98,98,98,98,98,98,98,98,98,33,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,97,98,98,74,
+74,98,98,98,74,33,98,98,98,98,98,98,98,98,98,98,98,33,74,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,98,98,98,98,74,
+74,98,98,98,74,33,33,33,33,33,33,33,33,33,33,33,33,33,74,98,98,98,98,98,98,98,98,98,98,98,98,74,74,74,74,74,74,74,74,74,
+74,98,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,74,74,74,74,74,74,74,74,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,99,97,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,99,99,99,97,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,97,98,74,
+74,98,98,98,98,98,98,32,32,32,32,32,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,97,99,97,98,74,
+74,98,98,98,98,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,75,99,99,99,75,74,
+74,98,98,98,98,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,98,75,97,98,74,
+74,98,98,98,98,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,97,99,97,98,74,
+74,98,98,98,98,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,75,99,99,99,75,74,
+74,98,98,98,98,98,98,74,74,98,98,98,62,62,62,62,62,62,62,62,62,62,62,62,62,62,98,98,98,98,98,98,98,98,98,97,75,97,98,74,
+74,98,98,98,98,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,98,98,74,
+74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,98,98,98,98,74,
+layer2
+4,3,69
+5,3,68
+6,3,70
+16,3,16
+17,3,16
+18,3,16
+19,3,16
+20,3,16
+21,3,16
+22,3,16
+23,3,16
+24,3,16
+25,3,16
+26,3,16
+16,4,15
+17,4,15
+18,4,15
+19,4,15
+20,4,15
+21,4,15
+22,4,15
+23,4,15
+24,4,15
+25,4,15
+26,4,15
+13,5,18
+16,5,15
+17,5,15
+18,5,15
+19,5,15
+20,5,15
+21,5,15
+22,5,15
+23,5,15
+24,5,15
+25,5,15
+26,5,15
+16,6,15
+17,6,15
+18,6,15
+19,6,15
+20,6,15
+21,6,15
+22,6,15
+23,6,15
+24,6,15
+25,6,15
+26,6,15
+6,13,16
+7,13,16
+8,13,16
+9,13,16
+10,13,16
+11,13,16
+12,13,16
+13,13,16
+14,13,16
+15,13,16
+16,13,16
+25,13,72
+26,13,71
+27,13,73
+6,14,15
+7,14,15
+8,14,15
+9,14,15
+10,14,15
+11,14,15
+12,14,15
+13,14,15
+14,14,15
+15,14,15
+16,14,15
+6,15,15
+7,15,15
+8,15,15
+9,15,15
+10,15,15
+11,15,15
+12,15,15
+13,15,15
+14,15,15
+15,15,15
+16,15,15
+19,15,19
+6,16,15
+7,16,15
+8,16,15
+9,16,15
+10,16,15
+11,16,15
+12,16,15
+13,16,15
+14,16,15
+15,16,15
+16,16,15
+33,16,11
+34,16,11
+35,16,11
+36,16,11
+37,16,11
+38,16,11
+36,20,82
+10,22,8
+27,22,8
+10,23,7
+27,23,7
+36,23,82
+10,24,7
+19,24,80
+27,24,7
+10,25,7
+18,25,82
+19,25,81
+20,25,82
+27,25,7
+36,26,82
+11,27,64
+26,27,63
+28,27,79
+32,27,77,layer3
+1,28,11
+2,28,11
+3,28,11
+4,28,11
+5,28,11
+6,28,11
+13,28,77
+24,28,77
+28,28,76
+32,28,77,layer3
diff --git a/data/levels/chamberofdoom.dat b/data/levels/chamberofdoom.dat
index 19b5b38..2516a7e 100644
--- a/data/levels/chamberofdoom.dat
+++ b/data/levels/chamberofdoom.dat
@@ -23,7 +23,7 @@ monsters
 12 13 24
 12 20 20
 endmonsters
-exitdir 1
+exitdir -2
 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
 74,74,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,99,99,99,99,99,75,97,98,98,98,74,74,74,74,74,74,74,
 74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,99,99,99,99,99,99,99,75,97,98,98,98,98,74,74,74,74,74,
diff --git a/data/levels/dontjump.dat b/data/levels/dontjump.dat
new file mode 100644
index 0000000..a3789a2
--- /dev/null
+++ b/data/levels/dontjump.dat
@@ -0,0 +1,201 @@
+bgfile sky1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 11 28
+134 28 28
+23 21 18
+12 36 19
+12 26 19
+12 17 19
+12 6 19
+6 13 18
+6 34 17
+6 24 19
+6 2 17
+49 19 2
+endmonsters
+exitdir 1
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,74,98,98,98,98,74,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,97,75,99,75,97,98,98,98,98,98,74,98,98,98,98,74,98,98,98,98,98,97,75,99,75,97,98,98,98,98,98,98,74,
+74,98,98,98,98,98,97,75,99,99,99,75,97,98,98,98,98,74,74,74,74,74,74,98,98,98,98,97,75,99,99,99,75,97,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,97,75,97,98,98,98,98,98,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,98,98,98,98,98,98,98,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,98,98,98,98,98,98,98,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,74,98,98,74,
+74,98,98,74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,98,98,74,
+74,98,97,74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,97,98,74,
+74,97,75,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,75,97,74,
+74,97,75,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,75,97,74,
+74,97,75,99,0,0,0,0,0,74,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,74,0,0,0,0,0,99,75,97,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
+layer2
+9,3,82
+30,3,82
+12,8,17
+27,8,17
+5,10,11
+6,10,11
+7,10,11
+8,10,11
+9,10,11
+10,10,11
+11,10,11
+13,10,11
+14,10,11
+15,10,11
+16,10,11
+17,10,11
+18,10,11
+19,10,11
+20,10,11
+21,10,11
+22,10,11
+23,10,11
+24,10,11
+25,10,11
+26,10,11
+28,10,11
+29,10,11
+30,10,11
+31,10,11
+32,10,11
+33,10,11
+34,10,11
+4,15,11
+5,15,11
+6,15,11
+7,15,11
+8,15,11
+9,15,11
+10,15,11
+11,15,11
+12,15,11
+13,15,11
+14,15,11
+15,15,11
+16,15,11
+17,15,11
+18,15,11
+19,15,11
+20,15,11
+21,15,11
+22,15,11
+23,15,11
+24,15,11
+25,15,11
+26,15,11
+27,15,11
+28,15,11
+29,15,11
+30,15,11
+31,15,11
+32,15,11
+33,15,11
+34,15,11
+35,15,11
+4,16,23
+5,16,23
+6,16,23
+7,16,23
+8,16,23
+9,16,23
+10,16,23
+11,16,23
+12,16,23
+13,16,23
+14,16,23
+15,16,23
+16,16,23
+17,16,23
+18,16,23
+19,16,23
+20,16,23
+21,16,23
+22,16,23
+23,16,23
+24,16,23
+25,16,23
+26,16,23
+27,16,23
+28,16,23
+29,16,23
+30,16,23
+31,16,23
+32,16,23
+33,16,23
+34,16,23
+35,16,23
+1,20,28
+2,20,28
+13,20,8
+26,20,8
+37,20,28
+38,20,28
+13,21,7
+26,21,7
+13,22,7
+26,22,7
+13,23,7
+26,23,7
+13,24,7
+26,24,7
+8,25,80
+13,25,7
+26,25,7
+31,25,80
+8,26,80
+13,26,7
+26,26,7
+31,26,80
+8,27,80
+31,27,80
+8,28,80
+31,28,80
+6,29,28
+7,29,28
+8,29,28
+9,29,28
+10,29,28
+11,29,28
+12,29,28
+13,29,28
+14,29,28
+15,29,28
+16,29,28
+17,29,28
+18,29,28
+19,29,28
+20,29,28
+21,29,28
+22,29,28
+23,29,28
+24,29,28
+25,29,28
+26,29,28
+27,29,28
+28,29,28
+29,29,28
+30,29,28
+31,29,28
+32,29,28
+33,29,28
diff --git a/data/levels/dungeon.dat b/data/levels/dungeon.dat
index 5139f3c..df5e9d7 100644
--- a/data/levels/dungeon.dat
+++ b/data/levels/dungeon.dat
@@ -6,6 +6,7 @@ endhelp
 monsters
 0 22 14
 134 26 14
+23 36 3
 124 21 23
 124 21 28
 157 27 28
@@ -15,7 +16,7 @@ monsters
 60 15 22
 12 36 3
 171 34 9
-132 6 13 104 224 104 224 104 120 104 120
+132 6 13 104 224 104 224 104 224 104 120 104 120
 1 10 14
 1 1 10
 1 2 14
@@ -31,7 +32,6 @@ monsters
 6 25 4
 6 29 2
 172 10 16
-23 36 3
 endmonsters
 exitdir 1
 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,98,98,98,74,
@@ -50,7 +50,7 @@ exitdir 1
 74,98,98,98,74,98,98,98,74,98,98,98,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
 74,98,98,98,74,98,98,98,74,98,98,98,74,74,74,74,74,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,74,
 74,74,74,74,56,27,27,27,56,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,56,27,27,27,56,74,74,
-90,90,90,90,56,27,27,27,56,74,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,56,27,27,27,56,91,90,
+90,90,90,90,56,27,27,27,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,27,27,27,56,91,90,
 91,56,56,56,56,27,27,27,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,27,27,27,56,91,91,
 91,56,27,27,27,27,27,27,27,27,27,27,27,56,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,56,90,91,
 91,56,27,27,27,27,27,27,27,27,27,27,27,56,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,56,91,90,
diff --git a/data/map.dat b/data/map.dat
index 082f104..5a8c5e5 100644
--- a/data/map.dat
+++ b/data/map.dat
@@ -88,6 +88,8 @@
 88,factory.dat,Factory
 89,dungeon.dat,Dungeon
 90,chamberofdoom.dat,Chamber of Doom
-95,theendsofar.dat,THE END SO FAR
+91,bathhouse.dat,Bathhouse
+92,dontjump.dat,Don't jump!
+98,theendsofar.dat,THE END SO FAR
 102,testlevel.dat,TEST LEVEL
 101,intro.dat,INTRO
diff --git a/rc.c b/rc.c
index 8d0d7d3..93895ea 100644
--- a/rc.c
+++ b/rc.c
@@ -5263,7 +5263,8 @@ int movesprite(sprite_t *s) {
 						// if our shooting timer is okay
 						if (s->timer1 == 0) {
 							playfx(FX_HISS);
-							ss = addsprite(P_SPIT,s->x,s->y - s->img->h/2,"spit" );
+							//ss = addsprite(P_SPIT,s->x,s->y - s->img->h/2,"spit" );
+							ss = addsprite(P_SPIT,s->x,s->y - TILEH,"spit" );
 							ss->ys = 0;
 							ss->xs = s->dir * (getspeed(s)*2);
 							ss->dir = s->dir;
diff --git a/website/map.dat b/website/map.dat
index 082f104..5a8c5e5 100644
--- a/website/map.dat
+++ b/website/map.dat
@@ -88,6 +88,8 @@
 88,factory.dat,Factory
 89,dungeon.dat,Dungeon
 90,chamberofdoom.dat,Chamber of Doom
-95,theendsofar.dat,THE END SO FAR
+91,bathhouse.dat,Bathhouse
+92,dontjump.dat,Don't jump!
+98,theendsofar.dat,THE END SO FAR
 102,testlevel.dat,TEST LEVEL
 101,intro.dat,INTRO