Fix connections, slaying, names, ... This should make the guilds usable.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7362 282e977c-c81d-0410-88c4-b93c2d0d6712

templates/guild/basement

@@ -5,7 +5,7 @@ height 25
 msg
 Creator: CF Java Map Editor
 Date:    6/15/2003
-Map finised by:  Alestan jehloq@yahoo.com
+Map finished by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
 endmsg
 end

templates/guild/guild_alchemy

@@ -6,6 +6,8 @@ height 10
 msg
 Creator: CF Java Map Editor
 Date:    4/8/2007
+Map finished by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
 endmsg
 end
 arch woodfloor
@@ -80,10 +82,26 @@ end
 arch dwall_2_1_2
 x 1
 end
+arch duplicator
+other_arch cauldron
+x 1
+y 1
+connected 9001
+activate_on_release 0
+end
+arch creator
+other_arch cauldron
+hp 0
+x 1
+y 1
+level 2
+connected 9001
+lifesave 1
+activate_on_push 0
+end
 arch woodfloor
 x 1
 y 1
-unique 1
 end
 arch cauldron
 x 1
@@ -93,10 +111,12 @@ end
 arch woodfloor
 x 1
 y 2
+unique 1
 end
 arch woodfloor
 x 1
 y 3
+unique 1
 end
 arch firepot
 x 1
@@ -105,20 +125,22 @@ end
 arch woodfloor
 x 1
 y 4
+unique 1
 end
 arch table_4
 x 1
 y 4
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch min_oil
+resist_fire 100
-x 1
+resist_electricity 100
-y 4
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 1
 y 5
+unique 1
 end
 arch firepot
 x 1
@@ -127,24 +149,32 @@ end
 arch woodfloor
 x 1
 y 6
+unique 1
 end
 arch chair_1.1
 x 1
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch woodfloor
 x 1
 y 7
+unique 1
 end
 arch table_3
 x 1
 y 7
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch potion_shielding
+resist_fire 100
-x 1
+resist_electricity 100
-y 7
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
@@ -168,6 +198,7 @@ end
 arch woodfloor
 x 2
 y 1
+unique 1
 end
 arch firepot
 x 2
@@ -176,27 +207,38 @@ end
 arch woodfloor
 x 2
 y 2
+unique 1
 end
 arch woodfloor
 x 2
 y 3
+unique 1
 end
 arch woodfloor
 x 2
 y 4
+unique 1
 end
 arch chair_1.2
 x 2
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch woodfloor
 x 2
 y 5
+unique 1
 end
 arch woodfloor
 x 2
 y 6
+unique 1
 end
 arch woodfloor
 x 2
@@ -231,6 +273,7 @@ end
 arch woodfloor
 x 3
 y 1
+unique 1
 end
 arch barrel
 x 3
@@ -240,6 +283,7 @@ end
 arch woodfloor
 x 3
 y 2
+unique 1
 end
 arch light3
 x 3
@@ -248,14 +292,17 @@ end
 arch woodfloor
 x 3
 y 3
+unique 1
 end
 arch woodfloor
 x 3
 y 4
+unique 1
 end
 arch woodfloor
 x 3
 y 5
+unique 1
 end
 arch light3
 x 3
@@ -264,6 +311,7 @@ end
 arch woodfloor
 x 3
 y 6
+unique 1
 end
 arch magic_mouth
 msg
@@ -317,6 +365,7 @@ end
 arch woodfloor
 x 4
 y 1
+unique 1
 end
 arch firepot
 x 4
@@ -325,28 +374,42 @@ end
 arch woodfloor
 x 4
 y 2
+unique 1
 end
 arch woodfloor
 x 4
 y 3
+unique 1
 end
 arch chair_1.4
 x 4
 y 3
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 4
 y 4
+unique 1
 end
 arch chair_1.4
 x 4
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 4
 y 5
+unique 1
 end
 arch firepot
 x 4
@@ -355,6 +418,7 @@ end
 arch woodfloor
 x 4
 y 6
+unique 1
 end
 arch woodfloor
 x 4
@@ -389,51 +453,56 @@ end
 arch woodfloor
 x 5
 y 1
+unique 1
 end
 arch table_3
 x 5
 y 1
-end
+resist_physical 100
-arch guide_alchemy
+resist_magic 100
-x 5
+resist_fire 100
-y 1
+resist_electricity 100
-no_pick 1
+resist_cold 100
 end
 arch woodfloor
 x 5
 y 2
+unique 1
 end
 arch woodfloor
 x 5
 y 3
+unique 1
 end
 arch table_4
 x 5
 y 3
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch fix_mercury
+resist_fire 100
-x 5
+resist_electricity 100
-y 3
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 5
 y 4
+unique 1
 end
 arch table_4
 x 5
 y 4
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch true_lead
+resist_fire 100
-x 5
+resist_electricity 100
-y 4
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 5
 y 5
+unique 1
 end
 arch barrel
 x 5
@@ -443,25 +512,23 @@ end
 arch woodfloor
 x 5
 y 6
-end
+unique 1
-arch chair_1.1
-x 5
-y 6
-no_pick 1
 end
 arch woodfloor
 x 5
 y 7
 end
