From acee4824dafae6eedfabb041b925589bb814f5a5 Mon Sep 17 00:00:00 2001
From: meflin2 <meflin2@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 25 Mar 2010 17:33:10 +0000
Subject: [PATCH] more python guild updates

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12727 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 planes/bigchest                   | 181 +++++++++++
 python/guilds/guild_dues.py       |  10 +-
 templates/guild/basement          | 517 +++++++++++++++---------------
 templates/guild/guildman_lounge   |   4 +-
 templates/guild/hallofjoining     |   4 +-
 templates/guild/journeyman_lounge |   4 +-
 templates/guild/master_lounge     |  17 +-
 templates/guild/novice_lounge     |   4 +-
 8 files changed, 457 insertions(+), 284 deletions(-)
 create mode 100755 planes/bigchest

diff --git a/planes/bigchest b/planes/bigchest
new file mode 100755
index 000000000..cc1f71b61
--- /dev/null
+++ b/planes/bigchest
@@ -0,0 +1,181 @@
+arch map
+name Guild Bigchest
+reset_timeout 300
+difficulty 1
+region darcap
+width 5
+height 5
+enter_x 2
+enter_y 2
+msg
+Creator: CF Java Map Editor
+Date:    12/23/2001
+Map finised by:  Alestan jehloq@yahoo.com
+Date:     8/27/2007
+Modified: 2010-02-27 perkins
+endmsg
+end
+arch woodfloor2
+end
+arch woodwall_2_2_2
+end
+arch woodfloor2
+y 1
+end
+arch woodwall_2_1_1
+y 1
+end
+arch woodfloor2
+y 2
+end
+arch woodwall_2_1_1
+y 2
+end
+arch woodfloor2
+y 3
+end
+arch woodwall_2_1_1
+y 3
+end
+arch woodfloor2
+y 4
+end
+arch woodwall_2_2_1
+y 4
+end
+arch woodfloor2
+x 1
+end
+arch woodwall_2_1_2
+x 1
+end
+arch woodfloor
+x 1
+y 1
+unique 1
+end
+arch button_trigger
+name ExitButton
+x 1
+y 1
+type 93
+arch event_trigger
+title Python
+slaying /python/guilds/bigchest.py
+subtype 1
+end
+end
+arch woodfloor
+x 1
+y 2
+unique 1
+end
+arch woodfloor
+x 1
+y 3
+unique 1
+end
+arch woodfloor2
+x 1
+y 4
+end
+arch woodwall_2_1_2
+x 1
+y 4
+end
+arch woodfloor2
+x 2
+end
+arch woodwall_2_1_2
+x 2
+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 woodfloor2
+x 2
+y 4
+end
+arch woodwall_2_1_2
+x 2
+y 4
+end
+arch woodfloor2
+x 3
+end
+arch woodwall_2_1_2
+x 3
+end
+arch woodfloor
+x 3
+y 1
+unique 1
+end
+arch woodfloor
+x 3
+y 2
+unique 1
+end
+arch woodfloor
+x 3
+y 3
+unique 1
+end
+arch woodfloor2
+x 3
+y 4
+end
+arch woodwall_2_1_2
+x 3
+y 4
+end
+arch woodfloor2
+x 4
+end
+arch woodwall_2_2_3
+x 4
+end
+arch woodfloor2
+x 4
+y 1
+end
+arch woodwall_2_1_1
+x 4
+y 1
+end
+arch woodfloor2
+x 4
+y 2
+end
+arch woodwall_2_1_1
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
+arch woodwall_2_1_1
+x 4
+y 3
+end
+arch woodfloor2
+x 4
+y 4
+end
+arch woodwall_2_2_4
+x 4
+y 4
+end
diff --git a/python/guilds/guild_dues.py b/python/guilds/guild_dues.py
index d7dcd30de..b28e774a8 100644
--- a/python/guilds/guild_dues.py
+++ b/python/guilds/guild_dues.py
@@ -16,15 +16,7 @@
 #
 # author:Avion temitchell@sourceforge.net
 
