--- deliantra/maps/pup_land/jk/gs_house.map	2006/09/04 19:39:00	1.4
+++ deliantra/maps/pup_land/jk/gs_house.map	2009/11/03 19:26:58	1.12
@@ -1,12 +1,11 @@
 arch map
-name gs_house
-region pupland
+file_format_version 1
+name Summoner's House
 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
@@ -284,7 +283,7 @@
 arch stwall_2_1_1
 x 2
 y 7
-move_block 0
+move_block -all
 end
 arch flagstone
 x 2
@@ -1023,43 +1022,6 @@
 x 8
 y 8
 end
-arch magic_ear
-msg
-@match goblin
-endmsg
-x 8
-y 9
-resist_physical 30
-resist_magic 30
-connected 3
-end
-arch magic_ear
-msg
-@match go ahead
-endmsg
-x 8
-y 9
-resist_fire 30
-connected 4
-end
-arch magic_ear
-msg
-@match both|titan
-endmsg
-x 8
-y 9
-resist_magic 30
-connected 2
-end
-arch magic_ear
-msg
-@match both|dragon
-endmsg
-x 8
-y 9
-resist_physical 30
-connected 1
-end
 arch cobblestones
 x 8
 y 9
@@ -1068,8 +1030,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
@@ -1078,6 +1046,7 @@
 @match dimension
 Planes you have never seen.
 @match goblin
+@trigger 3
 That's a piece of cake!
 @match monster
 You would like to watch a summoning?
@@ -1096,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.
@@ -1143,7 +1113,6 @@
 can_use_wand 0
 arch corpse
 name Great Summoner's corpse
-material 0
 no_pick 1
 end
 end
@@ -2085,7 +2054,6 @@
 resist_slow 100
 resist_paralyze 100
 resist_death 100
-resist_chaos 100
 carrying 20
 hitback 1
 armour 80
@@ -2116,7 +2084,7 @@
 msg
 An invisible force blocks the way!
 endmsg
-face stwall_5.111
+face stwall_5.x11
 x 16
 y 2
 invisible 1