--- deliantra/maps/pup_land/jk/gs_house.map	2006/02/05 00:01:26	1.1
+++ deliantra/maps/pup_land/jk/gs_house.map	2007/01/07 10:54:40	1.6
@@ -1,26 +1,33 @@
 arch map
 name gs_house
 region pupland
-msg
-Creator: Gnat the Gnu
-Email: gnu@foo.bar
-Date: Thu Feb  8 03:41:44 1996
-endmsg
 width 20
 height 21
+msg
+- 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
-protected 1
+resist_physical 30
 connected 1
 end
+arch big_dragon
+name dragon of another dimension
+carrying 100
+arch key2
+name golden key
+slaying gs_key3
+end
+end
 arch pit_closed
 hp 4
 sp 11
-protected 1
-connected 1
 y 1
+resist_physical 30
+connected 1
 end
 arch blocked
 y 2
@@ -28,13 +35,14 @@
 arch pit_closed
 hp 8
 sp 10
-protected 3
-connected 3
 y 3
+resist_physical 30
+resist_magic 30
+connected 3
 end
 arch goblin
-carrying 100
 y 3
+carrying 100
 arch key2
 name wooden key
 slaying gs_key1
@@ -103,17 +111,17 @@
 arch pit_closed
 hp 4
 sp 11
-protected 1
-connected 1
 x 1
+resist_physical 30
+connected 1
 end
 arch pit_closed
 hp 4
 sp 11
-protected 1
-connected 1
 x 1
 y 1
+resist_physical 30
+connected 1
 end
 arch blocked
 x 1
@@ -122,10 +130,11 @@
 arch pit_closed
 hp 8
 sp 10
-protected 3
-connected 3
 x 1
 y 3
+resist_physical 30
+resist_magic 30
+connected 3
 end
 arch goblin
 x 1
@@ -217,17 +226,17 @@
 arch pit_closed
 hp 4
 sp 11
-protected 1
-connected 1
 x 2
+resist_physical 30
+connected 1
 end
 arch pit_closed
 hp 4
 sp 11
-protected 1
-connected 1
 x 2
 y 1
+resist_physical 30
+connected 1
 end
 arch blocked
 x 2
@@ -236,11 +245,12 @@
 arch pit_closed
 hp 8
 sp 10
-speed 0.500000
-protected 3
-connected 3
 x 2
 y 3
+speed 0.500000
+resist_physical 30
+resist_magic 30
+connected 3
 end
 arch goblin
 x 2
@@ -271,9 +281,9 @@
 y 7
 end
 arch stwall_2_1_1
-no_pass 0
 x 2
 y 7
+move_block 0
 end
 arch flagstone
 x 2
@@ -464,26 +474,26 @@
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 4
 y 1
+resist_magic 30
+connected 2
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 4
 y 2
+resist_magic 30
+connected 2
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 4
 y 3
+resist_magic 30
+connected 2
 end
 arch blocked
 x 4
@@ -583,26 +593,36 @@
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 5
 y 1
+resist_magic 30
+connected 2
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
+x 5
+y 2
+resist_magic 30
 connected 2
+end
+arch titan
+name titan of another dimension
 x 5
 y 2
+carrying 100
+arch key2
+name iron key
+slaying gs_key2
+end
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 5
 y 3
+resist_magic 30
+connected 2
 end
 arch blocked
 x 5
@@ -698,26 +718,26 @@
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 6
 y 1
+resist_magic 30
+connected 2
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 6
 y 2
+resist_magic 30
+connected 2
 end
 arch pit_closed
 hp 11
 sp 12
-protected 2
-connected 2
 x 6
 y 3
+resist_magic 30
+connected 2
 end
 arch blocked
 x 6
@@ -848,16 +868,16 @@
 end
 arch shadowpup
 name Summoner's pet
-Wis 0
+is_animated 0
+wis 0
 hp 10
 maxhp 10
 exp 0
 dam 1
-run_away 0
-is_animated 0
-friendly 1
 x 7
 y 9
+run_away 0
+friendly 1
 end
 arch cobblestones
 x 7
@@ -884,12 +904,13 @@
 y 15
 end
 arch spikes_open
+x 7
+y 15
 speed 0.500000
-protected 10
+resist_magic 30
+resist_electricity 30
 value 1
 connected 10
-x 7
-y 15
 end
 arch cobblestones
 x 7
@@ -920,15 +941,16 @@
 end
 arch block_door_open
 name 5
