--- deliantra/maps/pup_land/jk/gs_house.map	2006/06/11 08:00:50	1.3
+++ deliantra/maps/pup_land/jk/gs_house.map	2007/02/07 01:35:49	1.8
@@ -1,19 +1,19 @@
 arch map
+file_format_version 1
 name gs_house
 region pupland
 width 20
 height 21
 msg
-Creator: Gnat the Gnu
-Email: gnu@foo.bar
-Date: Thu Feb  8 03:41:44 1996
+- 2007-01-07 11:48:33 CET by elmex@x-paste.de:
+removed magic ears moved triggers to the dialog of the npc.
 endmsg
 end
 arch pit_closed
 hp 4
 sp 11
+resist_physical 30
 connected 1
-protected 1
 end
 arch big_dragon
 name dragon of another dimension
@@ -27,8 +27,8 @@
 hp 4
 sp 11
 y 1
+resist_physical 30
 connected 1
-protected 1
 end
 arch blocked
 y 2
@@ -37,8 +37,9 @@
 hp 8
 sp 10
 y 3
+resist_physical 30
+resist_magic 30
 connected 3
-protected 3
 end
 arch goblin
 y 3
@@ -112,16 +113,16 @@
 hp 4
 sp 11
 x 1
+resist_physical 30
 connected 1
-protected 1
 end
 arch pit_closed
 hp 4
 sp 11
 x 1
 y 1
+resist_physical 30
 connected 1
-protected 1
 end
 arch blocked
 x 1
@@ -132,8 +133,9 @@
 sp 10
 x 1
 y 3
+resist_physical 30
+resist_magic 30
 connected 3
-protected 3
 end
 arch goblin
 x 1
@@ -226,16 +228,16 @@
 hp 4
 sp 11
 x 2
+resist_physical 30
 connected 1
-protected 1
 end
 arch pit_closed
 hp 4
 sp 11
 x 2
 y 1
+resist_physical 30
 connected 1
-protected 1
 end
 arch blocked
 x 2
@@ -247,8 +249,9 @@
 x 2
 y 3
 speed 0.500000
+resist_physical 30
+resist_magic 30
 connected 3
-protected 3
 end
 arch goblin
 x 2
@@ -474,24 +477,24 @@
 sp 12
 x 4
 y 1
+resist_magic 30
 connected 2
-protected 2
 end
 arch pit_closed
 hp 11
 sp 12
 x 4
 y 2
+resist_magic 30
 connected 2
-protected 2
 end
 arch pit_closed
 hp 11
 sp 12
 x 4
 y 3
+resist_magic 30
 connected 2
-protected 2
 end
 arch blocked
 x 4
@@ -593,16 +596,16 @@
 sp 12
 x 5
 y 1
+resist_magic 30
 connected 2
-protected 2
 end
 arch pit_closed
 hp 11
 sp 12
 x 5
 y 2
+resist_magic 30
 connected 2
-protected 2
 end
 arch titan
 name titan of another dimension
@@ -619,8 +622,8 @@
 sp 12
 x 5
 y 3
+resist_magic 30
 connected 2
-protected 2
 end
 arch blocked
 x 5
@@ -718,24 +721,24 @@
 sp 12
 x 6
 y 1
+resist_magic 30
 connected 2
-protected 2
 end
 arch pit_closed
 hp 11
 sp 12
 x 6
 y 2
+resist_magic 30
 connected 2
-protected 2
 end
 arch pit_closed
 hp 11
 sp 12
 x 6
 y 3
+resist_magic 30
 connected 2
-protected 2
 end
 arch blocked
 x 6
@@ -905,9 +908,10 @@
 x 7
 y 15
 speed 0.500000
+resist_magic 30
+resist_electricity 30
 value 1
 connected 10
-protected 10
 end
 arch cobblestones
 x 7
@@ -940,9 +944,10 @@
 name 5
 x 8
 speed 0.500000
+resist_physical 30
+resist_fire 30
 value 1
 connected 5
-protected 5
 end
 arch scroll
 x 8
@@ -960,8 +965,8 @@
 sp 11
 x 8
 y 2
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 8
@@ -973,8 +978,8 @@
 sp 8
 x 8
 y 3
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 8
@@ -986,8 +991,8 @@
 sp 11
 x 8
 y 4
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 8
@@ -1018,42 +1023,6 @@
 x 8
 y 8
 end
-arch magic_ear
-msg
-@match goblin
-endmsg
-x 8
-y 9
-connected 3
-protected 3
-end
-arch magic_ear
-msg
-@match go ahead
-endmsg
-x 8
-y 9
-connected 4
-protected 4
-end
-arch magic_ear
-msg
-@match both|titan
-endmsg
-x 8
-y 9
-connected 2
-protected 2
-end
-arch magic_ear
-msg
-@match both|dragon
-endmsg
-x 8
-y 9
-connected 1
-protected 1
-end
 arch cobblestones
 x 8
 y 9