-import Crossfire
-import CFGuilds
-import CFItemBroker
-import random
-import string
-import sys
-import CFBank
-import CFMail
-import CFLog
+import Crossfire,CFGuilds,CFItemBroker,random,string,sys,CFBank,CFMail,CFLog
 
 log = CFLog.CFLog()
 priceMailScroll = 5
diff --git a/templates/guild/basement b/templates/guild/basement
index f2de3ef1c..9285ba1b5 100644
--- a/templates/guild/basement
+++ b/templates/guild/basement
@@ -10,7 +10,7 @@ Creator: CF Java Map Editor
 Date:    6/15/2003
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2009-12-12 perkins
+Modified: 2010-02-27 perkins
 endmsg
 end
 arch woodfloor
@@ -276,269 +276,269 @@ x 1
 y 9
 unique 1
 end
+arch dungeon_magic
+x 1
+y 10
+end
+arch woodfloor2
+x 1
+y 10
+end
+arch woodfloor2
+x 1
+y 11
+end
+arch bed_save
+x 1
+y 11
+end
+arch dungeon_magic
+x 1
+y 12
+end
+arch woodfloor2
+x 1
+y 12
+end
+arch woodfloor2
+x 1
+y 13
+end
+arch bed_save
+x 1
+y 13
+end
+arch woodfloor
+x 1
+y 14
+end
+arch mine_2_1_2
+x 1
+y 14
+end
+arch dungeon_magic
+x 1
+y 14
+end
+arch flagstone
+x 1
+y 15
+unique 1
+end
+arch furious_floor
+x 1
+y 15
+end
+arch teleporter
+x 1
+y 15
+end
+arch flagstone
+x 1
+y 16
+unique 1
+end
+arch swall_1_4
+x 1
+y 16
+end
+arch mine_1_3
+x 1
+y 16
+end
+arch flagstone
+x 1
+y 17
+unique 1
+end
+arch furious_floor
+x 1
+y 17
+end
+arch teleporter
+x 1
+y 17
+end
+arch flagstone
+x 1
+y 18
+unique 1
+end
+arch swall_1_4
+x 1
+y 18
+end
+arch mine_1_3
+x 1
+y 18
+end
+arch flagstone
+x 1
+y 19
+unique 1
+end
+arch furious_floor
+x 1
+y 19
+end
+arch teleporter
+x 1
+y 19
+end
+arch flagstone
+x 1
+y 20
+unique 1
+end
+arch swall_1_4
+x 1
+y 20
+end
+arch mine_1_3
+x 1
+y 20
+end
+arch flagstone
+x 1
+y 21
+unique 1
+end
+arch furious_floor
+x 1
+y 21
+end
+arch teleporter
+x 1
+y 21
+end
+arch flagstone
+x 1
+y 22
+unique 1
+end
+arch swall_1_4
+x 1
+y 22
+end
+arch mine_1_3
+x 1
+y 22
+end
+arch flagstone
+x 1
+y 23
+unique 1
+end
+arch furious_floor
+x 1
+y 23
+end
+arch teleporter
+x 1
+y 23
+end
+arch flagstone
+x 1
+y 24
+unique 1
+end
+arch mine_2_1_2
+x 1
+y 24
+end
+arch woodfloor
+x 2
+end
+arch mine_2_1_2
+x 2
+end
+arch dungeon_magic
+x 2
+y 1
+end
+arch woodfloor
+x 2
+y 1
+unique 1
+end
+arch dungeon_magic
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 2
+unique 1
+end
+arch dungeon_magic
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 3
+unique 1
+end
+arch woodfloor
+x 2
+y 4
+unique 1
+end
+arch mine_2_1_2
+x 2
+y 4
+end
+arch dungeon_magic
+x 2
+y 5
+end
+arch woodfloor2
+x 2
+y 5
+end
+arch dungeon_magic
+x 2
+y 6
+end
+arch woodfloor2
+x 2
+y 6
+end
+arch dungeon_magic
+x 2
+y 7
+end
+arch woodfloor2
+x 2
+y 7
+end
+arch dungeon_magic
+x 2
+y 8
+end
+arch woodfloor2
+x 2
+y 8
+end
+arch dungeon_magic
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 9
+unique 1
+end
 arch goldfloor
 name drop a Firestar named Fearless for the Big Chest
 slaying firestar
 food 1