-arch table_3
+arch altar_trigger
+name New Cauldron 30000 Rubies
+slaying ruby
+msg
+Removing your old cauldron. Please wait.
+endmsg
+exp 60
+food 30000
 x 5
 y 7
-no_pick 1
+connected 9001
-end
-arch potion_empty
-x 5
-y 7
-no_pick 1
 end
 arch woodfloor
 x 5

templates/guild/guild_bbq

@@ -9,6 +9,8 @@ msg
 Creator: Rick Tanner
 Editor: CrossfireEditor
 Date:    3/15/2007
+Map finised by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
 endmsg
 outdoor 1
 end
@@ -206,6 +208,12 @@ end
 arch chair_cw_1.4
 x 2
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch flagstone
@@ -216,6 +224,12 @@ end
 arch chair_cw_1.4
 x 2
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch light4
@@ -242,9 +256,17 @@ x 2
 y 8
 unique 1
 end
-arch hedge
+arch altar_trigger
+name New Stove 30000 Rubies
+slaying ruby
+msg
+Removing your old stove. Please wait.
+endmsg
+exp 60
+food 30000
 x 2
 y 8
+connected 9002
 end
 arch flagstone
 x 2
@@ -290,6 +312,14 @@ end
 arch chair_cw_1.1
 x 3
 y 3
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
 no_pick 1
 end
 arch flagstone
@@ -327,6 +357,12 @@ end
 arch chair_cw_1.3
 x 3
 y 7
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch flagstone
@@ -383,6 +419,12 @@ end
 arch chair_cw_1.2
 x 4
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch flagstone
@@ -393,6 +435,12 @@ end
 arch chair_cw_1.2
 x 4
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch flagstone
@@ -403,6 +451,14 @@ end
 arch chair_cw_1.2
 x 4
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
 no_pick 1
 end
 arch flagstone
@@ -420,24 +476,6 @@ x 4
 y 8
 no_pick 1
 end
-arch dragon_steak
-name aging steak
-food 0
-x 4
-y 8
-type 67
-value 1
-map_layer item
-no_pick 1
-startequip 1
-end
-arch orcchop
-x 4
-y 8
-map_layer item
-no_pick 1
-startequip 1
-end
 arch flagstone
 x 4
 y 9
@@ -528,9 +566,28 @@ x 5
 y 8
 unique 1
 end
+arch duplicator
+other_arch stove
+x 5
+y 8
+connected 9002
+activate_on_release 0
+end
+arch creator
+other_arch stove
+hp 0
+x 5
+y 8
+level 2
+connected 9002
+lifesave 1
+activate_on_push 0
+end
 arch stove
 x 5
 y 8
+magic 3
+identified 1
 end
 arch flagstone
 x 5
@@ -581,6 +638,11 @@ end
 arch chair_cw_1.4
 x 6
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch flagstone
@@ -591,6 +653,12 @@ end
 arch chair_cw_1.4
 x 6
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch flagstone
@@ -601,6 +669,12 @@ end
 arch chair_cw_1.4
 x 6
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch flagstone
@@ -661,6 +735,11 @@ end
 arch chair_cw_1.1
 x 7
 y 3
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch flagstone
@@ -698,6 +777,12 @@ end
 arch chair_cw_1.3
 x 7
 y 7
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch flagstone
@@ -766,6 +851,11 @@ end
 arch chair_cw_1.2
 x 8
 y 4
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch flagstone
@@ -776,6 +866,12 @@ end
 arch chair_cw_1.2
 x 8
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
 no_pick 1
 end
 arch light4
@@ -790,6 +886,11 @@ end
 arch chair_cw_1.2
 x 8
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch flagstone

templates/guild/guild_jeweler

@@ -9,6 +9,8 @@ msg
 Creator: Rick Tanner
 Editor: CrossfireEditor
 Date:    3/19/2007
+Map finised by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
 endmsg
 end
 arch woodfloor
@@ -106,10 +108,17 @@ end
 arch woodfloor
 x 1
 y 5
+unique 1
 end
 arch table_4
 x 1
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
 no_pick 1
 end
 arch amethyst
@@ -120,10 +129,22 @@ end
 arch woodfloor
 x 1
 y 6
+unique 1
 end
 arch table_4
+Str 100
+Dex 100
+Con 100
 x 1
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
 no_pick 1
 end
 arch gem
@@ -134,10 +155,27 @@ end
 arch woodfloor
 x 1
 y 7
+unique 1
+end
+arch duplicator
+other_arch jeweler_bench
+x 1
+y 8
+connected 8001
+activate_on_release 0
+end
+arch creator
+other_arch jeweler_bench
+x 1
+y 8
+connected 8001
+lifesave 1
+activate_on_push 0
 end
 arch woodfloor
 x 1
 y 8
+unique 1
 end
 arch jeweler_bench
 x 1
@@ -154,10 +192,17 @@ end
 arch woodfloor
 x 2
 end
+arch dwall_0
+x 2
+end
 arch woodfloor
 x 2
 y 1
 end
