From 72e747ff567bf138548e0d2f3770a573e019d2aa Mon Sep 17 00:00:00 2001
From: mikeeusa <mikeeusa@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 16 Dec 2005 19:01:59 +0000
Subject: [PATCH] Adding navarish capitalhold to navar

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4147 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 world/world_121_116 | 1690 ++++++++++++++++++++++++++++++++++---------
 world/world_122_116 |  217 +++---
 2 files changed, 1496 insertions(+), 411 deletions(-)

diff --git a/world/world_121_116 b/world/world_121_116
index ef0a6ea8c..f0c75bb68 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -8959,69 +8959,154 @@ arch cobblestones
 x 35
 y 25
 end
-arch woods_2
+arch dungeon_magic
 x 35
 y 26
-elevation 1658
 end
-arch woods_2
+arch grass
+x 35
+y 26
+end
+arch westcwall_2_2_2
+x 35
+y 26
+end
+arch dungeon_magic
 x 35
 y 27
-elevation 2397
 end
-arch woods_2
+arch grass
+x 35
+y 27
+end
+arch westcwall_2_1_1
+x 35
+y 27
+end
+arch dungeon_magic
 x 35
 y 28
-elevation 2967
 end
-arch hills_rocky
+arch grass
+x 35
+y 28
+end
+arch westcwall_2_1_1
+x 35
+y 28
+end
+arch dungeon_magic
 x 35
 y 29
-elevation 3379
 end
-arch hills_rocky
+arch grass
+x 35
+y 29
+end
+arch westcwall_2_1_1
+x 35
+y 29
+end
+arch dungeon_magic
 x 35
 y 30
-elevation 3484
 end
-arch hills_rocky
+arch grass
+x 35
+y 30
+end
+arch westcwall_2_1_1
+x 35
+y 30
+end
+arch dungeon_magic
 x 35
 y 31
-elevation 3186
 end
-arch woods_2
+arch grass
+x 35
+y 31
+end
+arch westcwall_2_1_1
+x 35
+y 31
+end
+arch dungeon_magic
 x 35
 y 32
-elevation 2223
 end
-arch brush
+arch grass
+x 35
+y 32
+end
+arch westcwall_2_1_1
+x 35
+y 32
+end
+arch dungeon_magic
 x 35
 y 33
-elevation 546
 end
-arch brush
+arch grass
+x 35
+y 33
+end
+arch westcwall_2_1_1
+x 35
+y 33
+end
+arch dungeon_magic
 x 35
 y 34
-elevation 579
 end
-arch evergreens
+arch grass
+x 35
+y 34
+end
+arch westcwall_2_1_1
+x 35
+y 34
+end
+arch dungeon_magic
 x 35
 y 35
-elevation 2238
 end
-arch hills_rocky
+arch grass
+x 35
+y 35
+end
+arch westcwall_2_1_1
+x 35
+y 35
+end
+arch dungeon_magic
 x 35
 y 36
-elevation 3755
+end
+arch grass
+x 35
+y 36
+end
+arch westcwall_2_1_1
+x 35
+y 36
+end
+arch dungeon_magic
+x 35
+y 37
 end
 arch grass
 x 35
 y 37
 end
-arch westcwall_2_2_2
+arch westcwall_3_2
 x 35
 y 37
 end
+arch dungeon_magic
+x 35
+y 38
+end
 arch grass
 x 35
 y 38
@@ -9248,66 +9333,147 @@ x 36
 y 25
 elevation 2670
 end
-arch woods_2
+arch dungeon_magic
 x 36
 y 26
-elevation 2828
 end
-arch hills_rocky
+arch grass
+x 36
+y 26
+end
+arch westcwall_2_1_2
+x 36
+y 26
+end
+arch dungeon_magic
 x 36
 y 27
-elevation 3041
 end
-arch hills_rocky
+arch grass
+x 36
+y 27
+end
+arch shallow_sea
+x 36
+y 27
+end
+arch dungeon_magic
 x 36
 y 28
-elevation 3226
 end
-arch hills_rocky
+arch grass
+x 36
+y 28
+end
+arch shallow_sea
+x 36
+y 28
+end
+arch dungeon_magic
 x 36
 y 29
-elevation 3185
 end
-arch hills_rocky
+arch grass
+x 36
+y 29
+end
+arch shallow_sea
+x 36
+y 29
+end
+arch dungeon_magic
 x 36
 y 30
-elevation 3536
 end
-arch hills_rocky
+arch grass
+x 36
+y 30
+end
+arch shallow_sea
+x 36
+y 30
+end
+arch dungeon_magic
 x 36
 y 31
-elevation 3272
 end
-arch hills
+arch grass
+x 36
+y 31
+end
+arch shallow_sea
+x 36
+y 31
+end
+arch dungeon_magic
 x 36
 y 32
-elevation 2190
 end
-arch desert
+arch grass
+x 36
+y 32
+end
+arch shallow_sea
+x 36
+y 32
+end
+arch dungeon_magic
 x 36
 y 33
-elevation 46
 end
-arch brush
+arch grass
+x 36
+y 33
+end
+arch shallow_sea
+x 36
+y 33
+end
+arch dungeon_magic
 x 36
 y 34
-elevation 498
 end
-arch woods_2
+arch grass
+x 36
+y 34
+end
+arch shallow_sea
+x 36
+y 34
+end
+arch dungeon_magic
 x 36
 y 35