+x 8
 speed 0.500000
-protected 5
+resist_physical 30
+resist_fire 30
 value 1
 connected 5
-x 8
 end
 arch scroll
-weight 5000
 x 8
+weight 5000
 end
 arch scroll_2
 x 8
@@ -940,41 +962,41 @@
 arch pit_closed
 hp 5
 sp 11
-protected 4
-connected 4
 x 8
 y 2
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 8
 y 2
+value 500
 end
 arch pit_closed
 hp 4
 sp 8
-protected 4
-connected 4
 x 8
 y 3
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 8
 y 3
+value 500
 end
 arch pit_closed
 hp 10
 sp 11
-protected 4
-connected 4
 x 8
 y 4
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 8
 y 4
+value 500
 end
 arch grass
 x 8
@@ -1000,42 +1022,6 @@
 x 8
 y 8
 end
-arch magic_ear
-msg
-@match goblin
-endmsg
-protected 3
-connected 3
-x 8
-y 9
-end
-arch magic_ear
-msg
-@match go ahead
-endmsg
-protected 4
-connected 4
-x 8
-y 9
-end
-arch magic_ear
-msg
-@match titan|both
-endmsg
-protected 2
-connected 2
-x 8
-y 9
-end
-arch magic_ear
-msg
-@match dragon|both
-endmsg
-protected 1
-connected 1
-x 8
-y 9
-end
 arch cobblestones
 x 8
 y 9
@@ -1044,9 +1030,15 @@
 name Great Summoner
 msg
 @match both
+@trigger 1
+@trigger 2
 I wonder if you are strong enough to
 survive this...
-@match hi|hello|summon
+@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
 from other dimensions. State your
@@ -1063,41 +1055,61 @@
 Are you nuts? A Jessy would crush my
 house... But, of course, I could do
 it. Yes, believe me... I could!
-@match none|neither
+@match neither|none
 You are so CHICKEN-HEARTED!
-@match treasure|crown|jewel|gold
+@match crown|gold|jewel|treasure
 Summoning jewelery is dangerous
 because the appropriate astral plain
 is inhabited by fierce creatures!
 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.
 endmsg
-randomitems none
-exp 1
-carrying 75000
 hp 50
 maxhp 50
-can_cast_spell 0
 sp 0
 maxsp 0
-can_use_weapon 0
+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
+can_cast_spell 0
+can_use_scroll 0
 can_use_bow 0
 can_use_armour 0
+can_use_weapon 0
 can_use_ring 0
-can_use_wand 0
-can_use_rod 0
-can_use_scroll 0
-can_use_skill 0
-friendly 1
 stand_still 1
-immune 5242815
+can_use_skill 0
+can_use_rod 0
 can_use_horn 0
-x 8
-y 9
+can_use_wand 0
 arch corpse
 name Great Summoner's corpse
 material 0
@@ -1129,12 +1141,13 @@
 y 15
 end
 arch spikes_open
+x 8
+y 15
 speed 0.500000
-protected 10
+resist_magic 30
+resist_electricity 30
 value 1
 connected 10
-x 8
-y 15
 end
 arch cobblestones
 x 8
@@ -1165,10 +1178,11 @@
 end
 arch button_small
 name 6
-protected 6
+x 9
+resist_magic 30
+resist_fire 30
 weight 5000
 connected 6
-x 9
 end
 arch blocked
 x 9
@@ -1177,41 +1191,41 @@
 arch pit_closed
 hp 5
 sp 11
-protected 4
-connected 4
 x 9
 y 2
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 9
 y 2
+value 500
 end
 arch pit_closed
 hp 11
 sp 8
-protected 4
-connected 4
 x 9
 y 3
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 9
 y 3
+value 500
 end
 arch pit_closed
 hp 10
 sp 11
-protected 4
-connected 4
 x 9
 y 4
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 9
 y 4
+value 500
 end
 arch grass
 x 9
@@ -1308,41 +1322,41 @@
 arch pit_closed
 hp 5
 sp 11
-protected 4
-connected 4
 x 10
 y 2
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 10
 y 2
+value 500
 end
 arch pit_closed
 hp 11
 sp 8
-protected 4
-connected 4
 x 10
 y 3
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 10
 y 3
+value 500
 end
 arch pit_closed
 hp 10
 sp 11
-protected 4
-connected 4
 x 10
 y 4
+resist_fire 30
+connected 4
 end
 arch crown
-value 500
 x 10
 y 4
+value 500
 end
 arch grass
 x 10