+arch dwall_0
+x 2
+y 1
+end
 arch woodfloor
 x 2
 y 2
@@ -189,19 +234,30 @@ end
 arch woodfloor
 x 2
 y 6
+unique 1
 end
 arch chair_2.2
 x 2
 y 6
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
 no_pick 1
 end
 arch woodfloor
 x 2
 y 7
+unique 1
 end
 arch woodfloor
 x 2
 y 8
+unique 1
 end
 arch woodfloor
 x 2
@@ -214,6 +270,9 @@ end
 arch woodfloor
 x 3
 end
+arch grate_closed_1
+x 3
+end
 arch woodfloor
 x 3
 y 1
@@ -270,10 +329,12 @@ end
 arch woodfloor
 x 3
 y 6
+unique 1
 end
 arch woodfloor
 x 3
 y 7
+unique 1
 end
 arch charwoman
 x 3
@@ -282,6 +343,7 @@ end
 arch woodfloor
 x 3
 y 8
+unique 1
 end
 arch woodfloor
 x 3
@@ -294,10 +356,17 @@ end
 arch woodfloor
 x 4
 end
+arch dwall_0
+x 4
+end
 arch woodfloor
 x 4
 y 1
 end
+arch dwall_0
+x 4
+y 1
+end
 arch woodfloor
 x 4
 y 2
@@ -329,14 +398,35 @@ end
 arch woodfloor
 x 4
 y 6
+unique 1
 end
 arch woodfloor
 x 4
 y 7
+unique 1
 end
 arch chair_2.1
 x 4
 y 7
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_holyword 100
+resist_blind 100
 no_pick 1
 end
 arch woodfloor
@@ -346,6 +436,25 @@ end
 arch table_3
 x 4
 y 8
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_slow 100
+resist_paralyze 100
+resist_fear 100
+resist_deplete 100
+resist_death 100
+resist_chaos 100
+resist_holyword 100
+resist_blind 100
 no_pick 1
 end
 arch ruby
@@ -383,6 +492,7 @@ end
 arch woodfloor
 x 5
 y 4
+unique 1
 end
 arch firepot
 x 5
@@ -395,10 +505,18 @@ end
 arch woodfloor
 x 5
 y 5
+unique 1
 end
 arch table_4
 x 5
 y 5
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
+resist_chaos 100
 no_pick 1
 end
 arch smallnugget
@@ -409,6 +527,7 @@ end
 arch woodfloor
 x 5
 y 6
+unique 1
 end
 arch barrel
 x 5
@@ -417,10 +536,20 @@ end
 arch woodfloor
 x 5
 y 7
+unique 1
 end
 arch table_4
 x 5
 y 7
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_confusion 100
+resist_acid 100
+resist_drain 100
+resist_chaos 100
 no_pick 1
 end
 arch sapphire
@@ -431,14 +560,19 @@ end
 arch woodfloor
 x 5
 y 8
+unique 1
 end
-arch firepot
+arch altar_trigger
-x 5
+name New Jeweler's Workbench 30000 Diamonds
-y 8
+slaying diamond
-end
+msg
-arch light3
+Removing your old cauldron. Please wait.
+endmsg
+exp 60
+food 30000
 x 5
 y 8
+connected 8001
 end
 arch woodfloor
 x 5

templates/guild/guild_thaum

@@ -9,6 +9,8 @@ msg
 Creator: Rick Tanner
 Editor: CrossfireEditor
 Date:    3/19/2007
+Map finised by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
 endmsg
 end
 arch woodfloor
@@ -62,6 +64,22 @@ end
 arch woodfloor
 x 1
 y 1
+unique 1
+end
+arch duplicator
+other_arch thaumaturg_desk
+x 1
+y 1
+connected 8002
+activate_on_release 0
+end
+arch creator
+other_arch thaumaturg_desk
+x 1
+y 1
+connected 8002
+lifesave 1
+activate_on_push 0
 end
 arch thaumaturg_desk
 x 1
@@ -70,10 +88,12 @@ end
 arch woodfloor
 x 1
 y 2
+unique 1
 end
 arch woodfloor
 x 1
 y 3
+unique 1
 end
 arch light3
 x 1
@@ -82,24 +102,34 @@ end
 arch woodfloor
 x 1
 y 4
+unique 1
 end
 arch table_4
 x 1
 y 4
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch wand
+resist_fire 100
-x 1
+resist_electricity 100
-y 4
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 1
 y 5
+unique 1
 end
-arch brazier
+arch altar_trigger
+name New Thaumaturge Desk 30000 Rubies
+slaying ruby
+msg
+Removing your old cauldron. Please wait.
+endmsg
+exp 60
+food 30000
 x 1
 y 5
+connected 8002
 end
 arch woodfloor
 x 1
@@ -118,27 +148,37 @@ end
 arch woodfloor
 x 2
 y 1
+unique 1
 end
 arch woodfloor
 x 2
 y 2
+unique 1
 end
 arch woodfloor
 x 2
 y 3
+unique 1
 end
 arch chair_2.4
 x 2
 y 3
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 2
 y 4