-elevation 2444
 end
-arch hills_rocky
+arch grass
+x 36
+y 35
+end
+arch shallow_sea
+x 36
+y 35
+end
+arch dungeon_magic
 x 36
 y 36
-elevation 3986
+end
+arch grass
+x 36
+y 36
+end
+arch shallow_sea
+x 36
+y 36
+end
+arch dungeon_magic
+x 36
+y 37
 end
 arch grass
 x 36
 y 37
 end
-arch westcwall_2_1_2
+arch westcityport_a
 x 36
 y 37
 end
@@ -9563,66 +9729,147 @@ x 37
 y 25
 elevation 2415
 end
-arch woods_2
+arch dungeon_magic
 x 37
 y 26
-elevation 2822
 end
-arch hills_rocky
+arch grass
+x 37
+y 26
+end
+arch westcwall_2_1_2
+x 37
+y 26
+end
+arch dungeon_magic
 x 37
 y 27
-elevation 3182
 end
-arch hills_rocky
+arch grass
+x 37
+y 27
+end
+arch shallow_sea
+x 37
+y 27
+end
+arch dungeon_magic
 x 37
 y 28
-elevation 3157
 end
-arch hills_rocky
+arch grass
+x 37
+y 28
+end
+arch westcwall_2_2_2
+x 37
+y 28
+end
+arch dungeon_magic
 x 37
 y 29
-elevation 3036
 end
-arch steppe
+arch grass
+x 37
+y 29
+end
+arch westcwall_2_1_1
+x 37
+y 29
+end
+arch dungeon_magic
 x 37
 y 30
-elevation 3270
 end
-arch steppe
+arch grass
+x 37
+y 30
+end
+arch westcwall_2_1_1
+x 37
+y 30
+end
+arch dungeon_magic
 x 37
 y 31
-elevation 3090
 end
-arch hills
+arch grass
+x 37
+y 31
+end
+arch westcwall_2_1_1
+x 37
+y 31
+end
+arch dungeon_magic
 x 37
 y 32
-elevation 2186
+end
+arch grass
+x 37
+y 32
+end
+arch westcwall_2_1_1
+x 37
+y 32
+end
+arch dungeon_magic
+x 37
+y 33
 end
 arch grass
 x 37
 y 33
-elevation 876
 end
-arch brush
+arch westcwall_2_1_1
+x 37
+y 33
+end
+arch dungeon_magic
 x 37
 y 34
-elevation 973
 end
-arch woods_2
+arch grass
+x 37
+y 34
+end
+arch westcwall_2_1_1
+x 37
+y 34
+end
+arch dungeon_magic
 x 37
 y 35
-elevation 2851
 end
-arch hills_rocky
+arch grass
+x 37
+y 35
+end
+arch westcwall_2_1_1
+x 37
+y 35
+end
+arch dungeon_magic
 x 37
 y 36
-elevation 4115
+end
+arch grass
+x 37
+y 36
+end
+arch westcwall_2_1_1
+x 37
+y 36
+end
+arch dungeon_magic
+x 37
+y 37
 end
 arch grass
 x 37
 y 37
 end
-arch westcwall_2_1_2
+arch westcwall_3_1
 x 37
 y 37
 end
@@ -9874,60 +10121,121 @@ x 38
 y 25
 elevation 664
 end
-arch woods_2
+arch dungeon_magic
 x 38
 y 26
-elevation 2163
 end
-arch woods_2
+arch grass
+x 38
+y 26
+end
+arch westcwall_2_1_2
+x 38
+y 26
+end
+arch dungeon_magic
 x 38
 y 27
-elevation 2729
 end
-arch woods_2
+arch grass
+x 38
+y 27
+end
+arch shallow_sea
+x 38
+y 27
+end
+arch dungeon_magic
 x 38
 y 28
-elevation 2572
 end
-arch woods_2
+arch grass
+x 38
+y 28
+end
+arch westcwall_2_1_2
+x 38
+y 28
+end
+arch city_tower_west
+x 38
+y 28
+end
+arch dungeon_magic
 x 38
 y 29
-elevation 2525
 end
-arch hills
+arch grass
+x 38
+y 29
+end
+arch dungeon_magic
 x 38
 y 30
-elevation 2617
 end
-arch woods_2
+arch grass
+x 38
+y 30
+end
+arch ytree_2
+x 38
+y 30
+end
+arch dungeon_magic
 x 38
 y 31
-elevation 2602
 end
-arch woods_2
+arch grass
+x 38
+y 31
+end
+arch dungeon_magic
 x 38
 y 32
-elevation 2296
 end
-arch woods_2
+arch grass
+x 38
+y 32
+end
+arch dungeon_magic
 x 38
 y 33
-elevation 1415
 end
-arch hills
+arch grass
+x 38
+y 33
+end
+arch dungeon_magic
 x 38
 y 34
-elevation 2585
 end
-arch woods_2
+arch grass
+x 38
+y 34
+end
+arch dungeon_magic
 x 38
 y 35
-elevation 2856
 end
-arch hills_rocky
+arch grass
+x 38
+y 35
+end
+arch city_tower_west
+x 38
+y 35
+end
+arch dungeon_magic
 x 38
 y 36
-elevation 4434
+end
+arch grass
+x 38
+y 36
+end
+arch dungeon_magic
+x 38
+y 37
 end
 arch grass
 x 38
