From 8304fbac58aee893759717e0a44a2432aaa77567 Mon Sep 17 00:00:00 2001 From: silvernexus Date: Sat, 23 Nov 2013 19:41:27 +0000 Subject: [PATCH] Tweaks to most of Kandora's maps, mainly fixing outdated wall endings and exits. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19132 282e977c-c81d-0410-88c4-b93c2d0d6712 --- unlinked/kandora/cave/m_inn | 15 +- unlinked/kandora/circus/mp_church | 12 +- unlinked/kandora/circus/mp_start | 4 +- unlinked/kandora/circus/mp_tavern | 6 +- unlinked/kandora/circus/mp_world | 5 +- unlinked/kandora/dd_alchemy | 6 +- unlinked/kandora/dd_alchemy2 | 997 ++++++++++++++++++--------- unlinked/kandora/dd_alchemy3 | 11 +- unlinked/kandora/dd_chaos | 3 +- unlinked/kandora/dd_church | 8 +- unlinked/kandora/dd_court | 6 +- unlinked/kandora/dd_inn | 10 +- unlinked/kandora/dd_keep | 36 +- unlinked/kandora/dd_shop | 12 +- unlinked/kandora/dd_tavern | 7 +- unlinked/kandora/dm_cellar | 2 + unlinked/kandora/dm_church | 8 +- unlinked/kandora/dm_inn | 10 +- unlinked/kandora/dm_keep | 20 +- unlinked/kandora/dm_shop | 7 +- unlinked/kandora/dm_tavern | 13 +- unlinked/kandora/dm_wizard | 19 +- unlinked/kandora/dun_marksel | 6 +- unlinked/kandora/elcyon/elcyon_start | 10 +- unlinked/kandora/elcyon/g_store | 10 +- unlinked/kandora/elcyon/gnome_hut | 7 +- unlinked/kandora/elcyon/merchant | 8 +- unlinked/kandora/elcyon/palace | 10 +- unlinked/kandora/elcyon/plaza | 10 +- unlinked/kandora/elcyon/witch_house | 195 +++++- unlinked/kandora/ship_dog | 8 +- unlinked/kandora/signal | 6 +- unlinked/kandora/signal2 | 14 +- 33 files changed, 1039 insertions(+), 462 deletions(-) diff --git a/unlinked/kandora/cave/m_inn b/unlinked/kandora/cave/m_inn index 6d8457e20..c6864f5e4 100644 --- a/unlinked/kandora/cave/m_inn +++ b/unlinked/kandora/cave/m_inn @@ -5,7 +5,7 @@ height 14 enter_y 10 msg Created: 1999-02-28 King Zoobus -Modified: 2011-11-05 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch grass @@ -30,12 +30,15 @@ end arch woodfloor2 y 4 end -arch wall_1_2 +arch wall_2_1_1 y 4 end arch flagstone y 5 end +arch wall_2_1_1 +y 5 +end arch flagstone_2_2_2 y 5 end @@ -257,7 +260,7 @@ arch flagstone x 2 y 13 end -arch oakdoor +arch oakdoor_2 slaying mithril hp 10 sp 9 @@ -824,7 +827,7 @@ arch woodfloor2 x 9 y 4 end -arch wall_1_2 +arch wall_2_1_1 x 9 y 4 end @@ -832,6 +835,10 @@ arch flagstone x 9 y 5 end +arch wall_2_1_1 +x 9 +y 5 +end arch flagstone_2_2_3 x 9 y 5 diff --git a/unlinked/kandora/circus/mp_church b/unlinked/kandora/circus/mp_church index 4e79bcec3..d8c68f962 100644 --- a/unlinked/kandora/circus/mp_church +++ b/unlinked/kandora/circus/mp_church @@ -5,7 +5,7 @@ height 16 enter_x 8 msg Created: 1999-02-18 King Zoobus -Modified: 2008-06-06 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch dungeon_floor @@ -552,7 +552,7 @@ arch dungeon_floor x 6 y 2 end -arch cwall_2_1_2 +arch dwall_1_4 x 6 y 2 end @@ -671,7 +671,7 @@ end arch dungeon_floor x 7 end -arch cwall_2_1_2 +arch dwall_1_3 x 7 end arch dungeon_floor @@ -802,7 +802,7 @@ end arch dungeon_floor x 8 end -arch oakdoor +arch oakdoor_2 slaying mp_world hp 26 sp 21 @@ -973,7 +973,7 @@ end arch dungeon_floor x 9 end -arch cwall_2_1_2 +arch dwall_1_4 x 9 end arch dungeon_floor @@ -1103,7 +1103,7 @@ arch dungeon_floor x 10 y 2 end -arch cwall_2_1_2 +arch dwall_1_3 x 10 y 2 end diff --git a/unlinked/kandora/circus/mp_start b/unlinked/kandora/circus/mp_start index 7ee9293ab..3d7cb05c7 100644 --- a/unlinked/kandora/circus/mp_start +++ b/unlinked/kandora/circus/mp_start @@ -4,7 +4,7 @@ width 15 height 13 msg Created: 1999-02-15 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch goldfloor @@ -268,7 +268,7 @@ y 10 carrying 75 arch note msg -it is angaint the law to read other +it is against the law to read other people's mail endmsg end diff --git a/unlinked/kandora/circus/mp_tavern b/unlinked/kandora/circus/mp_tavern index 7d547da53..59e621762 100644 --- a/unlinked/kandora/circus/mp_tavern +++ b/unlinked/kandora/circus/mp_tavern @@ -5,7 +5,7 @@ height 16 enter_x 7 msg Created: 1999-02-15 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch afloor_right @@ -666,7 +666,7 @@ end arch afloor_right x 6 end -arch wall_2_1_2 +arch wall_1_3 x 6 end arch afloor_right @@ -913,7 +913,7 @@ end arch afloor_right x 8 end -arch wall_2_1_2 +arch wall_1_4 x 8 end arch afloor_right diff --git a/unlinked/kandora/circus/mp_world b/unlinked/kandora/circus/mp_world index 238ecc9c7..acfd3e067 100644 --- a/unlinked/kandora/circus/mp_world +++ b/unlinked/kandora/circus/mp_world @@ -6,7 +6,7 @@ enter_x 39 enter_y 39 msg Created: 1999-02-18 King Zoobus -Modified: 2011-11-05 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch desert @@ -4855,6 +4855,7 @@ end arch goblin_head x 24 y 9 +level 1 end arch brush x 24 @@ -5087,6 +5088,7 @@ end arch dragon_steak x 25 y 11 +level 1 end arch grassmedium x 25 @@ -8323,6 +8325,7 @@ end arch tooth x 39 y 22 +level 1 end arch fernsdense x 39 diff --git a/unlinked/kandora/dd_alchemy b/unlinked/kandora/dd_alchemy index 5e16435ba..44b391a9d 100644 --- a/unlinked/kandora/dd_alchemy +++ b/unlinked/kandora/dd_alchemy @@ -6,7 +6,7 @@ enter_x 16 enter_y 8 msg Created: 1999-02-28 King Zoobus -Modified: 2009-10-23 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -213,8 +213,8 @@ y 15 end arch stair_3_down slaying dd_alchemy2 -hp -1 -sp -1 +hp 6 +sp 1 x 1 y 15 end diff --git a/unlinked/kandora/dd_alchemy2 b/unlinked/kandora/dd_alchemy2 index 8a12e25f7..33a7ae845 100644 --- a/unlinked/kandora/dd_alchemy2 +++ b/unlinked/kandora/dd_alchemy2 @@ -1,167 +1,231 @@ arch map name dm_shop -width 11 -height 11 +width 13 +height 13 enter_x 5 msg Created: 1999-02-27 King Zoobus -Modified: 2010-11-05 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end -arch shop_scrolls +arch flagstone end -arch shop_scrolls -y 1 -end -arch shop_scrolls -y 2 -end -arch shop_empty -y 3 -end -arch rose_pink -y 3 -unpaid 1 -end -arch shop_amulets -y 4 -end -arch shop_special -y 5 -end -arch shop_amulets -y 6 -end -arch shop_empty -y 7 -end -arch mushroom_3 -y 7 -unpaid 1 -end -arch shop_gems -y 8 -end -arch shop_gems -y 9 -end -arch shop_gems -y 10 -end -arch shop_scrolls -x 1 -end -arch shop_scrolls -x 1 -y 1 -end -arch shop_scrolls -x 1 -y 2 -end -arch shop_empty -x 1 -y 3 -end -arch shop_amulets -x 1 -y 4 -end -arch shop_amulets -x 1 -y 5 -end -arch shop_amulets -x 1 -y 6 -end -arch shop_empty -x 1 -y 7 -end -arch shop_gems -x 1 -y 8 -end -arch shop_gems -x 1 -y 9 -end -arch shop_gems -x 1 -y 10 -end -arch shop_empty -x 2 -end -arch rose_red -x 2 -unpaid 1 -end -arch shop_empty -x 2 -y 1 -end -arch shop_empty -x 2 -y 2 -end -arch shop_empty -x 2 -y 3 -end -arch shop_empty -x 2 -y 4 -end -arch shop_empty -x 2 -y 5 -end -arch shop_empty -x 2 -y 6 -end -arch shop_empty -x 2 -y 7 -end -arch shop_empty -x 2 -y 8 -end -arch shop_empty -x 2 -y 9 -end -arch shop_empty -x 2 -y 10 -end -arch clover -x 2 -y 10 -unpaid 1 +arch awall_2_2_2 end arch flagstone -x 3 -end -arch awall_2_1_1 -x 3 -end -arch flagstone -x 3 y 1 end arch awall_2_1_1 -x 3 y 1 end arch flagstone -x 3 y 2 end +arch awall_2_1_1 +y 2 +end +arch flagstone +y 3 +end +arch awall_2_1_1 +y 3 +end +arch flagstone +y 4 +end +arch awall_2_1_1 +y 4 +end +arch flagstone +y 5 +end +arch awall_2_1_1 +y 5 +end +arch flagstone +y 6 +end +arch awall_2_1_1 +y 6 +end +arch flagstone +y 7 +end +arch awall_2_1_1 +y 7 +end +arch flagstone +y 8 +end +arch awall_2_1_1 +y 8 +end +arch flagstone +y 9 +end +arch awall_2_1_1 +y 9 +end +arch flagstone +y 10 +end +arch awall_2_1_1 +y 10 +end +arch flagstone +y 11 +end +arch awall_2_1_1 +y 11 +end +arch flagstone +y 12 +end arch awall_2_2_1 +y 12 +end +arch flagstone +x 1 +end +arch awall_2_1_2 +x 1 +end +arch shop_scrolls +x 1 +y 1 +end +arch shop_scrolls +x 1 +y 2 +end +arch shop_scrolls +x 1 +y 3 +end +arch shop_empty +x 1 +y 4 +end +arch rose_pink +x 1 +y 4 +unpaid 1 +end +arch shop_amulets +x 1 +y 5 +end +arch shop_special +x 1 +y 6 +end +arch shop_amulets +x 1 +y 7 +end +arch shop_empty +x 1 +y 8 +end +arch mushroom_3 +x 1 +y 8 +unpaid 1 +end +arch shop_gems +x 1 +y 9 +end +arch shop_gems +x 1 +y 10 +end +arch shop_gems +x 1 +y 11 +end +arch flagstone +x 1 +y 12 +end +arch awall_2_1_2 +x 1 +y 12 +end +arch flagstone +x 2 +end +arch awall_2_1_2 +x 2 +end +arch shop_scrolls +x 2 +y 1 +end +arch shop_scrolls +x 2 +y 2 +end +arch shop_scrolls +x 2 +y 3 +end +arch shop_empty +x 2 +y 4 +end +arch shop_amulets +x 2 +y 5 +end +arch shop_amulets +x 2 +y 6 +end +arch shop_amulets +x 2 +y 7 +end +arch shop_empty +x 2 +y 8 +end +arch shop_gems +x 2 +y 9 +end +arch shop_gems +x 2 +y 10 +end +arch shop_gems +x 2 +y 11 +end +arch flagstone +x 2 +y 12 +end +arch awall_2_1_2 +x 2 +y 12 +end +arch flagstone +x 3 +end +arch awall_2_1_2 +x 3 +end +arch shop_empty +x 3 +y 1 +end +arch rose_red +x 3 +y 1 +unpaid 1 +end +arch shop_empty x 3 y 2 end @@ -169,15 +233,15 @@ arch shop_empty x 3 y 3 end -arch shop_potions +arch shop_empty x 3 y 4 end -arch shop_potions +arch shop_empty x 3 y 5 end -arch shop_potions +arch shop_empty x 3 y 6 end @@ -185,42 +249,69 @@ arch shop_empty x 3 y 7 end -arch shop_minerals +arch shop_empty x 3 y 8 end -arch shop_minerals +arch shop_empty x 3 y 9 end -arch shop_minerals +arch shop_empty x 3 y 10 end +arch shop_empty +x 3 +y 11 +end +arch clover +x 3 +y 11 +unpaid 1 +end arch flagstone -x 4 +x 3 +y 12 +end +arch awall_2_1_2 +x 3 +y 12 end arch flagstone x 4 -y 1 -end -arch menu -x 4 -y 1 -end -arch flagstone -x 4 -y 2 end arch awall_2_1_2 x 4 +end +arch swall_1_1_half +x 4 +end +arch flagstone +x 4 +y 1 +end +arch swall_2_1_1 +x 4 +y 1 +end +arch flagstone +x 4 y 2 end -arch shop_empty +arch swall_2_1_1 +x 4 +y 2 +end +arch flagstone x 4 y 3 end -arch shop_potions +arch swall_2_2_1 +x 4 +y 3 +end +arch shop_empty x 4 y 4 end @@ -232,11 +323,11 @@ arch shop_potions x 4 y 6 end -arch shop_empty +arch shop_potions x 4 y 7 end -arch shop_minerals +arch shop_empty x 4 y 8 end @@ -248,146 +339,189 @@ arch shop_minerals x 4 y 10 end +arch shop_minerals +x 4 +y 11 +end +arch flagstone +x 4 +y 12 +end +arch awall_2_1_2 +x 4 +y 12 +end arch flagstone x 5 end +arch awall_2_1_2 +x 5 +end +arch flagstone +x 5 +y 1 +end +arch flagstone +x 5 +y 2 +end +arch menu +x 5 +y 2 +end +arch flagstone +x 5 +y 3 +end +arch swall_2_1_2 +x 5 +y 3 +end +arch shop_empty +x 5 +y 4 +end +arch shop_potions +x 5 +y 5 +end +arch shop_potions +x 5 +y 6 +end +arch shop_potions +x 5 +y 7 +end +arch shop_empty +x 5 +y 8 +end +arch shop_minerals +x 5 +y 9 +end +arch shop_minerals +x 5 +y 10 +end +arch shop_minerals +x 5 +y 11 +end +arch flagstone +x 5 +y 12 +end +arch awall_2_1_2 +x 5 +y 12 +end +arch flagstone +x 6 +end +arch awall_2_1_2 +x 6 +end +arch flagstone +x 6 +y 1 +end arch stair_up slaying dd_alchemy hp 1 sp 15 -x 5 -end -arch flagstone -x 5 +x 6 y 1 end arch flagstone -x 5 +x 6 y 2 end -arch awall_2_1_2 -x 5 -y 2 +arch flagstone +x 6 +y 3 +end +arch swall_2_1_2 +x 6 +y 3 end arch shop_empty -x 5 -y 3 +x 6 +y 4 end arch shop_mat -x 5 -y 3 -end -arch shop_potions -x 5 +x 6 y 4 end arch shop_potions -x 5 +x 6 y 5 end arch shop_potions -x 5 +x 6 y 6 end -arch shop_empty -x 5 +arch shop_potions +x 6 y 7 end +arch shop_empty +x 6 +y 8 +end arch cauldron -x 5 -y 7 +x 6 +y 8 unpaid 1 end arch shop_minerals -x 5 -y 8 -end -arch shop_minerals -x 5 +x 6 y 9 end arch shop_minerals -x 5 +x 6 y 10 end -arch flagstone +arch shop_minerals x 6 +y 11 end arch flagstone x 6 -y 1 -end -arch shop_mat -x 6 -y 1 -end -arch flagstone -x 6 -y 2 +y 12 end arch awall_2_1_2 x 6 -y 2 -end -arch shop_empty -x 6 -y 3 -end -arch shop_potions -x 6 -y 4 -end -arch shop_potions -x 6 -y 5 -end -arch shop_potions -x 6 -y 6 -end -arch shop_empty -x 6 -y 7 -end -arch shop_minerals -x 6 -y 8 -end -arch shop_minerals -x 6 -y 9 -end -arch shop_minerals -x 6 -y 10 +y 12 end arch flagstone x 7 end -arch awall_2_1_1 +arch awall_2_1_2 x 7 end arch flagstone x 7 y 1 end -arch awall_2_1_1 -x 7 -y 1 -end arch flagstone x 7 y 2 end -arch awall_2_2_4 +arch shop_mat x 7 y 2 end -arch shop_empty +arch flagstone x 7 y 3 end -arch shop_potions +arch swall_2_1_2 +x 7 +y 3 +end +arch shop_empty x 7 y 4 end @@ -399,11 +533,11 @@ arch shop_potions x 7 y 6 end -arch shop_empty +arch shop_potions x 7 y 7 end -arch shop_minerals +arch shop_empty x 7 y 8 end @@ -415,146 +549,379 @@ arch shop_minerals x 7 y 10 end +arch shop_minerals +x 7 +y 11 +end +arch flagstone +x 7 +y 12 +end +arch awall_2_1_2 +x 7 +y 12 +end +arch flagstone +x 8 +end +arch awall_2_1_2 +x 8 +end +arch swall_1_1_half +x 8 +end +arch flagstone +x 8 +y 1 +end +arch swall_2_1_1 +x 8 +y 1 +end +arch flagstone +x 8 +y 2 +end +arch swall_2_1_1 +x 8 +y 2 +end +arch flagstone +x 8 +y 3 +end +arch swall_2_2_4 +x 8 +y 3 +end arch shop_empty x 8 +y 4 +end +arch shop_potions +x 8 +y 5 +end +arch shop_potions +x 8 +y 6 +end +arch shop_potions +x 8 +y 7 +end +arch shop_empty +x 8 +y 8 +end +arch shop_minerals +x 8 +y 9 +end +arch shop_minerals +x 8 +y 10 +end +arch shop_minerals +x 8 +y 11 +end +arch flagstone +x 8 +y 12 +end +arch awall_2_1_2 +x 8 +y 12 +end +arch flagstone +x 9 +end +arch awall_2_1_2 +x 9 +end +arch shop_empty +x 9 +y 1 end arch rose_white -x 8 +x 9 +y 1 unpaid 1 end arch shop_empty -x 8 -y 1 -end -arch shop_empty -x 8 +x 9 y 2 end arch shop_empty -x 8 +x 9 y 3 end arch shop_empty -x 8 +x 9 y 4 end arch shop_empty -x 8 +x 9 y 5 end arch shop_empty -x 8 +x 9 y 6 end arch shop_empty -x 8 +x 9 y 7 end arch shop_empty -x 8 +x 9 y 8 end arch shop_empty -x 8 +x 9 y 9 end arch shop_empty -x 8 +x 9 y 10 end +arch shop_empty +x 9 +y 11 +end arch mandrake_root -x 8 -y 10 +x 9 +y 11 unpaid 1 end -arch shop_alchemy +arch flagstone x 9 +y 12 +end +arch awall_2_1_2 +x 9 +y 12 +end +arch flagstone +x 10 +end +arch awall_2_1_2 +x 10 end arch shop_alchemy -x 9 +x 10 y 1 end arch shop_alchemy -x 9 +x 10 y 2 end arch shop_alchemy -x 9 +x 10 y 3 end -arch shop_ring -x 9 +arch shop_alchemy +x 10 y 4 end arch shop_ring -x 9 +x 10 y 5 end arch shop_ring -x 9 +x 10 y 6 end -arch shop_empty -x 9 -y 7 -end -arch shop_gems -x 9 -y 8 -end -arch shop_gems -x 9 -y 9 -end -arch shop_gems -x 9 -y 10 -end -arch shop_alchemy -x 10 -end -arch shop_alchemy -x 10 -y 1 -end -arch shop_alchemy -x 10 -y 2 -end -arch shop_alchemy -x 10 -y 3 -end arch shop_ring x 10 +y 7 +end +arch shop_empty +x 10 +y 8 +end +arch shop_gems +x 10 +y 9 +end +arch shop_gems +x 10 +y 10 +end +arch shop_gems +x 10 +y 11 +end +arch flagstone +x 10 +y 12 +end +arch awall_2_1_2 +x 10 +y 12 +end +arch flagstone +x 11 +end +arch awall_2_1_2 +x 11 +end +arch shop_alchemy +x 11 +y 1 +end +arch shop_alchemy +x 11 +y 2 +end +arch shop_alchemy +x 11 +y 3 +end +arch shop_alchemy +x 11 y 4 end +arch shop_ring +x 11 +y 5 +end arch shop_special -x 10 -y 5 -end -arch shop_ring -x 10 +x 11 y 6 end -arch shop_empty -x 10 +arch shop_ring +x 11 y 7 end +arch shop_empty +x 11 +y 8 +end arch rose_yellow -x 10 -y 7 +x 11 +y 8 unpaid 1 end arch shop_gems -x 10 -y 8 -end -arch shop_gems -x 10 +x 11 y 9 end arch shop_gems -x 10 +x 11 y 10 end +arch shop_gems +x 11 +y 11 +end +arch flagstone +x 11 +y 12 +end +arch awall_2_1_2 +x 11 +y 12 +end +arch flagstone +x 12 +end +arch awall_2_2_3 +x 12 +end +arch flagstone +x 12 +y 1 +end +arch awall_2_1_1 +x 12 +y 1 +end +arch flagstone +x 12 +y 2 +end +arch awall_2_1_1 +x 12 +y 2 +end +arch flagstone +x 12 +y 3 +end +arch awall_2_1_1 +x 12 +y 3 +end +arch flagstone +x 12 +y 4 +end +arch awall_2_1_1 +x 12 +y 4 +end +arch flagstone +x 12 +y 5 +end +arch awall_2_1_1 +x 12 +y 5 +end +arch flagstone +x 12 +y 6 +end +arch awall_2_1_1 +x 12 +y 6 +end +arch flagstone +x 12 +y 7 +end +arch awall_2_1_1 +x 12 +y 7 +end +arch flagstone +x 12 +y 8 +end +arch awall_2_1_1 +x 12 +y 8 +end +arch flagstone +x 12 +y 9 +end +arch awall_2_1_1 +x 12 +y 9 +end +arch flagstone +x 12 +y 10 +end +arch awall_2_1_1 +x 12 +y 10 +end +arch flagstone +x 12 +y 11 +end +arch awall_2_1_1 +x 12 +y 11 +end +arch flagstone +x 12 +y 12 +end +arch awall_2_2_4 +x 12 +y 12 +end diff --git a/unlinked/kandora/dd_alchemy3 b/unlinked/kandora/dd_alchemy3 index 47ef1a617..94503164f 100644 --- a/unlinked/kandora/dd_alchemy3 +++ b/unlinked/kandora/dd_alchemy3 @@ -7,7 +7,7 @@ height 11 enter_x 5 msg Created: 1999-02-27 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor2 @@ -185,7 +185,7 @@ arch woodfloor2 x 2 y 2 end -arch wall_2_1_1 +arch wall_1_2 x 2 y 2 end @@ -207,7 +207,7 @@ arch woodfloor2 x 2 y 4 end -arch wall_2_1_1 +arch wall_1_1 x 2 y 4 end @@ -497,7 +497,7 @@ arch woodfloor2 x 5 y 6 end -arch wall_2_1_1 +arch wall_1_2 x 5 y 6 end @@ -516,7 +516,7 @@ arch woodfloor2 x 5 y 8 end -arch wall_2_1_1 +arch wall_1_1 x 5 y 8 end @@ -875,6 +875,7 @@ end arch random_mineral end arch liver +level 1 end arch true_lead end diff --git a/unlinked/kandora/dd_chaos b/unlinked/kandora/dd_chaos index e531d8005..2dff2cfc5 100644 --- a/unlinked/kandora/dd_chaos +++ b/unlinked/kandora/dd_chaos @@ -5,6 +5,7 @@ height 6 enter_x 5 msg Created: 1999-02-27 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch permanent_lava @@ -121,7 +122,7 @@ x 3 y 3 end arch magic_portal -slaying /dd_alchemy3 +slaying dd_alchemy3 hp 5 sp 3 x 3 diff --git a/unlinked/kandora/dd_church b/unlinked/kandora/dd_church index 6e3c5bc46..9d8356c77 100644 --- a/unlinked/kandora/dd_church +++ b/unlinked/kandora/dd_church @@ -6,7 +6,7 @@ enter_x 3 enter_y 10 msg Created: 1999-02-03 King Zoobus -Modified: 2008-06-06 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch cobblestones2 @@ -227,7 +227,7 @@ arch cobblestones2 x 2 y 10 end -arch dwall_2_1_2 +arch dwall_1_3 x 2 y 10 end @@ -317,7 +317,7 @@ arch cobblestones2 x 3 y 10 end -arch oakdoor +arch oakdoor_2 slaying denray hp 5 sp 6 @@ -427,7 +427,7 @@ arch cobblestones2 x 4 y 10 end -arch dwall_2_1_2 +arch dwall_1_4 x 4 y 10 end diff --git a/unlinked/kandora/dd_court b/unlinked/kandora/dd_court index 932aa3597..d0b73f7f8 100644 --- a/unlinked/kandora/dd_court +++ b/unlinked/kandora/dd_court @@ -7,7 +7,7 @@ height 14 enter_x 1 msg Created: 1999-02-28 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch marble @@ -471,7 +471,7 @@ arch marble x 3 y 13 end -arch dwall_2_1_2 +arch dwall_1_3 x 3 y 13 end @@ -1233,7 +1233,7 @@ arch marble x 8 y 13 end -arch dwall_2_1_2 +arch dwall_1_4 x 8 y 13 end diff --git a/unlinked/kandora/dd_inn b/unlinked/kandora/dd_inn index 15a96e1c6..3cba346e1 100644 --- a/unlinked/kandora/dd_inn +++ b/unlinked/kandora/dd_inn @@ -4,7 +4,7 @@ width 14 height 6 msg Created: 1999-02-04 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -44,7 +44,7 @@ end arch woodfloor x 1 end -arch wall_2_1_2 +arch wall_1_3 x 1 end arch woodfloor @@ -94,7 +94,7 @@ end arch woodfloor x 2 end -arch oakdoor +arch oakdoor_2 slaying denray hp 8 sp 6 @@ -131,7 +131,7 @@ end arch woodfloor x 3 end -arch wall_2_1_2 +arch wall_1_4 x 3 end arch woodfloor @@ -226,7 +226,7 @@ arch woodfloor x 5 y 2 end -arch wall_2_1_2 +arch wall_1_3 x 5 y 2 end diff --git a/unlinked/kandora/dd_keep b/unlinked/kandora/dd_keep index 94912c841..1b5f7fa1e 100644 --- a/unlinked/kandora/dd_keep +++ b/unlinked/kandora/dd_keep @@ -6,7 +6,7 @@ enter_x 14 enter_y 14 msg Created: 1999-02-28 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch dungeon_magic @@ -443,7 +443,7 @@ arch flagstone x 2 y 13 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 2 y 13 end @@ -455,7 +455,7 @@ arch flagstone x 2 y 15 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 2 y 15 end @@ -502,7 +502,7 @@ arch flagstone x 2 y 19 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 2 y 19 end @@ -813,7 +813,7 @@ arch flagstone x 4 y 13 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 4 y 13 end @@ -833,7 +833,7 @@ arch flagstone x 4 y 16 end -arch flagstone_2_1_1 +arch flagstone_1_2 x 4 y 16 end @@ -849,7 +849,7 @@ arch flagstone x 4 y 18 end -arch flagstone_2_1_1 +arch flagstone_1_1 x 4 y 18 end @@ -1263,7 +1263,7 @@ arch flagstone x 6 y 19 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 6 y 19 end @@ -1425,7 +1425,7 @@ arch flagstone x 7 y 13 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 7 y 13 end @@ -1642,7 +1642,7 @@ arch flagstone x 8 y 19 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 8 y 19 end @@ -1865,7 +1865,7 @@ arch flagstone x 10 y 2 end -arch flagstone_2_1_1 +arch flagstone_1_2 x 10 y 2 end @@ -1884,7 +1884,7 @@ arch flagstone x 10 y 4 end -arch flagstone_2_1_1 +arch flagstone_1_1 x 10 y 4 end @@ -1924,7 +1924,7 @@ arch flagstone x 10 y 9 end -arch flagstone_2_1_1 +arch flagstone_1_2 x 10 y 9 end @@ -1941,7 +1941,7 @@ arch flagstone x 10 y 11 end -arch flagstone_2_1_1 +arch flagstone_1_1 x 10 y 11 end @@ -2146,7 +2146,7 @@ arch flagstone x 11 y 15 end -arch flagstone_2_1_1 +arch flagstone_1_1 x 11 y 15 end @@ -2634,7 +2634,7 @@ arch flagstone x 13 y 21 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 13 y 21 end @@ -2909,7 +2909,7 @@ arch flagstone x 14 y 21 end -arch oakdoor +arch oakdoor_2 slaying denray hp 2 sp 8 @@ -3153,7 +3153,7 @@ arch flagstone x 15 y 21 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 15 y 21 end diff --git a/unlinked/kandora/dd_shop b/unlinked/kandora/dd_shop index 8b86b83b6..d82725976 100644 --- a/unlinked/kandora/dd_shop +++ b/unlinked/kandora/dd_shop @@ -7,7 +7,7 @@ height 11 enter_x 5 msg Created: 1999-02-27 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -284,7 +284,7 @@ end arch woodfloor x 4 end -arch wall_2_1_2 +arch wall_1_3 x 4 end arch woodfloor @@ -346,7 +346,7 @@ end arch woodfloor x 5 end -arch oakdoor +arch oakdoor_2 slaying denray hp 4 sp 14 @@ -448,7 +448,7 @@ arch woodfloor x 5 y 7 end -arch wall_2_1_1 +arch wall_1_2 x 5 y 7 end @@ -460,7 +460,7 @@ arch woodfloor x 5 y 9 end -arch wall_2_1_1 +arch wall_1_1 x 5 y 9 end @@ -475,7 +475,7 @@ end arch woodfloor x 6 end -arch wall_2_1_2 +arch wall_1_4 x 6 end arch woodfloor diff --git a/unlinked/kandora/dd_tavern b/unlinked/kandora/dd_tavern index b750e19b7..2a74d62b4 100644 --- a/unlinked/kandora/dd_tavern +++ b/unlinked/kandora/dd_tavern @@ -6,6 +6,7 @@ enter_x 3 enter_y 10 msg Created: 1999-02-03 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch flagstone @@ -245,7 +246,7 @@ arch flagstone x 2 y 10 end -arch wwall_2_1_2 +arch wwall_1_3 x 2 y 10 end @@ -299,7 +300,7 @@ arch cobblestones2 x 3 y 10 end -arch oakdoor +arch oakdoor_2 slaying denray hp 9 sp 4 @@ -405,7 +406,7 @@ arch flagstone x 4 y 10 end -arch wwall_2_1_2 +arch wwall_1_4 x 4 y 10 end diff --git a/unlinked/kandora/dm_cellar b/unlinked/kandora/dm_cellar index 052e7767d..157a7ca38 100644 --- a/unlinked/kandora/dm_cellar +++ b/unlinked/kandora/dm_cellar @@ -4,6 +4,7 @@ width 8 height 10 msg Created: 1999-02-28 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch dungeon_floor @@ -206,6 +207,7 @@ end arch liver x 2 y 8 +level 1 end arch dungeon_floor x 2 diff --git a/unlinked/kandora/dm_church b/unlinked/kandora/dm_church index 05264ba9d..232a3969f 100644 --- a/unlinked/kandora/dm_church +++ b/unlinked/kandora/dm_church @@ -6,7 +6,7 @@ enter_x 3 enter_y 10 msg Created: 1999-02-03 King Zoobus -Modified: 2008-06-06 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch cobblestones2 @@ -211,7 +211,7 @@ arch cobblestones2 x 2 y 10 end -arch dwall_2_1_2 +arch dwall_1_3 x 2 y 10 end @@ -349,7 +349,7 @@ arch cobblestones2 x 3 y 10 end -arch oakdoor +arch oakdoor_2 slaying dun_marksel hp 13 sp 12 @@ -449,7 +449,7 @@ arch cobblestones2 x 4 y 10 end -arch dwall_2_1_2 +arch dwall_1_4 x 4 y 10 end diff --git a/unlinked/kandora/dm_inn b/unlinked/kandora/dm_inn index fecd12624..eccdb53dd 100644 --- a/unlinked/kandora/dm_inn +++ b/unlinked/kandora/dm_inn @@ -4,7 +4,7 @@ width 14 height 6 msg Created: 1999-02-04 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -44,7 +44,7 @@ end arch woodfloor x 1 end -arch wall_2_1_2 +arch wall_1_3 x 1 end arch woodfloor @@ -82,7 +82,7 @@ end arch woodfloor x 2 end -arch oakdoor +arch oakdoor_2 slaying dun_marksel hp 7 sp 12 @@ -130,7 +130,7 @@ end arch woodfloor x 3 end -arch wall_2_1_2 +arch wall_1_4 x 3 end arch woodfloor @@ -221,7 +221,7 @@ arch woodfloor x 5 y 2 end -arch wall_2_1_2 +arch wall_1_3 x 5 y 2 end diff --git a/unlinked/kandora/dm_keep b/unlinked/kandora/dm_keep index 333fbec7a..c0171c382 100644 --- a/unlinked/kandora/dm_keep +++ b/unlinked/kandora/dm_keep @@ -6,7 +6,7 @@ enter_x 7 enter_y 14 msg Created: 1999-02-28 King Zoobus -Modified: 2009-10-23 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch flagstone @@ -127,7 +127,7 @@ arch flagstone x 1 y 6 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 1 y 6 end @@ -304,7 +304,7 @@ arch flagstone x 3 y 6 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 3 y 6 end @@ -586,7 +586,7 @@ arch flagstone x 6 y 4 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 6 y 4 end @@ -634,7 +634,7 @@ arch flagstone x 6 y 14 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 6 y 14 end @@ -761,7 +761,7 @@ arch flagstone x 7 y 14 end -arch oakdoor +arch oakdoor_2 slaying dun_marksel hp 12 sp 14 @@ -814,7 +814,7 @@ arch flagstone x 8 y 4 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 8 y 4 end @@ -868,7 +868,7 @@ arch flagstone x 8 y 14 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 8 y 14 end @@ -1109,7 +1109,7 @@ arch flagstone x 11 y 6 end -arch flagstone_2_1_2 +arch flagstone_1_3 x 11 y 6 end @@ -1316,7 +1316,7 @@ arch flagstone x 13 y 6 end -arch flagstone_2_1_2 +arch flagstone_1_4 x 13 y 6 end diff --git a/unlinked/kandora/dm_shop b/unlinked/kandora/dm_shop index 29b52e6ad..7867633ce 100644 --- a/unlinked/kandora/dm_shop +++ b/unlinked/kandora/dm_shop @@ -8,6 +8,7 @@ enter_x 1 enter_y 1 msg Created: 1999-02-27 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -148,7 +149,7 @@ end arch woodfloor x 2 end -arch wall_2_1_2 +arch wall_1_3 x 2 end arch woodfloor @@ -202,7 +203,7 @@ end arch woodfloor x 3 end -arch oakdoor +arch oakdoor_2 slaying dun_marksel hp 8 sp 9 @@ -259,7 +260,7 @@ end arch woodfloor x 4 end -arch wall_2_1_2 +arch wall_1_4 x 4 end arch woodfloor diff --git a/unlinked/kandora/dm_tavern b/unlinked/kandora/dm_tavern index e2e8572ae..f7f0f0a14 100644 --- a/unlinked/kandora/dm_tavern +++ b/unlinked/kandora/dm_tavern @@ -8,6 +8,7 @@ enter_x 1 enter_y 7 msg Created: 1999-02-01 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch cobblestones @@ -47,13 +48,13 @@ end arch cobblestones y 6 end -arch wall_2_1_1 +arch wall_1_2 y 6 end arch cobblestones y 7 end -arch oakdoor +arch oakdoor_1 slaying dun_marksel hp 20 sp 7 @@ -62,7 +63,7 @@ end arch cobblestones y 8 end -arch wall_2_1_1 +arch wall_1_1 y 8 end arch cobblestones @@ -1154,7 +1155,7 @@ arch cobblestones x 13 y 2 end -arch wall_2_1_1 +arch wall_1_1 x 13 y 2 end @@ -1218,7 +1219,7 @@ arch cobblestones x 13 y 10 end -arch wall_2_1_1 +arch wall_1_2 x 13 y 10 end @@ -1234,7 +1235,7 @@ arch cobblestones x 13 y 12 end -arch wall_2_1_1 +arch wall_1_1 x 13 y 12 end diff --git a/unlinked/kandora/dm_wizard b/unlinked/kandora/dm_wizard index d3616932e..65a2eb018 100644 --- a/unlinked/kandora/dm_wizard +++ b/unlinked/kandora/dm_wizard @@ -6,7 +6,7 @@ enter_x 13 enter_y 7 msg Created: 1999-02-03 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch cobblestones2 @@ -34,6 +34,9 @@ end arch cobblestones2 y 4 end +arch wall_3_2 +y 4 +end arch awall_2_1_1 y 4 end @@ -582,6 +585,10 @@ arch cobblestones2 x 5 y 13 end +arch wall_3_1 +x 5 +y 13 +end arch awall_2_1_2 x 5 y 13 @@ -1079,7 +1086,7 @@ arch cobblestones2 x 10 y 5 end -arch wall_2_1_1 +arch wall_1_2 x 10 y 5 end @@ -1111,7 +1118,7 @@ arch cobblestones2 x 10 y 9 end -arch wall_2_1_1 +arch wall_1_1 x 10 y 9 end @@ -1470,7 +1477,7 @@ arch cobblestones2 x 13 y 6 end -arch awall_2_1_1 +arch awall_1_2 x 13 y 6 end @@ -1478,7 +1485,7 @@ arch cobblestones2 x 13 y 7 end -arch oakdoor +arch oakdoor_1 slaying dun_marksel hp 2 sp 9 @@ -1489,7 +1496,7 @@ arch cobblestones2 x 13 y 8 end -arch awall_2_1_1 +arch awall_1_1 x 13 y 8 end diff --git a/unlinked/kandora/dun_marksel b/unlinked/kandora/dun_marksel index c89e993c0..88ece5639 100644 --- a/unlinked/kandora/dun_marksel +++ b/unlinked/kandora/dun_marksel @@ -7,7 +7,7 @@ height 16 enter_x 15 msg Created: 1999-02-27 King Zoobus -Modified: 2009-10-23 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch brush @@ -1202,8 +1202,8 @@ y 13 end arch keep slaying dm_keep -hp -1 -sp -1 +hp 7 +sp 13 x 12 y 13 end diff --git a/unlinked/kandora/elcyon/elcyon_start b/unlinked/kandora/elcyon/elcyon_start index a66eb155f..a9016c398 100644 --- a/unlinked/kandora/elcyon/elcyon_start +++ b/unlinked/kandora/elcyon/elcyon_start @@ -5,7 +5,7 @@ height 16 enter_x 15 msg Created: 1999-02-03 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch grass @@ -502,7 +502,7 @@ arch grass x 4 y 8 end -arch hedge_2_1_2 +arch hedge_1_3 x 4 y 8 end @@ -518,7 +518,7 @@ arch grass x 4 y 11 end -arch hedge_2_1_2 +arch hedge_1_3 x 4 y 11 end @@ -530,7 +530,7 @@ arch grass x 4 y 13 end -arch hedge_2_1_1 +arch hedge_1_1 x 4 y 13 end @@ -593,7 +593,7 @@ arch grass x 5 y 6 end -arch hedge_2_1_1 +arch hedge_1_2 x 5 y 6 end diff --git a/unlinked/kandora/elcyon/g_store b/unlinked/kandora/elcyon/g_store index 38cf50ef5..1c951e58e 100644 --- a/unlinked/kandora/elcyon/g_store +++ b/unlinked/kandora/elcyon/g_store @@ -5,7 +5,7 @@ height 15 enter_x 15 msg Created: 1999-02-03 King Zoobus -Modified: 2010-11-05 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch shop_empty @@ -217,7 +217,7 @@ arch cobblestones x 2 y 9 end -arch wall_2_1_2 +arch window_win2 x 2 y 9 end @@ -241,7 +241,7 @@ arch cobblestones x 2 y 14 end -arch oakdoor +arch oakdoor_2 slaying seacity_west hp 12 sp 7 @@ -603,7 +603,7 @@ arch cobblestones x 7 y 11 end -arch wall_2_1_2 +arch window_win2 x 7 y 11 end @@ -989,7 +989,7 @@ arch cobblestones x 12 y 9 end -arch wall_2_1_2 +arch window_win2 x 12 y 9 end diff --git a/unlinked/kandora/elcyon/gnome_hut b/unlinked/kandora/elcyon/gnome_hut index d974f6cef..b7d88a21f 100644 --- a/unlinked/kandora/elcyon/gnome_hut +++ b/unlinked/kandora/elcyon/gnome_hut @@ -5,6 +5,7 @@ height 9 enter_x 15 msg Created: 1999-02-03 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch earth @@ -213,7 +214,7 @@ arch earth x 3 y 8 end -arch wall_2_1_2 +arch wall_1_3 x 3 y 8 end @@ -243,7 +244,7 @@ arch earth x 4 y 5 end -arch wall_2_1_2 +arch window_win2 x 4 y 5 end @@ -320,7 +321,7 @@ arch earth x 5 y 8 end -arch wall_2_1_2 +arch wall_1_4 x 5 y 8 end diff --git a/unlinked/kandora/elcyon/merchant b/unlinked/kandora/elcyon/merchant index 37d16ca0d..8641009da 100644 --- a/unlinked/kandora/elcyon/merchant +++ b/unlinked/kandora/elcyon/merchant @@ -5,7 +5,7 @@ height 11 enter_x 15 msg Created: 1999-02-03 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -443,7 +443,7 @@ arch woodfloor x 5 y 1 end -arch wall_2_1_1 +arch wall_1_2 x 5 y 1 end @@ -461,7 +461,7 @@ arch woodfloor x 5 y 3 end -arch wall_2_1_1 +arch wall_1_1 x 5 y 3 end @@ -505,7 +505,7 @@ arch woodfloor x 5 y 10 end -arch oakdoor +arch oakdoor_2 slaying seacity hp 2 sp 8 diff --git a/unlinked/kandora/elcyon/palace b/unlinked/kandora/elcyon/palace index 8469f65c0..705ea4049 100644 --- a/unlinked/kandora/elcyon/palace +++ b/unlinked/kandora/elcyon/palace @@ -5,7 +5,7 @@ height 21 enter_y 10 msg Created: 1999-02-03 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch marble @@ -1441,7 +1441,7 @@ arch marble x 13 y 6 end -arch dwall_2_1_2 +arch dwall_1_3 x 13 y 6 end @@ -1477,7 +1477,7 @@ arch marble x 13 y 14 end -arch dwall_2_1_2 +arch dwall_1_3 x 13 y 14 end @@ -1653,7 +1653,7 @@ arch marble x 15 y 6 end -arch dwall_2_1_2 +arch dwall_1_4 x 15 y 6 end @@ -1689,7 +1689,7 @@ arch marble x 15 y 14 end -arch dwall_2_1_2 +arch dwall_1_4 x 15 y 14 end diff --git a/unlinked/kandora/elcyon/plaza b/unlinked/kandora/elcyon/plaza index 341c03102..5d724f463 100644 --- a/unlinked/kandora/elcyon/plaza +++ b/unlinked/kandora/elcyon/plaza @@ -4,7 +4,7 @@ width 14 height 6 msg Created: 1999-02-04 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -44,7 +44,7 @@ end arch woodfloor x 1 end -arch wall_2_1_2 +arch wall_1_3 x 1 end arch woodfloor @@ -94,7 +94,7 @@ end arch woodfloor x 2 end -arch oakdoor +arch oakdoor_2 slaying seacity hp 11 sp 10 @@ -131,7 +131,7 @@ end arch woodfloor x 3 end -arch wall_2_1_2 +arch wall_1_4 x 3 end arch woodfloor @@ -231,7 +231,7 @@ arch woodfloor x 5 y 2 end -arch wall_2_1_2 +arch wall_1_3 x 5 y 2 end diff --git a/unlinked/kandora/elcyon/witch_house b/unlinked/kandora/elcyon/witch_house index 4b014848c..0858ed6da 100644 --- a/unlinked/kandora/elcyon/witch_house +++ b/unlinked/kandora/elcyon/witch_house @@ -5,49 +5,94 @@ height 14 enter_x 15 msg Created: 1999-02-03 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end +arch earth +end arch wwall_2_2_2 end +arch earth +y 1 +end arch wwall_2_1_1 y 1 end +arch earth +y 2 +end arch wwall_2_1_1 y 2 end +arch earth +y 3 +end arch wwall_3_2 y 3 end +arch earth +y 4 +end arch wwall_2_1_1 y 4 end +arch earth +y 5 +end arch wwall_2_1_1 y 5 end +arch earth +y 6 +end arch wwall_2_1_1 y 6 end +arch earth +y 7 +end arch wwall_2_1_1 y 7 end +arch earth +y 8 +end arch wwall_2_1_1 y 8 end +arch earth +y 9 +end arch wwall_2_1_1 y 9 end +arch earth +y 10 +end arch wwall_win1 y 10 end +arch earth +y 11 +end arch wwall_2_1_1 y 11 end +arch earth +y 12 +end arch wwall_2_1_1 y 12 end +arch earth +y 13 +end arch wwall_2_2_1 y 13 end +arch earth +x 1 +end arch wwall_2_1_2 x 1 end @@ -67,6 +112,10 @@ arch earth x 1 y 2 end +arch earth +x 1 +y 3 +end arch wwall_2_1_2 x 1 y 3 @@ -107,10 +156,17 @@ arch shop_wands x 1 y 12 end +arch earth +x 1 +y 13 +end arch wwall_2_1_2 x 1 y 13 end +arch earth +x 2 +end arch wwall_win2 x 2 end @@ -122,6 +178,10 @@ arch earth x 2 y 2 end +arch earth +x 2 +y 3 +end arch wwall_2_1_2 x 2 y 3 @@ -162,11 +222,18 @@ arch shop_wands x 2 y 12 end +arch earth +x 2 +y 13 +end arch wwall_win2 x 2 y 13 end -arch wwall_2_1_2 +arch earth +x 3 +end +arch wwall_1_3 x 3 end arch earth @@ -185,6 +252,10 @@ arch shop_mat x 3 y 2 end +arch earth +x 3 +y 3 +end arch wwall_2_1_2 x 3 y 3 @@ -225,11 +296,18 @@ arch shop_wands x 3 y 12 end +arch earth +x 3 +y 13 +end arch wwall_2_1_2 x 3 y 13 end -arch oakdoor +arch earth +x 4 +end +arch oakdoor_2 slaying elcyon_start hp 11 sp 14 @@ -251,6 +329,10 @@ arch earth x 4 y 2 end +arch earth +x 4 +y 3 +end arch wwall_2_1_2 x 4 y 3 @@ -295,11 +377,18 @@ arch shop_empty x 4 y 12 end -arch wwall_2_1_2 +arch earth x 4 y 13 end arch wwall_2_1_2 +x 4 +y 13 +end +arch earth +x 5 +end +arch wwall_1_4 x 5 end arch earth @@ -310,6 +399,10 @@ arch earth x 5 y 2 end +arch earth +x 5 +y 3 +end arch wwall_2_1_2 x 5 y 3 @@ -354,10 +447,17 @@ arch shop_ring x 5 y 12 end +arch earth +x 5 +y 13 +end arch wwall_2_1_2 x 5 y 13 end +arch earth +x 6 +end arch wwall_win2 x 6 end @@ -369,6 +469,10 @@ arch earth x 6 y 2 end +arch earth +x 6 +y 3 +end arch wwall_2_1_2 x 6 y 3 @@ -413,10 +517,17 @@ arch shop_ring x 6 y 12 end +arch earth +x 6 +y 13 +end arch wwall_2_1_2 x 6 y 13 end +arch earth +x 7 +end arch wwall_2_1_2 x 7 end @@ -436,6 +547,10 @@ arch rock x 7 y 2 end +arch earth +x 7 +y 3 +end arch wwall_2_1_2 x 7 y 3 @@ -480,10 +595,17 @@ arch shop_ring x 7 y 12 end +arch earth +x 7 +y 13 +end arch wwall_win2 x 7 y 13 end +arch earth +x 8 +end arch wwall_2_1_2 x 8 end @@ -506,6 +628,10 @@ arch earth x 8 y 2 end +arch earth +x 8 +y 3 +end arch wwall_2_1_2 x 8 y 3 @@ -550,61 +676,120 @@ arch shop_ring x 8 y 12 end +arch earth +x 8 +y 13 +end arch wwall_2_1_2 x 8 y 13 end +arch earth +x 9 +end arch wwall_2_2_3 x 9 end -arch wwall_2_1_1 +arch earth x 9 y 1 end arch wwall_2_1_1 x 9 +y 1 +end +arch earth +x 9 y 2 end +arch wwall_2_1_1 +x 9 +y 2 +end +arch earth +x 9 +y 3 +end arch wwall_3_4 x 9 y 3 end +arch earth +x 9 +y 4 +end arch wwall_2_1_1 x 9 y 4 end +arch earth +x 9 +y 5 +end arch wwall_win1 x 9 y 5 end -arch wwall_2_1_1 +arch earth x 9 y 6 end arch wwall_2_1_1 x 9 +y 6 +end +arch earth +x 9 y 7 end arch wwall_2_1_1 x 9 +y 7 +end +arch earth +x 9 y 8 end arch wwall_2_1_1 x 9 +y 8 +end +arch earth +x 9 y 9 end arch wwall_2_1_1 x 9 +y 9 +end +arch earth +x 9 y 10 end arch wwall_2_1_1 x 9 +y 10 +end +arch earth +x 9 y 11 end arch wwall_2_1_1 x 9 +y 11 +end +arch earth +x 9 +y 12 +end +arch wwall_2_1_1 +x 9 y 12 end +arch earth +x 9 +y 13 +end arch wwall_2_2_4 x 9 y 13 diff --git a/unlinked/kandora/ship_dog b/unlinked/kandora/ship_dog index c9bf39cd7..8154acc7e 100644 --- a/unlinked/kandora/ship_dog +++ b/unlinked/kandora/ship_dog @@ -8,6 +8,7 @@ enter_x 1 enter_y 1 msg Created: 1999-02-27 King Zoobus +Modified: 2013-11-23 SilverNexus endmsg end arch woodfloor @@ -35,15 +36,14 @@ end arch woodfloor y 4 end -arch awall_2_1_1 +arch awall_1_2 y 4 end arch woodfloor y 5 end -arch oakdoor +arch oakdoor_1 name broken door -name_pl broken door slaying ship_city hp 12 sp 7 @@ -52,7 +52,7 @@ end arch woodfloor y 6 end -arch awall_2_1_1 +arch awall_1_1 y 6 end arch woodfloor diff --git a/unlinked/kandora/signal b/unlinked/kandora/signal index 5fd014dcc..b0016392d 100644 --- a/unlinked/kandora/signal +++ b/unlinked/kandora/signal @@ -5,7 +5,7 @@ height 14 enter_x 1 msg Created: 1999-02-28 King Zoobus -Modified: 2009-10-23 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch cobblestones2 @@ -492,7 +492,7 @@ arch cobblestones2 x 5 y 1 end -arch dwall_2_1_2 +arch dwall_1_3 x 5 y 1 end @@ -685,7 +685,7 @@ arch cobblestones2 x 7 y 1 end -arch dwall_2_1_2 +arch dwall_1_4 x 7 y 1 end diff --git a/unlinked/kandora/signal2 b/unlinked/kandora/signal2 index 02aa247e4..9ac8bd2ef 100644 --- a/unlinked/kandora/signal2 +++ b/unlinked/kandora/signal2 @@ -8,7 +8,7 @@ enter_x 6 enter_y 6 msg Created: 1999-02-28 King Zoobus -Modified: 2009-10-23 Andreas Kirschbaum +Modified: 2013-11-23 SilverNexus endmsg end arch afloor_right @@ -197,7 +197,7 @@ arch afloor_right x 2 y 4 end -arch wall_2_1_2 +arch wall_1_4 x 2 y 4 end @@ -209,7 +209,7 @@ arch afloor_right x 2 y 6 end -arch wall_2_1_2 +arch wall_1_4 x 2 y 6 end @@ -435,7 +435,7 @@ arch afloor_right x 4 y 9 end -arch wall_2_1_1 +arch wall_1_2 x 4 y 9 end @@ -571,7 +571,7 @@ arch afloor_right x 6 y 2 end -arch wall_2_1_1 +arch wall_1_1 x 6 y 2 end @@ -687,7 +687,7 @@ arch afloor_left x 7 y 5 end -arch wall_2_1_1 +arch wall_1_2 x 7 y 5 end @@ -719,7 +719,7 @@ arch afloor_left x 7 y 9 end -arch wall_2_1_1 +arch wall_1_1 x 7 y 9 end