+unique 1
 end
 arch woodfloor
 x 2
 y 5
+unique 1
 end
 arch woodfloor
 x 2
@@ -157,46 +197,56 @@ end
 arch woodfloor
 x 3
 y 1
+unique 1
 end
 arch chair_2.4
 x 3
 y 1
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 3
 y 2
+unique 1
 end
 arch woodfloor
 x 3
 y 3
+unique 1
 end
 arch table_burl_3
 x 3
 y 3
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch wand
+resist_fire 100
-x 3
+resist_electricity 100
-y 3
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
 x 3
 y 4
+unique 1
 end
 arch woodfloor
 x 3
 y 5
+unique 1
 end
 arch table_3
 x 3
 y 5
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch rod_light
+resist_fire 100
-x 3
+resist_electricity 100
-y 5
+resist_cold 100
 no_pick 1
 end
 arch woodfloor
@@ -216,15 +266,16 @@ end
 arch woodfloor
 x 4
 y 1
+unique 1
 end
 arch table_3
 x 4
 y 1
-no_pick 1
+resist_physical 100
-end
+resist_magic 100
-arch rod_heavy
+resist_fire 100
-x 4
+resist_electricity 100
-y 1
+resist_cold 100
 no_pick 1
 end
 arch light3
@@ -234,18 +285,22 @@ end
 arch woodfloor
 x 4
 y 2
+unique 1
 end
 arch woodfloor
 x 4
 y 3
+unique 1
 end
 arch woodfloor
 x 4
 y 4
+unique 1
 end
 arch woodfloor
 x 4
 y 5
+unique 1
 end
 arch barrel
 x 4
@@ -268,6 +323,7 @@ end
 arch woodfloor
 x 5
 y 1
+unique 1
 end
 arch charwoman
 x 5
@@ -276,18 +332,22 @@ end
 arch woodfloor
 x 5
 y 2
+unique 1
 end
 arch woodfloor
 x 5
 y 3
+unique 1
 end
 arch woodfloor
 x 5
 y 4
+unique 1
 end
 arch woodfloor
 x 5
 y 5
+unique 1
 end
 arch light3
 x 5
@@ -310,6 +370,7 @@ end
 arch woodfloor
 x 6
 y 1
+unique 1
 end
 arch brazier
 x 6
@@ -318,6 +379,7 @@ end
 arch woodfloor
 x 6
 y 2
+unique 1
 end
 arch dwall_0
 x 6
@@ -334,6 +396,7 @@ end
 arch woodfloor
 x 6
 y 3
+unique 1
 end
 arch pedestal
 x 6
@@ -352,6 +415,7 @@ end
 arch woodfloor
 x 6
 y 5
+unique 1
 end
 arch brazier
 x 6
@@ -496,6 +560,10 @@ arch woodfloor
 x 9
 y 2
 end
+arch dwall_0
+x 9
+y 2
+end
 arch woodfloor
 x 9
 y 3
@@ -504,6 +572,10 @@ arch woodfloor
 x 9
 y 4
 end
+arch dwall_0
+x 9
+y 4
+end
 arch woodfloor
 x 9
 y 5
@@ -527,14 +599,26 @@ arch woodfloor
 x 10
 y 2
 end
+arch dwall_0
+x 10
+y 2
+end
 arch woodfloor
 x 10
 y 3
 end
+arch grate_closed_2
+x 10
+y 3
+end
 arch woodfloor
 x 10
 y 4
 end
+arch dwall_0
+x 10
+y 4
+end
 arch woodfloor
 x 10
 y 5

templates/guild/hallofjoining

@@ -2857,7 +2857,7 @@ y 11
 unique 1
 end
 arch teleporter
-slaying guild_HQ
+slaying guild_hq
 hp 1
 sp 12
 x 12
@@ -2884,6 +2884,10 @@ arch flagstone
 x 12
 y 13
 end
+arch dungeon_magic
+x 12
+y 13
+end
 arch stair_up_2
 slaying mainfloor
 hp 11
@@ -2891,10 +2895,6 @@ sp 26
 x 12
 y 13
 end
-arch dungeon_magic
-x 12
-y 13
-end
 arch flagstone
 x 12
 y 14
@@ -3026,7 +3026,7 @@ y 3
 unique 1
 end
 arch teleporter
-slaying guild_HQ
+slaying guild_hq
 hp 13
 sp 12
 x 13

templates/guild/mainfloor

@@ -411,16 +411,6 @@ arch dungeon_magic
 x 1
 y 24
 end
-arch trigger_marker
-slaying guild_forge121
-msg
-You have one day's use of these facilities.
-endmsg
-food 504
-x 1
-y 24
-connected 130
-end
 arch dungeon_magic
 x 1
 y 25
@@ -662,20 +652,9 @@ arch dungeon_magic
 x 2
 y 24
 end
-arch creator
+arch goldflagstone
-other_arch flagstone
 x 2
 y 24
-connected 76
-end
-arch goldfloor
-name drop 30,000 rubies for a forge
-slaying ruby
-food 30000
-x 2
-y 24
-connected 130
-unique 1
 end
 arch flagstone
 x 2