@@ -10182,60 +10490,121 @@ x 39
 y 25
 elevation 14
 end
-arch woods_2
+arch dungeon_magic
 x 39
 y 26
-elevation 1152
 end
-arch woods_2
+arch grass
+x 39
+y 26
+end
+arch westcwall_2_1_2
+x 39
+y 26
+end
+arch dungeon_magic
 x 39
 y 27
-elevation 2080
 end
-arch woods_2
+arch grass
+x 39
+y 27
+end
+arch shallow_sea
+x 39
+y 27
+end
+arch dungeon_magic
 x 39
 y 28
-elevation 2048
 end
-arch brush
+arch grass
+x 39
+y 28
+end
+arch westcwall_2_1_2
+x 39
+y 28
+end
+arch dungeon_magic
 x 39
 y 29
-elevation 46
 end
-arch woods_2
+arch grass
+x 39
+y 29
+end
+arch house_larg_west
+x 39
+y 29
+end
+arch dungeon_magic
 x 39
 y 30
-elevation 2072
 end
-arch woods_2
+arch grass
+x 39
+y 30
+end
+arch dungeon_magic
 x 39
 y 31
-elevation 2245
 end
-arch hills
+arch grass
+x 39
+y 31
+end
+arch dungeon_magic
 x 39
 y 32
-elevation 2083
 end
-arch woods_2
+arch grass
+x 39
+y 32
+end
+arch tree5
+x 39
+y 32
+end
+arch dungeon_magic
 x 39
 y 33
-elevation 2617
 end
-arch hills_rocky
+arch grass
+x 39
+y 33
+end
+arch dungeon_magic
 x 39
 y 34
-elevation 3446
 end
-arch hills_rocky
+arch grass
+x 39
+y 34
+end
+arch ytree_2
+x 39
+y 34
+end
+arch dungeon_magic
 x 39
 y 35
-elevation 4317
 end
-arch hills_rocky
+arch grass
+x 39
+y 35
+end
+arch dungeon_magic
 x 39
 y 36
-elevation 4931
+end
+arch grass
+x 39
+y 36
+end
+arch dungeon_magic
+x 39
+y 37
 end
 arch grass
 x 39
@@ -10468,66 +10837,119 @@ x 40
 y 25
 elevation 161
 end
+arch dungeon_magic
+x 40
+y 26
+end
 arch grass
 x 40
 y 26
-elevation 62
 end
-arch woods_2
+arch westcwall_2_1_2
+x 40
+y 26
+end
+arch dungeon_magic
 x 40
 y 27
-elevation 1725
 end
-arch woods_2
+arch grass
+x 40
+y 27
+end
+arch shallow_sea
+x 40
+y 27
+end
+arch dungeon_magic
 x 40
 y 28
-elevation 1841
 end
-arch woods_2
+arch grass
+x 40
+y 28
+end
+arch westcwall_2_1_2
+x 40
+y 28
+end
+arch dungeon_magic
 x 40
 y 29
-elevation 1652
 end
-arch woods_3
+arch grass
+x 40
+y 29
+end
+arch dungeon_magic
 x 40
 y 30
-elevation 1462
 end
-arch woods_2
+arch grass
+x 40
+y 30
+end
+arch dungeon_magic
 x 40
 y 31
-elevation 1421
 end
-arch hills
+arch grass
+x 40
+y 31
+end
+arch dungeon_magic
 x 40
 y 32
-elevation 1389
 end
-arch hills
+arch grass
+x 40
+y 32
+end
+arch dungeon_magic
 x 40
 y 33
-elevation 2096
 end
-arch hills_rocky
+arch grass
+x 40
+y 33
+end
+arch dungeon_magic
 x 40
 y 34
-elevation 3480
 end
-arch hills_rocky
+arch grass
+x 40
+y 34
+end
+arch dungeon_magic
 x 40
 y 35
-elevation 4826
 end
-arch mountain
+arch grass
+x 40
+y 35
+end
+arch dungeon_magic
 x 40
 y 36
-elevation 5538
+end
+arch grass
+x 40
+y 36
+end
+arch dungeon_magic
+x 40
+y 37
 end
 arch grass
 x 40
 y 37
 end
-arch westcwall_2_1_2
+arch igateTrg1
+x 40
+y 37
+end
+arch westcityport_a
 x 40
 y 37
 end
@@ -10793,60 +11215,137 @@ x 41
 y 25
 elevation 129
 end
-arch brush
+arch dungeon_magic
 x 41
 y 26
-elevation 947
 end
-arch woods_2
+arch grass
+x 41
+y 26
+end
+arch westcwall_2_1_2
+x 41
+y 26
+end
+arch dungeon_magic
 x 41
 y 27
-elevation 1717
 end
-arch woods_3
+arch grass
+x 41
+y 27
+end
+arch shallow_sea
+x 41
+y 27
+end
+arch dungeon_magic
 x 41
 y 28
-elevation 1793
 end
-arch woods_2
+arch grass
+x 41
+y 28
+end
+arch westcwall_2_1_2
+x 41
+y 28
+end
+arch dungeon_magic
 x 41
 y 29
-elevation 1399
 end
-arch brush
+arch grass
+x 41
+y 29
+end
+arch dungeon_magic
 x 41
 y 30
-elevation 708
 end
-arch brush
+arch grass
+x 41
+y 30
+end
+arch dungeon_magic
 x 41
 y 31