-x 1
+x 2
 y 9
 connected 99
 unique 1
 end
 arch dungeon_magic
-x 1
-y 10
-end
-arch woodfloor2
-x 1
-y 10
-end
-arch woodfloor2
-x 1
-y 11
-end
-arch bed_save
-x 1
-y 11
-end
-arch dungeon_magic
-x 1
-y 12
-end
-arch woodfloor2
-x 1
-y 12
-end
-arch woodfloor2
-x 1
-y 13
-end
-arch bed_save
-x 1
-y 13
-end
-arch woodfloor
-x 1
-y 14
-end
-arch mine_2_1_2
-x 1
-y 14
-end
-arch dungeon_magic
-x 1
-y 14
-end
-arch flagstone
-x 1
-y 15
-unique 1
-end
-arch furious_floor
-x 1
-y 15
-end
-arch teleporter
-x 1
-y 15
-end
-arch flagstone
-x 1
-y 16
-unique 1
-end
-arch swall_1_4
-x 1
-y 16
-end
-arch mine_1_3
-x 1
-y 16
-end
-arch flagstone
-x 1
-y 17
-unique 1
-end
-arch furious_floor
-x 1
-y 17
-end
-arch teleporter
-x 1
-y 17
-end
-arch flagstone
-x 1
-y 18
-unique 1
-end
-arch swall_1_4
-x 1
-y 18
-end
-arch mine_1_3
-x 1
-y 18
-end
-arch flagstone
-x 1
-y 19
-unique 1
-end
-arch furious_floor
-x 1
-y 19
-end
-arch teleporter
-x 1
-y 19
-end
-arch flagstone
-x 1
-y 20
-unique 1
-end
-arch swall_1_4
-x 1
-y 20
-end
-arch mine_1_3
-x 1
-y 20
-end
-arch flagstone
-x 1
-y 21
-unique 1
-end
-arch furious_floor
-x 1
-y 21
-end
-arch teleporter
-x 1
-y 21
-end
-arch flagstone
-x 1
-y 22
-unique 1
-end
-arch swall_1_4
-x 1
-y 22
-end
-arch mine_1_3
-x 1
-y 22
-end
-arch flagstone
-x 1
-y 23
-unique 1
-end
-arch furious_floor
-x 1
-y 23
-end
-arch teleporter
-x 1
-y 23
-end
-arch flagstone
-x 1
-y 24
-unique 1
-end
-arch mine_2_1_2
-x 1
-y 24
-end
-arch woodfloor
-x 2
-end
-arch mine_2_1_2
-x 2
-end
-arch dungeon_magic
-x 2
-y 1
-end
-arch woodfloor
-x 2
-y 1
-unique 1
-end
-arch dungeon_magic
-x 2
-y 2
-end
-arch woodfloor
-x 2
-y 2
-unique 1
-end
-arch dungeon_magic
-x 2
-y 3
-end
-arch woodfloor
-x 2
-y 3
-unique 1
-end
-arch woodfloor
-x 2
-y 4
-unique 1
-end
-arch mine_2_1_2
-x 2
-y 4
-end
-arch dungeon_magic
-x 2
-y 5
-end
-arch woodfloor2
-x 2
-y 5
-end
-arch dungeon_magic
-x 2
-y 6
-end
-arch woodfloor2
-x 2
-y 6
-end
-arch dungeon_magic
-x 2
-y 7
-end
-arch woodfloor2
-x 2
-y 7
-end
-arch dungeon_magic
-x 2
-y 8
-end
-arch woodfloor2
-x 2
-y 8
-end
-arch dungeon_magic
-x 2
-y 9
-end
-arch woodfloor
-x 2
-y 9
-unique 1
-end
-arch dungeon_magic
 x 2
 y 10
 end