@@ -1013,7 +992,7 @@ y 3
 unique 1
 end
 arch stair_down_3
-slaying /euthville/guildhq
+slaying guild_hq
 hp 1
 sp 1
 x 4
@@ -2396,7 +2375,7 @@ x 7
 y 23
 end
 arch invis_exit
-slaying guildtoolshed
+slaying guild_toolshed
 hp 14
 sp 4
 x 7
@@ -2684,20 +2663,9 @@ arch dungeon_magic
 x 8
 y 24
 end
-arch creator
+arch goldflagstone
-other_arch flagstone
 x 8
 y 24
-connected 76
-end
-arch goldfloor
-name drop 30,000 rubies for a workbench
-slaying ruby
-food 30000
-x 8
-y 24
-connected 120
-unique 1
 end
 arch flagstone
 x 8
@@ -2968,16 +2936,6 @@ arch dungeon_magic
 x 9
 y 24
 end
-arch trigger_marker
-slaying guild_boyer121
-msg
-You have one day's use of these facilities.
-endmsg
-food 504
-x 9
-y 24
-connected 120
-end
 arch dungeon_magic
 x 9
 y 25
@@ -3006,12 +2964,6 @@ arch flagstone
 x 9
 y 27
 end
-arch pedestal
-x 9
-y 27
-invisible 1
-connected 122
-end
 arch flagstone
 x 9
 y 28
@@ -3174,7 +3126,7 @@ x 10
 y 16
 end
 arch goldfloor
-name drop 5000 Platinum for a portal to Scorn
+name drop 5000 platinum for a portal to Scorn
 slaying platinacoin
 food 5000
 x 10
@@ -3729,12 +3681,6 @@ x 12
 y 10
 unique 1
 end
-arch creator
-other_arch woodfloor
-x 12
-y 10
-connected 60
-end
 arch dungeon_magic
 x 12
 y 10
@@ -3832,12 +3778,6 @@ arch dungeon_magic
 x 12
 y 19
 end
-arch creator
-other_arch woodfloor
-x 12
-y 19
-connected 77
-end
 arch woodfloor
 x 12
 y 19
@@ -4458,19 +4398,7 @@ arch dungeon_magic
 x 14
 y 21
 end
-arch grass
+arch goldgrass
-x 14
-y 21
-move_block swim boat
-unique 1
-end
-arch creator
-other_arch grass
-x 14
-y 21
-connected 81
-end
-arch goldfloor
 name drop 25 jade coins  for Kennel
 slaying jadecoin
 food 25
@@ -5047,17 +4975,17 @@ arch dungeon_magic
 x 16
 y 15
 end
+arch woodfloor
+x 16
+y 15
+unique 1
+end
 arch creator
 other_arch woodfloor
 x 16
 y 15
 connected 40
 end
-arch woodfloor
-x 16
-y 15
-unique 1
-end
 arch detector
 name You must capture a spectre and force it to build your secondfloor floor
 slaying Spectre
@@ -5289,10 +5217,6 @@ arch dwall_2_1_2
 x 17
 y 6
 end
-arch dungeon_magic
-x 17
-y 7
-end
 arch woodfloor
 x 17
 y 7
@@ -5300,7 +5224,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 8
+y 7
+end
+arch goldfloor
+name drop 1000 platinum coins for a pearl converter
+slaying platinacoin
+food 1000
+x 17
+y 7
+connected 707
+unique 1
 end
 arch woodfloor
 x 17
@@ -5309,7 +5242,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 9
+y 8
+end
+arch goldfloor
+name drop 1000 platinum for a silver to gold converter
+slaying platinacoin
+food 1000
+x 17
+y 8
+connected 30
+unique 1
 end
 arch woodfloor
 x 17
@@ -5318,7 +5260,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 10
+y 9
+end
+arch goldfloor
+name drop 1000 platinum for a gold to platinum converter
+slaying platinacoin
+food 1000
+x 17
+y 9
+connected 31
+unique 1
 end
 arch woodfloor
 x 17
@@ -5327,13 +5278,35 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 11
+y 10
+end
+arch goldfloor
+name drop 1000 platinum coins for a platinum to gold converter
+slaying platinacoin
+food 1000
+x 17
+y 10
+connected 32
+unique 1
 end
 arch woodfloor
 x 17
 y 11
 unique 1
 end
+arch dungeon_magic
+x 17
+y 11
+end
+arch goldfloor
+name drop 1000 platinum coins for a ruby converter
+slaying platinacoin
+food 1000
+x 17
+y 11
+connected 706
+unique 1
+end
 arch woodfloor
 x 17
 y 12
@@ -5347,10 +5320,6 @@ arch light4
 x 17
 y 12
 end
-arch dungeon_magic
-x 17
-y 13
-end
 arch woodfloor
 x 17
 y 13
@@ -5358,7 +5327,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 14
+y 13
+end
+arch goldfloor
+name drop 1000 platinum coins for a platinum to jade converter
+slaying platinacoin
+food 1000
+x 17
+y 13
+connected 701
+unique 1
 end
 arch woodfloor
 x 17