-elevation 53
 end
-arch brush
+arch light2
+x 41
+y 31
+end
+arch grass
+x 41
+y 31
+end
+arch capitalhold_west
+x 41
+y 31
+end
+arch dungeon_magic
 x 41
 y 32
-elevation 236
 end
-arch brush
+arch light2
+x 41
+y 32
+end
+arch grass
+x 41
+y 32
+end
+arch dungeon_magic
 x 41
 y 33
-elevation 186
 end
-arch woods_2
+arch light2
+x 41
+y 33
+end
+arch grass
+x 41
+y 33
+end
+arch dungeon_magic
 x 41
 y 34
-elevation 2384
 end
-arch hills_rocky
+arch grass
+x 41
+y 34
+end
+arch palm
+x 41
+y 34
+end
+arch dungeon_magic
 x 41
 y 35
-elevation 4746
 end
-arch mountain
+arch grass
+x 41
+y 35
+end
+arch palm
+x 41
+y 35
+end
+arch dungeon_magic
 x 41
 y 36
-elevation 6091
+end
+arch grass
+x 41
+y 36
+end
+arch palm
+x 41
+y 36
+end
+arch dungeon_magic
+x 41
+y 37
 end
 arch grass
 x 41
@@ -10856,6 +11355,10 @@ arch westcwall_2_1_2
 x 41
 y 37
 end
+arch westcwall_1_3
+x 41
+y 37
+end
 arch dungeon_magic
 x 41
 y 38
@@ -10921,6 +11424,7 @@ y 44
 end
 arch s_shop2
 name small house
+name_pl small house
 slaying /navar_city/city1houses
 hp 3
 sp 19
@@ -11100,68 +11604,135 @@ x 42
 y 25
 elevation 130
 end
-arch woods_2
+arch dungeon_magic
 x 42
 y 26
-elevation 1146
 end
-arch woods_2
+arch grass
+x 42
+y 26
+end
+arch westcwall_2_1_2
+x 42
+y 26
+end
+arch dungeon_magic
 x 42
 y 27
-elevation 1646
 end
-arch woods_2
+arch grass
+x 42
+y 27
+end
+arch shallow_sea
+x 42
+y 27
+end
+arch dungeon_magic
 x 42
 y 28
-elevation 1359
+end
+arch grass
+x 42
+y 28
+end
+arch westcwall_2_1_2
+x 42
+y 28
+end
+arch dungeon_magic
+x 42
+y 29
 end
 arch grass
 x 42
 y 29
-elevation 546
 end
-arch brush
+arch dungeon_magic
 x 42
 y 30
-elevation 63
 end
-arch brush
+arch grass
+x 42
+y 30
+end
+arch dungeon_magic
 x 42
 y 31
-elevation 14
 end
-arch shallow_sea
+arch light2
+x 42
+y 31
+end
+arch grass
+x 42
+y 31
+end
+arch dungeon_magic
 x 42
 y 32
-elevation -6
 end
-arch brush
+arch light2
+x 42
+y 32
+end
+arch grass
+x 42
+y 32
+end
+arch dungeon_magic
 x 42
 y 33
-elevation 318
 end
-arch hills
+arch light2
+x 42
+y 33
+end
+arch grass
+x 42
+y 33
+end
+arch dungeon_magic
 x 42
 y 34
-elevation 2165
 end
-arch hills_rocky
+arch grass
+x 42
+y 34
+end
+arch dungeon_magic
 x 42
 y 35
-elevation 4810
 end
-arch mountain
+arch grass
+x 42
+y 35
+end
+arch dungeon_magic
 x 42
 y 36
-elevation 6574
+end
+arch grass
+x 42
+y 36
+end
+arch dungeon_magic
+x 42
+y 37
 end
 arch grass
 x 42
 y 37
 end
-arch westcwall_2_1_2
+arch grate_closed_1
 x 42
 y 37
+speed 0.500000
+end
+arch westcityport_a
+x 42
+y 37
+blocksview 0
 end
 arch dungeon_magic
 x 42
@@ -11382,68 +11953,139 @@ x 43
 y 25
 elevation 3
 end
-arch brush
+arch dungeon_magic
 x 43
 y 26
-elevation 899
 end
-arch woods_3
+arch grass
+x 43
+y 26
+end
+arch westcwall_2_1_2
+x 43
+y 26
+end
+arch dungeon_magic
 x 43
 y 27
-elevation 1081
+end
+arch grass
+x 43
+y 27
+end
+arch shallow_sea
+x 43
+y 27
+end
+arch dungeon_magic
+x 43
+y 28
 end
 arch grass
 x 43
 y 28
-elevation 631
 end
-arch desert
+arch westcwall_2_1_2
+x 43
+y 28
+end
+arch dungeon_magic
 x 43
 y 29
-elevation 40
 end
-arch shallow_sea
+arch grass
+x 43
+y 29
+end
+arch dungeon_magic
 x 43
 y 30
-elevation -3
 end
-arch swamp
+arch grass
+x 43
+y 30
+end
+arch ytree_2
+x 43
+y 30
+end
+arch dungeon_magic
 x 43
 y 31
-elevation 6
 end
-arch desert
+arch light2
+x 43
+y 31
+end
+arch grass
+x 43
+y 31
+end
+arch dungeon_magic
 x 43
 y 32
-elevation 81
 end