@@ -4525,8 +4525,7 @@ connected 99
 end
 arch perm_magic_portal
 name Big Chest
-slaying bigchest
-face chest_1.111
+slaying /planes/bigchest
 hp 2
 sp 2
 x 19
@@ -4534,6 +4533,10 @@ walk_on 0
 is_animated 0
 fly_on 0
 unique 1
+arch event_apply
+title Python
+slaying /python/guilds/bigchest.py
+end
 end
 arch trap_blades
 Cha 127
diff --git a/templates/guild/guildman_lounge b/templates/guild/guildman_lounge
index 78caf584e..fd0dd2bfa 100644
--- a/templates/guild/guildman_lounge
+++ b/templates/guild/guildman_lounge
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2009-12-12 perkins
+Modified: 2010-02-28 perkins
 endmsg
 end
 arch woodfloor
@@ -351,6 +351,8 @@ is_buildable 1
 end
 arch stair_down_2
 slaying journeyman_lounge
+hp 1
+sp 8
 x 1
 y 10
 end
diff --git a/templates/guild/hallofjoining b/templates/guild/hallofjoining
index 2d6dd4d3e..d54ba7320 100644
--- a/templates/guild/hallofjoining
+++ b/templates/guild/hallofjoining
@@ -14,7 +14,7 @@ CF Java Map Editor
 Date:    6/14/2003
 Map finised by:  Alestan jehloq@yahoo.com
 Date:     8/27/2007
-Modified: 2009-12-12 perkins
+Modified: 2010-02-28 perkins
 endmsg
 end
 arch flagstone
@@ -4422,6 +4422,8 @@ unique 1
 end
 arch stair_down_1
 slaying novice_lounge
+hp 1
+sp 8
 x 18
 y 14
 end
diff --git a/templates/guild/journeyman_lounge b/templates/guild/journeyman_lounge
index 1bee356f9..a12a5a132 100644
--- a/templates/guild/journeyman_lounge
+++ b/templates/guild/journeyman_lounge
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2009-12-12 perkins
+Modified: 2010-02-28 perkins
 endmsg
 end
 arch woodfloor
@@ -351,6 +351,8 @@ is_buildable 1
 end
 arch stair_down_2
 slaying master_lounge
+hp 1
+sp 8
 x 1
 y 10
 end
diff --git a/templates/guild/master_lounge b/templates/guild/master_lounge
index ec8bfab1a..f38ebd563 100644
--- a/templates/guild/master_lounge
+++ b/templates/guild/master_lounge
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2009-05-08 Logan Perkins
+Modified: 2010-02-28 perkins
 endmsg
 end
 arch woodfloor
@@ -318,23 +318,12 @@ x 1
 y 10
 type 71
 unique 1
-end
-arch woodfloor
-x 1
-y 10
-type 71
-unique 1
-is_buildable 1
-end
-arch woodfloor
-x 1
-y 10
-type 71
-unique 1
 is_buildable 1
 end
 arch stair_down_2
 slaying guildmaster_lounge
+hp 1
+sp 8
 x 1
 y 10
 end
diff --git a/templates/guild/novice_lounge b/templates/guild/novice_lounge
index f4f565deb..51ee7eb35 100644
--- a/templates/guild/novice_lounge
+++ b/templates/guild/novice_lounge
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 8
 msg
 Created:  2004-05-12
-Modified: 2009-05-08 Logan Perkins
+Modified: 2010-02-28 perkins
 endmsg
 end
 arch woodfloor
@@ -335,6 +335,8 @@ is_buildable 1
 end
 arch stair_down_2
 slaying guildman_lounge
+hp 1
+sp 8
 x 1
 y 10
 end