@@ -5367,7 +5345,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 15
+y 14
+end
+arch goldfloor
+name drop 1000 platinum coins for a jade to platinum
+slaying platinacoin
+food 1000
+x 17
+y 14
+connected 702
+unique 1
 end
 arch woodfloor
 x 17
@@ -5376,7 +5363,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 16
+y 15
+end
+arch goldfloor
+name drop 1000 platinum coins for a jade to amberium
+slaying platinacoin
+food 1000
+x 17
+y 15
+connected 703
+unique 1
 end
 arch woodfloor
 x 17
@@ -5385,7 +5381,16 @@ unique 1
 end
 arch dungeon_magic
 x 17
-y 17
+y 16
+end
+arch goldfloor
+name drop 1000 platinum coins for an amberium to jade converter
+slaying platinacoin
+food 1000
+x 17
+y 16
+connected 704
+unique 1
 end
 arch woodfloor
 x 17
@@ -5394,6 +5399,19 @@ unique 1
 end
 arch dungeon_magic
 x 17
+y 17
+end
+arch goldfloor
+name drop 1000 platinum coins for a diamond converter
+slaying platinacoin
+food 1000
+x 17
+y 17
+connected 705
+unique 1
+end
+arch dungeon_magic
+x 17
 y 18
 end
 arch woodfloor
@@ -5406,12 +5424,6 @@ x 17
 y 19
 unique 1
 end
-arch creator
-other_arch woodfloor
-x 17
-y 19
-connected 123
-end
 arch dungeon_magic
 x 17
 y 19
@@ -5613,15 +5625,6 @@ x 18
 y 7
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a pearl converter
-slaying platinacoin
-food 1000
-x 18
-y 7
-connected 707
-unique 1
-end
 arch woodfloor
 x 18
 y 8
@@ -5637,15 +5640,6 @@ arch dungeon_magic
 x 18
 y 8
 end
-arch goldfloor
-name drop 1000 platinum for a silver to gold converter
-slaying platinacoin
-food 1000
-x 18
-y 8
-connected 30
-unique 1
-end
 arch woodfloor
 x 18
 y 9
@@ -5661,15 +5655,6 @@ arch dungeon_magic
 x 18
 y 9
 end
-arch goldfloor
-name drop 1000 platinum for a gold to platinum converter
-slaying platinacoin
-food 1000
-x 18
-y 9
-connected 31
-unique 1
-end
 arch woodfloor
 x 18
 y 10
@@ -5685,15 +5670,6 @@ arch dungeon_magic
 x 18
 y 10
 end
-arch goldfloor
-name drop 1000 platinum coins for a platinum to gold converter
-slaying platinacoin
-food 1000
-x 18
-y 10
-connected 32
-unique 1
-end
 arch dungeon_magic
 x 18
 y 11
@@ -5703,15 +5679,6 @@ x 18
 y 11
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a ruby  converter
-slaying platinacoin
-food 1000
-x 18
-y 11
-connected 706
-unique 1
-end
 arch woodfloor
 x 18
 y 12
@@ -5730,15 +5697,6 @@ x 18
 y 13
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a platinum to jade converter
-slaying platinacoin
-food 1000
-x 18
-y 13
-connected 701
-unique 1
-end
 arch dungeon_magic
 x 18
 y 14
@@ -5748,15 +5706,6 @@ x 18
 y 14
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a jade to platinum
-slaying platinacoin
-food 1000
-x 18
-y 14
-connected 702
-unique 1
-end
 arch dungeon_magic
 x 18
 y 15
@@ -5766,15 +5715,6 @@ x 18
 y 15
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a jade to amberium
-slaying platinacoin
-food 1000
-x 18
-y 15
-connected 703
-unique 1
-end
 arch dungeon_magic
 x 18
 y 16
@@ -5784,15 +5724,6 @@ x 18
 y 16
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for an amberium to jade converter
-slaying platinacoin
-food 1000
-x 18
-y 16
-connected 704
-unique 1
-end
 arch dungeon_magic
 x 18
 y 17
@@ -5802,15 +5733,6 @@ x 18
 y 17
 unique 1
 end
-arch goldfloor
-name drop 1000 platinum coins for a diamond converter
-slaying platinacoin
-food 1000
-x 18
-y 17
-connected 705
-unique 1
-end
 arch dungeon_magic
 x 18
 y 18
@@ -7037,7 +6959,7 @@ x 22
 y 22
 connected 779
 end
-arch goldfloor
+arch goldgrass
 name drop 30,000 rubies for stove
 slaying ruby
 food 30000
@@ -9467,6 +9389,8 @@ connected 40
 end
 arch stair2_up
 slaying secondfloor
+hp 12
+sp 11
 x 31
 y 3
 end
@@ -12949,8 +12873,8 @@ speed 0.0
 connected 999
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 13
 x 35
 y 14
 speed 0.0
@@ -12977,8 +12901,8 @@ x 35
 y 17
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 14
 x 35
 y 18
 speed 0.0
@@ -12994,8 +12918,8 @@ x 35
 y 18
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 15
 x 35
 y 19
 speed 0.0
@@ -13006,8 +12930,8 @@ x 35
 y 19
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 16
 x 35
 y 20
 speed 0.0