-arch brush
+arch light2
+x 43
+y 32
+end
+arch grass
+x 43
+y 32
+end
+arch dungeon_magic
 x 43
 y 33
-elevation 109
 end
-arch hills
+arch light2
+x 43
+y 33
+end
+arch grass
+x 43
+y 33
+end
+arch dungeon_magic
 x 43
 y 34
-elevation 1319
 end
-arch hills_rocky
+arch grass
+x 43
+y 34
+end
+arch dungeon_magic
 x 43
 y 35
-elevation 4629
 end
-arch mountain
+arch grass
+x 43
+y 35
+end
+arch dungeon_magic
 x 43
 y 36
-elevation 6437
+end
+arch grass
+x 43
+y 36
+end
+arch dungeon_magic
+x 43
+y 37
 end
 arch grass
 x 43
 y 37
 end
-arch westcwall_2_1_2
+arch grate_closed_1
 x 43
 y 37
+speed 0.500000
+end
+arch westcityport_a
+x 43
+y 37
+blocksview 0
 end
 arch dungeon_magic
 x 43
@@ -11676,68 +12318,135 @@ x 44
 y 25
 elevation -9
 end
-arch desert
+arch dungeon_magic
 x 44
 y 26
-elevation 600
 end
-arch brush
+arch grass
+x 44
+y 26
+end
+arch westcwall_2_1_2
+x 44
+y 26
+end
+arch dungeon_magic
 x 44
 y 27
-elevation 786
+end
+arch grass
+x 44
+y 27
+end
+arch shallow_sea
+x 44
+y 27
+end
+arch dungeon_magic
+x 44
+y 28
 end
 arch grass
 x 44
 y 28
-elevation 149
+end
+arch westcwall_2_1_2
+x 44
+y 28
+end
+arch dungeon_magic
+x 44
+y 29
 end
 arch grass
 x 44
 y 29
-elevation 34
 end
-arch brush
+arch dungeon_magic
 x 44
 y 30
-elevation 16
 end
-arch swamp
+arch grass
+x 44
+y 30
+end
+arch dungeon_magic
 x 44
 y 31
-elevation 9
 end
-arch desert
+arch light2
+x 44
+y 31
+end
+arch grass
+x 44
+y 31
+end
+arch dungeon_magic
 x 44
 y 32
-elevation 23
 end
-arch brush
+arch light2
+x 44
+y 32
+end
+arch grass
+x 44
+y 32
+end
+arch dungeon_magic
 x 44
 y 33
-elevation 438
 end
-arch hills
+arch light2
+x 44
+y 33
+end
+arch grass
+x 44
+y 33
+end
+arch dungeon_magic
 x 44
 y 34
-elevation 1861
 end
-arch hills_rocky
+arch grass
+x 44
+y 34
+end
+arch dungeon_magic
 x 44
 y 35
-elevation 4143
 end
-arch mountain
+arch grass
+x 44
+y 35
+end
+arch dungeon_magic
 x 44
 y 36
-elevation 5021
+end
+arch grass
+x 44
+y 36
+end
+arch dungeon_magic
+x 44
+y 37
 end
 arch grass
 x 44
 y 37
 end
-arch westcwall_2_1_2
+arch grate_closed_1
 x 44
 y 37
+speed 0.500000
+end
+arch westcityport_a
+x 44
+y 37
+blocksview 0
 end
 arch dungeon_magic
 x 44
@@ -11974,60 +12683,133 @@ x 45
 y 25
 elevation 82
 end
-arch brush
+arch dungeon_magic
 x 45
 y 26
-elevation 519
 end
-arch brush
+arch grass
+x 45
+y 26
+end
+arch westcwall_2_1_2
+x 45
+y 26
+end
+arch dungeon_magic
 x 45
 y 27
-elevation 378
 end
-arch brush
+arch grass
+x 45
+y 27
+end
+arch shallow_sea
+x 45
+y 27
+end
+arch dungeon_magic
 x 45
 y 28
-elevation 71
 end
-arch desert
+arch grass
+x 45
+y 28
+end
+arch westcwall_2_1_2
+x 45
+y 28
+end
+arch dungeon_magic
 x 45
 y 29
-elevation 15
 end
-arch brush
+arch grass
+x 45
+y 29
+end
+arch dungeon_magic
 x 45
 y 30
-elevation 37
 end
-arch brush
+arch grass
+x 45
+y 30
+end
+arch dungeon_magic
 x 45
 y 31
-elevation 70
 end
-arch brush
+arch light2
+x 45
+y 31
+end
+arch grass
+x 45
+y 31
+end
+arch dungeon_magic
 x 45
 y 32
-elevation 33
+end
+arch light2
+x 45
+y 32
+end
+arch grass
+x 45
+y 32
+end
+arch dungeon_magic
+x 45
+y 33
+end
+arch light2
+x 45
+y 33
 end
 arch grass
 x 45
 y 33
-elevation 978
 end
-arch woods_2
+arch dungeon_magic
 x 45
 y 34
-elevation 2559
 end
-arch hills_rocky
+arch grass
+x 45
+y 34
+end
+arch palm
+x 45
+y 34
+end
+arch dungeon_magic
 x 45
 y 35
-elevation 3621
 end
-arch hills_rocky
+arch grass
+x 45
+y 35
+end
+arch palm
+x 45
+y 35
+end
+arch dungeon_magic
 x 45
 y 36
