From 06dafc8d569d369ed58bf4e7d3ed3fc463688159 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Sun, 6 Nov 2011 00:05:07 +0000 Subject: [PATCH] Merge in changes from the guild template (r15443) to fix infinite pedestal stacking in all guild maps. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15454 282e977c-c81d-0410-88c4-b93c2d0d6712 --- .../minatomachi/ketsueki_itsuryuu/secondfloor | 20 ++++++------------- .../suno-yamatoshi/nenshou_youso/secondfloor | 20 ++++++------------- azumauindo/zaseki_dzuki_ryoku/secondfloor | 20 ++++++------------- brest/black_shield/secondfloor | 20 ++++++------------- .../darcap/guilds/poisoned_dagger/secondfloor | 20 ++++++------------- .../guilds/smoking_cauldron/secondfloor | 20 ++++++------------- euthville/green_goblin/secondfloor | 20 ++++++------------- lake_country/Butakis/mockers/secondfloor | 20 ++++++------------- navar_city/dreaming_sage/secondfloor | 20 ++++++------------- pup_land/guilds/laughing_skull/secondfloor | 20 ++++++------------- pup_land/guilds/purple_butterfly/secondfloor | 20 ++++++------------- .../guilds/drunken_barbarian/secondfloor | 20 ++++++------------- wolfsburg/guilds/damned_heretics/secondfloor | 20 ++++++------------- 13 files changed, 78 insertions(+), 182 deletions(-) diff --git a/azumauindo/minatomachi/ketsueki_itsuryuu/secondfloor b/azumauindo/minatomachi/ketsueki_itsuryuu/secondfloor index 862fa7fde..09f4e912c 100644 --- a/azumauindo/minatomachi/ketsueki_itsuryuu/secondfloor +++ b/azumauindo/minatomachi/ketsueki_itsuryuu/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/azumauindo/suno-yamatoshi/nenshou_youso/secondfloor b/azumauindo/suno-yamatoshi/nenshou_youso/secondfloor index 369f80c75..2ba88a896 100644 --- a/azumauindo/suno-yamatoshi/nenshou_youso/secondfloor +++ b/azumauindo/suno-yamatoshi/nenshou_youso/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/azumauindo/zaseki_dzuki_ryoku/secondfloor b/azumauindo/zaseki_dzuki_ryoku/secondfloor index 7bf4ddb6a..d687cee36 100644 --- a/azumauindo/zaseki_dzuki_ryoku/secondfloor +++ b/azumauindo/zaseki_dzuki_ryoku/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/brest/black_shield/secondfloor b/brest/black_shield/secondfloor index fc66de113..c80aaf570 100644 --- a/brest/black_shield/secondfloor +++ b/brest/black_shield/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/darcap/darcap/guilds/poisoned_dagger/secondfloor b/darcap/darcap/guilds/poisoned_dagger/secondfloor index f9b30d4b1..f46609845 100644 --- a/darcap/darcap/guilds/poisoned_dagger/secondfloor +++ b/darcap/darcap/guilds/poisoned_dagger/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/darcap/darcap/guilds/smoking_cauldron/secondfloor b/darcap/darcap/guilds/smoking_cauldron/secondfloor index cd23e8999..f59d3ef4b 100644 --- a/darcap/darcap/guilds/smoking_cauldron/secondfloor +++ b/darcap/darcap/guilds/smoking_cauldron/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/euthville/green_goblin/secondfloor b/euthville/green_goblin/secondfloor index b2b700c8f..61f2bd0c1 100644 --- a/euthville/green_goblin/secondfloor +++ b/euthville/green_goblin/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/lake_country/Butakis/mockers/secondfloor b/lake_country/Butakis/mockers/secondfloor index 8ababf43a..9460c20c2 100644 --- a/lake_country/Butakis/mockers/secondfloor +++ b/lake_country/Butakis/mockers/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/navar_city/dreaming_sage/secondfloor b/navar_city/dreaming_sage/secondfloor index eb164c1ae..9cae0344f 100644 --- a/navar_city/dreaming_sage/secondfloor +++ b/navar_city/dreaming_sage/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/pup_land/guilds/laughing_skull/secondfloor b/pup_land/guilds/laughing_skull/secondfloor index 7b589ec59..7360cd186 100644 --- a/pup_land/guilds/laughing_skull/secondfloor +++ b/pup_land/guilds/laughing_skull/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/pup_land/guilds/purple_butterfly/secondfloor b/pup_land/guilds/purple_butterfly/secondfloor index 5d2aa4adb..ce598a4fc 100644 --- a/pup_land/guilds/purple_butterfly/secondfloor +++ b/pup_land/guilds/purple_butterfly/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/santo_dominion/guilds/drunken_barbarian/secondfloor b/santo_dominion/guilds/drunken_barbarian/secondfloor index 43a7b5a86..2a6345378 100644 --- a/santo_dominion/guilds/drunken_barbarian/secondfloor +++ b/santo_dominion/guilds/drunken_barbarian/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20 diff --git a/wolfsburg/guilds/damned_heretics/secondfloor b/wolfsburg/guilds/damned_heretics/secondfloor index 846736850..b6f49108e 100644 --- a/wolfsburg/guilds/damned_heretics/secondfloor +++ b/wolfsburg/guilds/damned_heretics/secondfloor @@ -4145,6 +4145,12 @@ x 11 y 4 connected 81 end +arch pedestal +x 11 +y 5 +invisible 1 +connected 81 +end arch dungeon_magic x 11 y 5 @@ -6344,20 +6350,6 @@ title Python slaying /python/guilds/guild_dues.py end end -arch teleporter -hp 11 -sp 5 -x 20 -y 13 -connected 80 -end -arch pedestal_trigger -x 20 -y 13 -type 17 -invisible 1 -connected 81 -end arch creator other_arch jadecoin x 20