@@ -13023,8 +12947,8 @@ x 35
 y 20
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 11
 x 35
 y 22
 speed 0.0
@@ -13035,8 +12959,8 @@ x 35
 y 22
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 17
 x 35
 y 23
 speed 0.0
@@ -13047,8 +12971,8 @@ x 35
 y 23
 end
 arch teleporter
-hp 15
+hp 18
-sp 29
+sp 7
 x 35
 y 24
 speed 0.0

templates/guild/secondfloor

@@ -340,10 +340,6 @@ x 1
 y 9
 unique 1
 end
-arch dungeon_magic
-x 1
-y 10
-end
 arch woodfloor
 x 1
 y 10
@@ -351,43 +347,23 @@ unique 1
 end
 arch dungeon_magic
 x 1
-y 11
+y 10
-end
-arch woodfloor
-x 1
-y 11
-unique 1
-end
-arch dungeon_magic
-x 1
-y 11
-end
-arch creator
-other_arch woodfloor
-x 1
-y 11
-connected 10
-end
-arch woodfloor
-x 1
-y 11
-unique 1
 end
 arch goldfloor
 name drop 15 diamonds of exceptional beauty for Jewelers room
 slaying diamond of exceptional beauty
 food 15
 x 1
-y 11
+y 10
 connected 10
 end
 arch dungeon_magic
 x 1
-y 12
+y 11
 end
 arch woodfloor
 x 1
-y 12
+y 11
 unique 1
 end
 arch trigger_marker
@@ -397,11 +373,24 @@ You have one day's use of these facilities.
 endmsg
 food 504
 x 1
-y 12
+y 11
 connected 11
 end
 arch dungeon_magic
 x 1
+y 12
+end
+arch woodfloor
+x 1
+y 12
+unique 1
+end
+arch cwall_0
+x 1
+y 12
+end
+arch dungeon_magic
+x 1
 y 13
 end
 arch woodfloor
@@ -629,39 +618,45 @@ x 2
 y 11
 unique 1
 end
-arch dungeon_magic
-x 2
-y 12
-end
-arch woodfloor
-x 2
-y 12
-unique 1
-end
 arch check_floor
 slaying Jewe_Token
 x 2
-y 12
+y 11
 connected 898
 end
 arch dungeon_magic
 x 2
-y 13
+y 12
 end
 arch woodfloor
 x 2
-y 13
+y 12
 unique 1
 end
 arch check_floor
 race Jewelry Pass
 x 2
-y 13
+y 12
 connected 898
 end
 arch grate_closed_1
 x 2
+y 12
+connected 898
+end
+arch dungeon_magic
+x 2
 y 13
+end
+arch woodfloor
+x 2
+y 13
+unique 1
+end
+arch pedestal
+x 2
+y 13
+invisible 1
 connected 898
 end
 arch dungeon_magic
@@ -902,6 +897,10 @@ x 3
 y 12
 unique 1
 end
+arch cwall_0
+x 3
+y 12
+end
 arch dungeon_magic
 x 3
 y 13
@@ -1403,7 +1402,7 @@ end
 arch pedestal
 x 6
 y 2
-connected 746
+connected 42
 end
 arch woodfloor
 x 6
@@ -2013,7 +2012,7 @@ no_magic 1
 damned 1
 end
 arch invis_exit
-slaying guildthaum
+slaying guild_thaum
 hp 6
 sp 3
 x 8
@@ -2374,16 +2373,10 @@ arch dungeon_magic
 x 10
 y 7
 end
-arch creator
+arch woodfloor
 x 10
 y 7
-end
+unique 1
-arch goldfloor
-slaying Glowing Crystal Token
-food 1
-x 10
-y 7
-connected 80
 end
 arch dungeon_magic
 x 10
@@ -2474,15 +2467,6 @@ x 10
 y 16
 unique 1
 end
-arch dungeon_magic
-x 10
-y 16
-end
-arch woodfloor
-x 10
-y 16
-unique 1
-end
 arch cwall_0
 x 10
 y 16
@@ -2496,9 +2480,10 @@ x 10
 y 17
 unique 1
 end
-arch igate_closed_2
+arch pedestal
 x 10
 y 17
+invisible 1
 connected 899
 end
 arch dungeon_magic
@@ -2510,15 +2495,6 @@ x 10
 y 18
 unique 1
 end
-arch dungeon_magic
-x 10
-y 18
-end
-arch woodfloor
-x 10
-y 18
-unique 1
-end
 arch cwall_0
 x 10
 y 18
@@ -2546,20 +2522,14 @@ end
 arch dwall_2_1_2
 x 11
 end
-arch dungeon_magic
-x 11
-y 1
-end
 arch woodfloor
 x 11
 y 1
 unique 1
 end
-arch creator
+arch dungeon_magic
-other_arch woodfloor
 x 11
 y 1
-connected 40
 end
 arch goldfloor
 name drop 100 jade coins for Glowing Crystal Room
@@ -2717,6 +2687,19 @@ unique 1
 end
 arch dungeon_magic
 x 11