-elevation 4351
+end
+arch grass
+x 45
+y 36
+end
+arch palm
+x 45
+y 36
+end
+arch dungeon_magic
+x 45
+y 37
 end
 arch grass
 x 45
@@ -12037,6 +12819,10 @@ arch westcwall_2_1_2
 x 45
 y 37
 end
+arch westcwall_1_4
+x 45
+y 37
+end
 arch dungeon_magic
 x 45
 y 38
@@ -12302,66 +13088,123 @@ x 46
 y 25
 elevation 306
 end
+arch dungeon_magic
+x 46
+y 26
+end
 arch grass
 x 46
 y 26
-elevation 593
 end
-arch brush
+arch westcwall_2_1_2
+x 46
+y 26
+end
+arch dungeon_magic
 x 46
 y 27
-elevation 438
+end
+arch grass
+x 46
+y 27
+end
+arch shallow_sea
+x 46
+y 27
+end
+arch dungeon_magic
+x 46
+y 28
 end
 arch grass
 x 46
 y 28
-elevation 32
 end
-arch brush
+arch westcwall_2_1_2
+x 46
+y 28
+end
+arch dungeon_magic
 x 46
 y 29
-elevation 69
 end
-arch desert
+arch grass
+x 46
+y 29
+end
+arch tree4
+x 46
+y 29
+end
+arch dungeon_magic
 x 46
 y 30
-elevation 88
 end
-arch brush
+arch grass
+x 46
+y 30
+end
+arch dungeon_magic
 x 46
 y 31
-elevation 456
 end
-arch woods_2
+arch grass
+x 46
+y 31
+end
+arch dungeon_magic
 x 46
 y 32
-elevation 1388
 end
-arch evergreens
+arch grass
+x 46
+y 32
+end
+arch dungeon_magic
 x 46
 y 33
-elevation 2522
 end
-arch hills_rocky
+arch grass
+x 46
+y 33
+end
+arch dungeon_magic
 x 46
 y 34
-elevation 3147
 end
-arch woods_2
+arch grass
+x 46
+y 34
+end
+arch dungeon_magic
 x 46
 y 35
-elevation 2811
 end
-arch hills
+arch grass
+x 46
+y 35
+end
+arch dungeon_magic
 x 46
 y 36
-elevation 2782
+end
+arch grass
+x 46
+y 36
+end
+arch dungeon_magic
+x 46
+y 37
 end
 arch grass
 x 46
 y 37
 end
-arch westcwall_2_1_2
+arch igateTrg1
+x 46
+y 37
+end
+arch westcityport_a
 x 46
 y 37
 end
@@ -12590,60 +13433,113 @@ x 47
 y 25
 elevation 893
 end
-arch brush
+arch dungeon_magic
 x 47
 y 26
-elevation 665
 end
-arch brush
+arch grass
+x 47
+y 26
+end
+arch westcwall_2_1_2
+x 47
+y 26
+end
+arch dungeon_magic
 x 47
 y 27
-elevation 149
 end
-arch brush
+arch grass
+x 47
+y 27
+end
+arch shallow_sea
+x 47
+y 27
+end
+arch dungeon_magic
 x 47
 y 28
-elevation 48
 end
-arch brush
+arch grass
+x 47
+y 28
+end
+arch westcwall_2_1_2
+x 47
+y 28
+end
+arch dungeon_magic
 x 47
 y 29
-elevation 312
 end
-arch woods_2
+arch grass
+x 47
+y 29
+end
+arch dungeon_magic
 x 47
 y 30
-elevation 1415
 end
-arch woods_2
+arch grass
+x 47
+y 30
+end
+arch dungeon_magic
 x 47
 y 31
-elevation 2311
 end
-arch hills_rocky
+arch grass
+x 47
+y 31
+end
+arch dungeon_magic
 x 47
 y 32
-elevation 3030
 end
-arch hills_rocky
+arch grass
+x 47
+y 32
+end
+arch tree4
+x 47
+y 32
+end
+arch dungeon_magic
 x 47
 y 33
-elevation 3555
 end
-arch hills_rocky
+arch grass
+x 47
+y 33
+end
+arch dungeon_magic
 x 47
 y 34
-elevation 3448
 end
-arch hills
+arch grass
+x 47
+y 34
+end
+arch dungeon_magic
 x 47
 y 35
-elevation 2022
 end
-arch desert
+arch grass
+x 47
+y 35
+end
+arch dungeon_magic
 x 47
 y 36
-elevation 37
+end
+arch grass
+x 47
+y 36
+end
+arch dungeon_magic
+x 47
+y 37
 end
 arch grass
 x 47
@@ -12886,60 +13782,121 @@ x 48
 y 25
 elevation 784
 end
-arch desert
+arch dungeon_magic
 x 48
 y 26
-elevation 463
+end
+arch grass
+x 48
+y 26
+end
+arch westcwall_2_1_2
+x 48
+y 26
+end
+arch dungeon_magic
+x 48
+y 27
 end
 arch grass
 x 48
 y 27
-elevation 16
+end
+arch shallow_sea
+x 48
+y 27
+end
+arch dungeon_magic
+x 48
+y 28
 end
 arch grass
 x 48
 y 28
-elevation 272
 end
-arch desert
+arch westcwall_2_1_2
+x 48
+y 28
+end
+arch city_tower_west
+x 48
+y 28
+end
+arch dungeon_magic
 x 48
 y 29