@@ -1062,8 +1031,14 @@
 name Great Summoner
 msg
 @match both
+@trigger 1
+@trigger 2
 I wonder if you are strong enough to
 survive this...
+@match dragon
+@trigger 1
+@match titan
+@trigger 2
 @match hello|hi|summon
 Greetings. I'm the greatest summoner
 of the world. I can summon monsters
@@ -1090,6 +1065,7 @@
 If you're willing to take the risk,
 say "go ahead".
 @match go ahead
+@trigger 4
 Okay, let's try...
 @match *
 If you are afraid, go home to mama.
@@ -1101,6 +1077,26 @@
 exp 1
 x 8
 y 9
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_turn_undead 100
+resist_fear 100
+resist_cancellation 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_counterspell 100
+resist_blind 100
 carrying 75000
 randomitems none
 friendly 1
@@ -1115,10 +1111,8 @@
 can_use_rod 0
 can_use_horn 0
 can_use_wand 0
-immune 5242815
 arch corpse
 name Great Summoner's corpse
-material 0
 no_pick 1
 end
 end
@@ -1150,9 +1144,10 @@
 x 8
 y 15
 speed 0.500000
+resist_magic 30
+resist_electricity 30
 value 1
 connected 10
-protected 10
 end
 arch cobblestones
 x 8
@@ -1184,9 +1179,10 @@
 arch button_small
 name 6
 x 9
+resist_magic 30
+resist_fire 30
 weight 5000
 connected 6
-protected 6
 end
 arch blocked
 x 9
@@ -1197,8 +1193,8 @@
 sp 11
 x 9
 y 2
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 9
@@ -1210,8 +1206,8 @@
 sp 8
 x 9
 y 3
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 9
@@ -1223,8 +1219,8 @@
 sp 11
 x 9
 y 4
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 9
@@ -1328,8 +1324,8 @@
 sp 11
 x 10
 y 2
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 10
@@ -1341,8 +1337,8 @@
 sp 8
 x 10
 y 3
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 10
@@ -1354,8 +1350,8 @@
 sp 11
 x 10
 y 4
+resist_fire 30
 connected 4
-protected 4
 end
 arch crown
 x 10
@@ -1646,8 +1642,10 @@
 name 11 - artifact appears
 x 13
 y 1
+resist_physical 30
+resist_magic 30
+resist_electricity 30
 connected 11
-protected 11
 end
 arch blocked
 x 13
@@ -1786,33 +1784,35 @@
 name 10 - close gate
 x 14
 y 4
+resist_magic 30
+resist_electricity 30
 weight 1000
 connected 10
-protected 10
 end
 arch creator
 name 5
 other_arch small_shield
 x 14
 y 4
+resist_physical 30
+resist_fire 30
 connected 5
-protected 5
 end
 arch creator
 name 2
 other_arch small_shield
 x 14
 y 4
+resist_magic 30
 connected 2
-protected 2
 end
 arch creator
 name 1
 other_arch small_shield
 x 14
 y 4
+resist_physical 30
 connected 1
-protected 1
 end
 arch grass
 x 14
@@ -2031,8 +2031,9 @@
 sp 12
 x 16
 speed 0.000000
+resist_magic 30
+resist_fire 30
 connected 6
-protected 6
 end
 arch crawling_chaos
 name Killing Thrill
@@ -2048,12 +2049,14 @@
 speed 1.000000
 level 45
 attacktype 262225
+resist_physical 30
+resist_magic 30
+resist_slow 100
+resist_paralyze 100
+resist_death 100
 carrying 20
 hitback 1
 armour 80
-immune 399360
-protected 3
-vulnerable 0
 arch ectoplasm
 name Killing Thrill's ectoplasm
 type 0
@@ -2072,15 +2075,16 @@
 x 16
 y 2
 speed 0.000000
+resist_physical 30
+resist_fire 30
 connected 5
-protected 5
 end
 arch locked_door2
 name force
 msg
 An invisible force blocks the way!
 endmsg
-face stwall_5.111
+face stwall_5.x11
 x 16
 y 2
 invisible 1
@@ -2092,8 +2096,10 @@
 x 16
 y 3
 speed 0.000000
+resist_physical 30
+resist_magic 30
+resist_electricity 30
 connected 11
-protected 11
 end
 arch random_artifact
 x 16
@@ -2337,9 +2343,9 @@
 x 18
 y 2
 speed 0.500000
+resist_fire 30
 value 1
 connected 4
-protected 4
 end
 arch boulder
 x 18
@@ -2469,16 +2475,18 @@
 endmsg
 x 19
 y 2
+resist_physical 30
+resist_fire 30
 connected 5
-protected 5
 end
 arch button_small
 name 5 - bad luck
 x 19
 y 2
+resist_physical 30
+resist_fire 30
 weight 1000
 connected 5
-protected 5
 end
 arch blocked
 x 19