+y 16
+end
+arch woodfloor
+x 11
+y 16
+unique 1
+end
+arch cwall_0
+x 11
+y 16
+end
+arch dungeon_magic
+x 11
 y 17
 end
 arch woodfloor
@@ -2724,8 +2707,7 @@ x 11
 y 17
 unique 1
 end
-arch check_floor
+arch igate_closed_2
-slaying Thau_Token
 x 11
 y 17
 connected 899
@@ -2748,15 +2730,9 @@ x 11
 y 18
 unique 1
 end
-arch trigger_marker
+arch cwall_0
-slaying guild_thaum21
-msg
-You have one day's use of these facilities.
-endmsg
-food 504
 x 11
 y 18
-connected 21
 end
 arch dungeon_magic
 x 11
@@ -2903,7 +2879,7 @@ end
 arch stair_3_down
 slaying mainfloor
 hp 16
-sp 15
+sp 14
 x 12
 y 11
 end
@@ -2961,9 +2937,11 @@ x 12
 y 17
 unique 1
 end
-arch dungeon_magic
+arch check_floor
+slaying Thau_Token
 x 12
-y 18
+y 17
+connected 899
 end
 arch woodfloor
 x 12
@@ -2974,24 +2952,15 @@ arch dungeon_magic
 x 12
 y 18
 end
-arch woodfloor
+arch trigger_marker
+slaying guild_thaum21
+msg
+You have one day's use of these facilities.
+endmsg
+food 504
 x 12
 y 18
-unique 1
+connected 21
-end
-arch creator
-other_arch woodfloor
-x 12
-y 18
-connected 20
-end
-arch goldfloor
-name drop 30,000 rubies for Thaumaturgy room
-slaying ruby
-food 30000
-x 12
-y 18
-connected 20
 end
 arch woodfloor
 x 12
@@ -3079,20 +3048,14 @@ arch cwall_0
 x 13
 y 6
 end
-arch dungeon_magic
-x 13
-y 7
-end
 arch woodfloor
 x 13
 y 7
 unique 1
 end
-arch creator
+arch dungeon_magic
-other_arch woodfloor
 x 13
 y 7
-connected 30
 end
 arch goldfloor
 name drop 30,000 diamonds for Alchemy room
@@ -3200,15 +3163,23 @@ x 13
 y 17
 unique 1
 end
-arch dungeon_magic
-x 13
-y 18
-end
 arch woodfloor
 x 13
 y 18
 unique 1
 end
+arch dungeon_magic
+x 13
+y 18
+end
+arch goldfloor
+name drop 30,000 rubies for Thaumaturgy room
+slaying ruby
+food 30000
+x 13
+y 18
+connected 20
+end
 arch woodfloor
 x 13
 y 19
@@ -3267,7 +3238,7 @@ y 4
 connected 32
 end
 arch invis_exit
-slaying guildalchem
+slaying guild_alchemy
 hp 3
 sp 7
 x 14
@@ -3533,15 +3504,15 @@ arch cwall_0
 x 15
 y 6
 end
-arch dungeon_magic
-x 15
-y 7
-end
 arch woodfloor
 x 15
 y 7
 unique 1
 end
+arch dungeon_magic
+x 15
+y 7
+end
 arch trigger_marker
 slaying guild_alchemy31
 msg
@@ -3574,20 +3545,14 @@ x 15
 y 9
 unique 1
 end
-arch dungeon_magic
-x 15
-y 10
-end
 arch woodfloor
 x 15
 y 10
 unique 1
 end
-arch creator
+arch dungeon_magic
-other_arch woodfloor
 x 15
 y 10
-connected 7
 end
 arch goldfloor
 name drop 20 amulets of Lifesaving for a portal to the Mazes of Menace
@@ -4155,8 +4120,6 @@ hp 0
 sp 0
 x 18
 y 7
-walk_on 0
-fly_on 0
 end
 arch woodfloor
 x 18
@@ -4183,8 +4146,6 @@ hp 0
 sp 0
 x 18
 y 9
-walk_on 0
-fly_on 0
 end
 arch blocked
 x 18
@@ -4201,7 +4162,7 @@ end
 arch altar_trigger
 name Drop 100 platinum to enter Jewelers Room
 slaying platinacoin
-food 200
+food 100
 x 18
 y 11
 connected 11
@@ -4217,7 +4178,7 @@ end
 arch altar_trigger
 name Drop 100 platinum to enter Alchemy Room
 slaying platinacoin
-food 200
+food 100
 x 18
 y 12
 connected 31
@@ -4316,7 +4277,7 @@ x 19
 y 10
 end
 arch teleporter
-hp 10
+hp 11
 sp 19
 x 19
 y 11
@@ -4326,7 +4287,7 @@ end
 arch altar_trigger
 name Drop 100 platinum to enter Thaumaturgy Room
 slaying platinacoin
-food 200
+food 100
 x 19
 y 11
 connected 21
@@ -4342,7 +4303,7 @@ end
 arch altar_trigger
 name Drop 100 platinum to enter Glowing Crystal Room
 slaying platinacoin
-food 200
+food 100
 x 19
 y 12
 connected 41