-elevation 875
 end
-arch woods_3
+arch grass
+x 48
+y 29
+end
+arch dungeon_magic
 x 48
 y 30
-elevation 2269
 end
-arch hills_rocky
+arch grass
+x 48
+y 30
+end
+arch dungeon_magic
 x 48
 y 31
-elevation 3214
 end
-arch hills_rocky
+arch grass
+x 48
+y 31
+end
+arch tree3
+x 48
+y 31
+end
+arch dungeon_magic
 x 48
 y 32
-elevation 3760
 end
-arch steppe
+arch grass
+x 48
+y 32
+end
+arch dungeon_magic
 x 48
 y 33
-elevation 3547
 end
-arch hills_rocky
+arch grass
+x 48
+y 33
+end
+arch dungeon_magic
 x 48
 y 34
-elevation 3663
 end
-arch woods_2
+arch grass
+x 48
+y 34
+end
+arch dungeon_magic
 x 48
 y 35
-elevation 2579
 end
-arch hills
+arch grass
+x 48
+y 35
+end
+arch city_tower_west
+x 48
+y 35
+end
+arch dungeon_magic
 x 48
 y 36
-elevation 1292
+end
+arch grass
+x 48
+y 36
+end
+arch dungeon_magic
+x 48
+y 37
 end
 arch grass
 x 48
@@ -13203,66 +14160,147 @@ x 49
 y 25
 elevation 87
 end
+arch dungeon_magic
+x 49
+y 26
+end
 arch grass
 x 49
 y 26
-elevation 27
 end
-arch swamp
+arch westcwall_2_1_2
+x 49
+y 26
+end
+arch dungeon_magic
 x 49
 y 27
-elevation 6
+end
+arch grass
+x 49
+y 27
+end
+arch shallow_sea
+x 49
+y 27
+end
+arch dungeon_magic
+x 49
+y 28
 end
 arch grass
 x 49
 y 28
-elevation 506
 end
-arch hills
+arch westcwall_2_2_3
+x 49
+y 28
+end
+arch dungeon_magic
 x 49
 y 29
-elevation 1429
 end
-arch woods_3
+arch grass
+x 49
+y 29
+end
+arch westcwall_2_1_1
+x 49
+y 29
+end
+arch dungeon_magic
 x 49
 y 30
-elevation 2435
 end
-arch hills_rocky
+arch grass
+x 49
+y 30
+end
+arch westcwall_2_1_1
+x 49
+y 30
+end
+arch dungeon_magic
 x 49
 y 31
-elevation 3034
 end
-arch hills_rocky
+arch grass
+x 49
+y 31
+end
+arch westcwall_2_1_1
+x 49
+y 31
+end
+arch dungeon_magic
 x 49
 y 32
-elevation 3568
 end
-arch steppe
+arch grass
+x 49
+y 32
+end
+arch westcwall_2_1_1
+x 49
+y 32
+end
+arch dungeon_magic
 x 49
 y 33
-elevation 3875
 end
-arch hills_rocky
+arch grass
+x 49
+y 33
+end
+arch westcwall_2_1_1
+x 49
+y 33
+end
+arch dungeon_magic
 x 49
 y 34
-elevation 3576
 end
-arch woods_3
+arch grass
+x 49
+y 34
+end
+arch westcwall_2_1_1
+x 49
+y 34
+end
+arch dungeon_magic
 x 49
 y 35
-elevation 2412
 end
-arch desert
+arch grass
+x 49
+y 35
+end
+arch westcwall_2_1_1
+x 49
+y 35
+end
+arch dungeon_magic
 x 49
 y 36
-elevation 451
+end
+arch grass
+x 49
+y 36
+end
+arch westcwall_2_1_1
+x 49
+y 36
+end
+arch dungeon_magic
+x 49
+y 37
 end
 arch grass
 x 49
 y 37
 end
-arch westcwall_2_1_2
+arch westcwall_3_1
 x 49
 y 37
 end
diff --git a/world/world_122_116 b/world/world_122_116
index 0e392adee..27d77ccfc 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -121,54 +121,112 @@ arch shallow_sea
 y 25
 elevation -9
 end
-arch shallow_sea
+arch dungeon_magic
 y 26
-elevation -9
+end
+arch grass
+y 26
+end
+arch westcwall_2_1_2
+y 26
+end
+arch dungeon_magic
+y 27
 end
 arch grass
 y 27
-elevation 16
+end
+arch shallow_sea
+y 27
+end
+arch dungeon_magic
+y 28
 end
 arch grass
 y 28
-elevation 49
 end
-arch woods_3
+arch shallow_sea
+y 28
+end
+arch dungeon_magic
 y 29
-elevation 1231
 end
-arch hills
+arch grass
+y 29
+end
+arch shallow_sea
+y 29
+end
+arch dungeon_magic
 y 30
-elevation 1963
 end
-arch woods_2
+arch grass
+y 30
+end
+arch shallow_sea
+y 30
+end
+arch dungeon_magic
 y 31
-elevation 2321
 end
-arch woods_2
+arch grass
+y 31
+end
+arch shallow_sea
+y 31
+end
+arch dungeon_magic
 y 32
-elevation 1596
 end
-arch steppe
+arch grass
+y 32
+end
+arch shallow_sea
+y 32
+end
+arch dungeon_magic
 y 33
-elevation 4227
 end