@@ -1626,10 +1640,12 @@
 end
 arch button_small
 name 11 - artifact appears
-protected 11
-connected 11
 x 13
 y 1
+resist_physical 30
+resist_magic 30
+resist_electricity 30
+connected 11
 end
 arch blocked
 x 13
@@ -1766,35 +1782,37 @@
 end
 arch button_small
 name 10 - close gate
-protected 10
-weight 1000
-connected 10
 x 14
 y 4
+resist_magic 30
+resist_electricity 30
+weight 1000
+connected 10
 end
 arch creator
 name 5
 other_arch small_shield
-protected 5
-connected 5
 x 14
 y 4
+resist_physical 30
+resist_fire 30
+connected 5
 end
 arch creator
 name 2
 other_arch small_shield
-protected 2
-connected 2
 x 14
 y 4
+resist_magic 30
+connected 2
 end
 arch creator
 name 1
 other_arch small_shield
-protected 1
-connected 1
 x 14
 y 4
+resist_physical 30
+connected 1
 end
 arch grass
 x 14
@@ -2011,31 +2029,34 @@
 name 6
 hp 5
 sp 12
+x 16
 speed 0.000000
-protected 6
+resist_magic 30
+resist_fire 30
 connected 6
-x 16
 end
 arch crawling_chaos
 name Killing Thrill
-Str 30
-Con 30
-Wis 30
+str 30
+con 30
+wis 30
 hp 3000
 maxhp 3000
 exp 200000
 wc -20
 ac -10
-armour 80
+x 16
 speed 1.000000
 level 45
-immune 399360
-protected 3
 attacktype 262225
-vulnerable 0
+resist_physical 30
+resist_magic 30
+resist_slow 100
+resist_paralyze 100
+resist_death 100
 carrying 20
 hitback 1
-x 16
+armour 80
 arch ectoplasm
 name Killing Thrill's ectoplasm
 type 0
@@ -2051,31 +2072,34 @@
 name 5
 hp 2
 sp 7
-speed 0.000000
-protected 5
-connected 5
 x 16
 y 2
+speed 0.000000
+resist_physical 30
+resist_fire 30
+connected 5
 end
 arch locked_door2
 name force
-face stwall_5.111
 msg
 An invisible force blocks the way!
 endmsg
-invisible 1
+face stwall_5.x11
 x 16
 y 2
+invisible 1
 end
 arch teleporter
 name 11
 hp 15
 sp 11
-speed 0.000000
-protected 11
-connected 11
 x 16
 y 3
+speed 0.000000
+resist_physical 30
+resist_magic 30
+resist_electricity 30
+connected 11
 end
 arch random_artifact
 x 16
@@ -2246,10 +2270,10 @@
 end
 arch locked_door1
 name golden door
+slaying gs_key3
 msg
 You need the golden key.
 endmsg
-slaying gs_key3
 x 17
 y 10
 end
@@ -2259,10 +2283,10 @@
 end
 arch locked_door1
 name iron door
+slaying gs_key2
 msg
 You need the iron key.
 endmsg
-slaying gs_key2
 x 17
 y 11
 end
@@ -2272,10 +2296,10 @@
 end
 arch locked_door1
 name wooden door
+slaying gs_key1
 msg
 You need the wooden key.
 endmsg
-slaying gs_key1
 x 17
 y 12
 end
@@ -2316,12 +2340,12 @@
 end
 arch spikes_open
 name 4
+x 18
+y 2
 speed 0.500000
-protected 4
+resist_fire 30
 value 1
 connected 4
-x 18
-y 2
 end
 arch boulder
 x 18
@@ -2449,18 +2473,20 @@
 Oh no! Something went wrong...
 Arrrgh!!
 endmsg
-protected 5
-connected 5
 x 19
 y 2
+resist_physical 30
+resist_fire 30
+connected 5
 end
 arch button_small
 name 5 - bad luck
-protected 5
-weight 1000
-connected 5
 x 19
 y 2
+resist_physical 30
+resist_fire 30
+weight 1000
+connected 5
 end
 arch blocked
 x 19
@@ -2570,21 +2596,3 @@
 x 19
 y 20
 end
-arch big_dragon
-name dragon of another dimension
-carrying 100
-arch key2
-name golden key
-slaying gs_key3
-end
-end
-arch titan
-name titan of another dimension
-carrying 100
-x 5
-y 2
-arch key2
-name iron key
-slaying gs_key2
-end
-end