-arch hills_rocky
+arch grass
+y 33
+end
+arch shallow_sea
+y 33
+end
+arch dungeon_magic
 y 34
-elevation 3541
+end
+arch grass
+y 34
+end
+arch shallow_sea
+y 34
+end
+arch dungeon_magic
+y 35
 end
 arch grass
 y 35
-elevation 865
 end
-arch desert
+arch shallow_sea
+y 35
+end
+arch dungeon_magic
 y 36
-elevation 196
+end
+arch grass
+y 36
+end
+arch shallow_sea
+y 36
+end
+arch dungeon_magic
+y 37
 end
 arch grass
 y 37
 end
-arch westcwall_2_1_2
+arch westcityport_a
 y 37
 end
 arch dungeon_magic
@@ -378,34 +436,77 @@ x 1
 y 25
 elevation 2
 end
-arch shallow_sea
+arch dungeon_magic
 x 1
 y 26
 end
 arch grass
 x 1
-y 27
-elevation 23
+y 26
 end
-arch brush
+arch westcwall_2_2_3
+x 1
+y 26
+end
+arch dungeon_magic
+x 1
+y 27
+end
+arch grass
+x 1
+y 27
+end
+arch westcwall_2_1_1
+x 1
+y 27
+end
+arch dungeon_magic
 x 1
 y 28
-elevation 38
+end
+arch grass
+x 1
+y 28
+end
+arch westcwall_2_1_1
+x 1
+y 28
+end
+arch dungeon_magic
+x 1
+y 29
 end
 arch grass
 x 1
 y 29
-elevation 615
 end
-arch tree
+arch westcwall_2_1_1
+x 1
+y 29
+end
+arch dungeon_magic
 x 1
 y 30
-elevation 1094
 end
-arch tree
+arch grass
+x 1
+y 30
+end
+arch westcwall_2_1_1
+x 1
+y 30
+end
+arch dungeon_magic
+x 1
+y 31
+end
+arch grass
+x 1
+y 31
+end
+arch westcwall_2_1_1
 x 1
 y 31
-elevation 1612
 end
 arch dungeon_magic
 x 1
@@ -415,7 +516,7 @@ arch grass
 x 1
 y 32
 end
-arch westcwall_2_2_2
+arch westcwall_3_2
 x 1
 y 32
 end
@@ -1611,7 +1712,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 5
 y 1
@@ -1673,7 +1773,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 5
 y 9
@@ -2620,7 +2719,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 8
 y 3
@@ -4392,7 +4490,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 13
 y 2
@@ -4754,7 +4851,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 14
 end
@@ -5209,7 +5305,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 15
 y 17
@@ -5912,7 +6007,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 17
 y 12
@@ -5949,7 +6043,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 17
 y 15
@@ -6257,7 +6350,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 18
 y 7
@@ -6334,7 +6426,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 18
 y 18
@@ -6608,7 +6699,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 19
 y 3
@@ -6670,7 +6760,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 19
 y 11
@@ -7082,7 +7171,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 20
 y 14
@@ -7502,7 +7590,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 21
 y 30
@@ -7753,7 +7840,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 22
 y 7
@@ -7825,7 +7911,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 22
 y 17
@@ -7882,7 +7967,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 22
 y 24
@@ -7919,7 +8003,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 22
 y 27
@@ -8482,7 +8565,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 24
 y 12
@@ -8539,7 +8621,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 24
 y 19
@@ -8809,7 +8890,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 25
 y 22
@@ -9043,7 +9123,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 26
 y 18
@@ -9115,7 +9194,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 26
 y 28
@@ -9161,7 +9239,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 26
 y 33
@@ -9275,7 +9352,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 27
 y 5
@@ -9347,7 +9423,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 27
 y 15
@@ -9630,7 +9705,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 28
 y 21
@@ -9706,7 +9780,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 28
 y 32
@@ -9815,7 +9888,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 29
 y 3
@@ -9877,7 +9949,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 29
 y 11
@@ -9964,7 +10035,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 29
 y 24
@@ -10103,7 +10173,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 30
 y 1
@@ -10150,7 +10219,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 30
 y 6
@@ -10605,7 +10673,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 32
 end
@@ -10636,7 +10703,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 32
 y 2
@@ -10723,7 +10789,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 32
 y 15
@@ -10765,7 +10830,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 32
 y 19
@@ -10817,7 +10881,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 32
 y 25
@@ -11051,7 +11114,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 33
 y 21
@@ -11315,7 +11377,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 34
 y 23
@@ -11367,7 +11428,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 34
 y 29
@@ -11541,7 +11601,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 35
 y 13
@@ -11588,7 +11647,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 35
 y 18
@@ -12039,7 +12097,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 37
 y 11
@@ -12308,7 +12365,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 38
 y 14
@@ -12527,7 +12583,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 39
 y 7
@@ -12811,7 +12866,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 40
 y 13
@@ -13281,7 +13335,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 42
 y 10
@@ -13898,7 +13951,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 44
 y 16
@@ -14207,7 +14259,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 45
 y 6
@@ -14542,7 +14593,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 46
 y 2
@@ -14604,7 +14654,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 46
 y 10
@@ -15138,7 +15187,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 48
 y 13
@@ -15389,7 +15437,6 @@ decorstyle rugged
 symmetry 1
 dungeon_depth 2
 orientation 1
-
 endmsg
 x 49
 y 9