From 5a8b1761eae9676d22b8e74e3bafa2008ca5bb76 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 24 Jun 2012 08:49:46 +0000
Subject: [PATCH] Cosmetic and layout changes to replace yellow block walls
 with cave wall sections to Goblin Den (scorn/dtabb/cave3) in Scorn.  Updated
 world map (world/world_105_116) for map entrance coordinate changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18300 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/dtabb/cave3   | 3140 +++++++++++++++++++++++++++----------------
 world/world_105_116 |    4 +-
 2 files changed, 1994 insertions(+), 1150 deletions(-)

diff --git a/scorn/dtabb/cave3 b/scorn/dtabb/cave3
index e32a45dff..e183a362b 100644
--- a/scorn/dtabb/cave3
+++ b/scorn/dtabb/cave3
@@ -2,144 +2,153 @@ arch map
 name Goblin Den
 difficulty 6
 region scorn
-width 20
-height 20
+width 24
+height 22
 enter_x 19
-enter_y 3
+enter_y 2
 msg
 Created:  1994-10-19
-Modified: 2008-12-02 Rick Tanner
+Modified: 2012-06-24 Rick Tanner
 endmsg
 end
 arch dirtfloor
 end
-arch bwall_0
+arch cave_15
 end
 arch dirtfloor
 y 1
 end
-arch bwall_0
+arch cave_15
 y 1
 end
 arch dirtfloor
 y 2
 end
-arch bwall_0
+arch cave_15
 y 2
 end
 arch dirtfloor
 y 3
 end
-arch bwall_0
+arch cave_15
 y 3
 end
 arch dirtfloor
 y 4
 end
-arch bwall_0
+arch cave_15
 y 4
 end
 arch dirtfloor
 y 5
 end
-arch bwall_0
+arch cave_15
 y 5
 end
 arch dirtfloor
 y 6
 end
-arch bwall_0
+arch cave_15
 y 6
 end
 arch dirtfloor
 y 7
 end
-arch bwall_0
+arch cave_15
 y 7
 end
 arch dirtfloor
 y 8
 end
-arch bwall_0
+arch cave_15
 y 8
 end
 arch dirtfloor
 y 9
 end
-arch bwall_0
+arch cave24
 y 9
 end
 arch dirtfloor
 y 10
 end
-arch bwall_0
+arch cave3
 y 10
 end
 arch dirtfloor
 y 11
 end
-arch bwall_0
+arch cave3
 y 11
 end
 arch dirtfloor
 y 12
 end
-arch bwall_0
+arch cave3
 y 12
 end
 arch dirtfloor
 y 13
 end
-arch bwall_0
+arch cave3
 y 13
 end
 arch dirtfloor
 y 14
 end
-arch bwall_0
+arch cave3
 y 14
 end
 arch dirtfloor
 y 15
 end
-arch bwall_0
+arch cave3
 y 15
 end
 arch dirtfloor
 y 16
 end
-arch bwall_0
+arch cave3
 y 16
 end
 arch dirtfloor
 y 17
 end
-arch bwall_0
+arch cave23
 y 17
 end
 arch dirtfloor
 y 18
 end
-arch bwall_0
+arch cave_15
 y 18
 end
 arch dirtfloor
 y 19
 end
-arch bwall_0
+arch cave_15
 y 19
 end
 arch dirtfloor
+y 20
+end
+arch cave_15
+y 20
+end
+arch cave_15
+y 21
+end
+arch dirtfloor
 x 1
 end
-arch bwall_0
+arch cave_15
 x 1
 end
 arch dirtfloor
 x 1
 y 1
 end
-arch bwall_0
+arch cave24
 x 1
 y 1
 end
@@ -147,7 +156,7 @@ arch dirtfloor
 x 1
 y 2
 end
-arch bwall_0
+arch cave3
 x 1
 y 2
 end
@@ -155,7 +164,7 @@ arch dirtfloor
 x 1
 y 3
 end
-arch bwall_0
+arch cave3
 x 1
 y 3
 end
@@ -163,7 +172,7 @@ arch dirtfloor
 x 1
 y 4
 end
-arch bwall_0
+arch cave3
 x 1
 y 4
 end
@@ -171,7 +180,7 @@ arch dirtfloor
 x 1
 y 5
 end
-arch bwall_0
+arch cave3
 x 1
 y 5
 end
@@ -179,7 +188,7 @@ arch dirtfloor
 x 1
 y 6
 end
-arch bwall_0
+arch cave23
 x 1
 y 6
 end
@@ -187,7 +196,7 @@ arch dirtfloor
 x 1
 y 7
 end
-arch bwall_0
+arch cave_15
 x 1
 y 7
 end
@@ -195,7 +204,7 @@ arch dirtfloor
 x 1
 y 8
 end
-arch bwall_0
+arch cave_15
 x 1
 y 8
 end
@@ -203,7 +212,7 @@ arch dirtfloor
 x 1
 y 9
 end
-arch bwall_0
+arch cave4
 x 1
 y 9
 end
@@ -219,10 +228,6 @@ arch dirtfloor
 x 1
 y 12
 end
-arch bwall_0
-x 1
-y 12
-end
 arch dirtfloor
 x 1
 y 13
@@ -243,7 +248,7 @@ arch dirtfloor
 x 1
 y 17
 end
-arch bwall_0
+arch cave12
 x 1
 y 17
 end
@@ -251,7 +256,7 @@ arch dirtfloor
 x 1
 y 18
 end
-arch bwall_0
+arch cave3
 x 1
 y 18
 end
@@ -259,21 +264,33 @@ arch dirtfloor
 x 1
 y 19
 end
-arch bwall_0
+arch cave3
 x 1
 y 19
 end
 arch dirtfloor
+x 1
+y 20
+end
+arch cave23
+x 1
+y 20
+end
+arch cave_15
+x 1
+y 21
+end
+arch dirtfloor
 x 2
 end
-arch bwall_0
+arch cave_15
 x 2
 end
 arch dirtfloor
 x 2
 y 1
 end
-arch bwall_0
+arch cave4
 x 2
 y 1
 end
@@ -297,7 +314,7 @@ arch dirtfloor
 x 2
 y 6
 end
-arch bwall_0
+arch cave12
 x 2
 y 6
 end
@@ -305,7 +322,7 @@ arch dirtfloor
 x 2
 y 7
 end
-arch bwall_0
+arch cave23
 x 2
 y 7
 end
@@ -313,7 +330,7 @@ arch dirtfloor
 x 2
 y 8
 end
-arch bwall_0
+arch cave_15
 x 2
 y 8
 end
@@ -321,7 +338,7 @@ arch dirtfloor
 x 2
 y 9
 end
-arch bwall_0
+arch cave4
 x 2
 y 9
 end
@@ -337,10 +354,6 @@ arch dirtfloor
 x 2
 y 12
 end
-arch bwall_0
-x 2
-y 12
-end
 arch dirtfloor
 x 2
 y 13
@@ -349,10 +362,6 @@ arch dirtfloor
 x 2
 y 14
 end
-arch bwall_0
-x 2
-y 14
-end
 arch dirtfloor
 x 2
 y 15
@@ -373,29 +382,37 @@ arch dirtfloor
 x 2
 y 18
 end
+arch dirtfloor
+x 2
+y 19
+end
 arch mouse
 x 2
-y 18
+y 19
 end
 arch dirtfloor
 x 2
-y 19
+y 20
 end
-arch bwall_0
+arch cave2
 x 2
-y 19
+y 20
+end
+arch cave_15
+x 2
+y 21
 end
 arch dirtfloor
 x 3
 end
-arch bwall_0
+arch cave_15
 x 3
 end
 arch dirtfloor
 x 3
 y 1
 end
-arch bwall_0
+arch cave4
 x 3
 y 1
 end
@@ -407,7 +424,7 @@ arch dirtfloor
 x 3
 y 3
 end
-arch bwall_0
+arch cave11
 x 3
 y 3
 end
@@ -415,7 +432,7 @@ arch dirtfloor
 x 3
 y 4
 end
-arch bwall_0
+arch cave10
 x 3
 y 4
 end
@@ -431,7 +448,7 @@ arch dirtfloor
 x 3
 y 7
 end
-arch bwall_0
+arch cave12
 x 3
 y 7
 end
@@ -439,7 +456,7 @@ arch dirtfloor
 x 3
 y 8
 end
-arch bwall_0
+arch cave23
 x 3
 y 8
 end
@@ -447,6 +464,10 @@ arch dirtfloor
 x 3
 y 9
 end
+arch cave4
+x 3
+y 9
+end
 arch dirtfloor
 x 3
 y 10
@@ -459,10 +480,6 @@ arch dirtfloor
 x 3
 y 12
 end
-arch bwall_0
-x 3
-y 12
-end
 arch dirtfloor
 x 3
 y 13
@@ -471,15 +488,23 @@ arch dirtfloor
 x 3
 y 14
 end
+arch cave11
+x 3
+y 14
+end
 arch dirtfloor
 x 3
 y 15
 end
+arch cave1
+x 3
+y 15
+end
 arch dirtfloor
 x 3
 y 16
 end
-arch bwall_0
+arch cave1
 x 3
 y 16
 end
@@ -487,7 +512,7 @@ arch dirtfloor
 x 3
 y 17
 end
-arch bwall_0
+arch cave10
 x 3
 y 17
 end
@@ -499,21 +524,29 @@ arch dirtfloor
 x 3
 y 19
 end
-arch bwall_0
+arch dirtfloor
 x 3
-y 19
+y 20
+end
+arch cave2
+x 3
+y 20
+end
+arch cave_15
+x 3
+y 21
 end
 arch dirtfloor
 x 4
 end
-arch bwall_0
+arch cave_15
 x 4
 end
 arch dirtfloor
 x 4
 y 1
 end
-arch bwall_0
+arch cave4
 x 4
 y 1
 end
@@ -525,7 +558,7 @@ arch dirtfloor
 x 4
 y 3
 end
-arch bwall_0
+arch cave2
 x 4
 y 3
 end
@@ -533,7 +566,7 @@ arch dirtfloor
 x 4
 y 4
 end
-arch bwall_0
+arch cave25
 x 4
 y 4
 end
@@ -541,7 +574,7 @@ arch dirtfloor
 x 4
 y 5
 end
-arch bwall_0
+arch cave10
 x 4
 y 5
 end
@@ -561,7 +594,7 @@ arch dirtfloor
 x 4
 y 8
 end
-arch bwall_0
+arch cave2
 x 4
 y 8
 end
@@ -569,7 +602,7 @@ arch dirtfloor
 x 4
 y 9
 end
-arch bwall_0
+arch cave4
 x 4
 y 9
 end
@@ -581,43 +614,43 @@ arch dirtfloor
 x 4
 y 11
 end
-arch bwall_0
-x 4
-y 11
-end
 arch dirtfloor
 x 4
 y 12
 end
-arch bwall_0
-x 4
-y 12
-end
 arch dirtfloor
 x 4
 y 13
 end
-arch generate_orc
-x 4
-y 13
-end
 arch dirtfloor
 x 4
 y 14
 end
+arch cave2
+x 4
+y 14
+end
 arch dirtfloor
 x 4
 y 15
 end
+arch cave_15
+x 4
+y 15
+end
 arch dirtfloor
 x 4
 y 16
 end
+arch cave_15
+x 4
+y 16
+end
 arch dirtfloor
 x 4
 y 17
 end
-arch bwall_0
+arch cave4
 x 4
 y 17
 end
@@ -629,21 +662,29 @@ arch dirtfloor
 x 4
 y 19
 end
-arch bwall_0
+arch dirtfloor
 x 4
-y 19
+y 20
+end
+arch cave2
+x 4
+y 20
+end
+arch cave_15
+x 4
+y 21
 end
 arch dirtfloor
 x 5
 end
-arch bwall_0
+arch cave_15
 x 5
 end
 arch dirtfloor
 x 5
 y 1
 end
-arch bwall_0
+arch cave4
 x 5
 y 1
 end
@@ -655,7 +696,7 @@ arch dirtfloor
 x 5
 y 3
 end
-arch bwall_0
+arch cave2
 x 5
 y 3
 end
@@ -663,527 +704,619 @@ arch dirtfloor
 x 5
 y 4
 end
+arch cave_15
+x 5
+y 4
+end
+arch dirtfloor
+x 5
+y 5
+end
+arch cave25
+x 5
+y 5
+end
+arch dirtfloor
+x 5
+y 6
+end
+arch cave10
+x 5
+y 6
+end
+arch dirtfloor
+x 5
+y 7
+end
+arch dirtfloor
+x 5
+y 8
+end
+arch cave12
+x 5
+y 8
+end
+arch dirtfloor
+x 5
+y 9
+end
+arch cave9
+x 5
+y 9
+end
+arch dirtfloor
+x 5
+y 10
+end
+arch dirtfloor
+x 5
+y 11
+end
+arch dirtfloor
+x 5
+y 12
+end
+arch cave11
+x 5
+y 12
+end
+arch dirtfloor
+x 5
+y 13
+end
+arch cave1
+x 5
+y 13
+end
+arch dirtfloor
+x 5
+y 14
+end
+arch cave22
+x 5
+y 14
+end
+arch dirtfloor
+x 5
+y 15
+end
+arch cave_15
+x 5
+y 15
+end
+arch dirtfloor
+x 5
+y 16
+end
+arch cave_15
+x 5
+y 16
+end
+arch dirtfloor
+x 5
+y 17
+end
+arch cave4
+x 5
+y 17
+end
+arch dirtfloor
+x 5
+y 18
+end
+arch dirtfloor
+x 5
+y 19
+end
+arch dirtfloor
+x 5
+y 20
+end
+arch cave2
+x 5
+y 20
+end
+arch cave_15
+x 5
+y 21
+end
+arch dirtfloor
+x 6
+end
+arch cave_15
+x 6
+end
+arch dirtfloor
+x 6
+y 1
+end
+arch cave4
+x 6
+y 1
+end
+arch dirtfloor
+x 6
+y 2
+end
+arch dirtfloor
+x 6
+y 3
+end
+arch cave2
+x 6
+y 3
+end
+arch dirtfloor
+x 6
+y 4
+end
+arch cave_15
+x 6
+y 4
+end
+arch dirtfloor
+x 6
+y 5
+end
+arch cave_15
+x 6
+y 5
+end
+arch dirtfloor
+x 6
+y 6
+end
+arch cave25
+x 6
+y 6
+end
+arch dirtfloor
+x 6
+y 7
+end
+arch cave10
+x 6
+y 7
+end
+arch dirtfloor
+x 6
+y 8
+end
+arch dirtfloor
+x 6
+y 9
+end
+arch dirtfloor
+x 6
+y 10
+end
+arch dirtfloor
+x 6
+y 11
+end
+arch goblin
+x 6
+y 11
+end
+arch dirtfloor
+x 6
+y 12
+end
+arch cave2
+x 6
+y 12
+end
+arch dirtfloor
+x 6
+y 13
+end
+arch cave_15
+x 6
+y 13
+end
+arch dirtfloor
+x 6
+y 14
+end
+arch cave_15
+x 6
+y 14
+end
+arch dirtfloor
+x 6
+y 15
+end
+arch cave_15
+x 6
+y 15
+end
+arch dirtfloor
+x 6
+y 16
+end
+arch cave_15
+x 6
+y 16
+end
+arch dirtfloor
+x 6
+y 17
+end
+arch cave4
+x 6
+y 17
+end
+arch dirtfloor
+x 6
+y 18
+end
+arch dirtfloor
+x 6
+y 19
+end
+arch dirtfloor
+x 6
+y 20
+end
+arch cave2
+x 6
+y 20
+end
+arch cave_15
+x 6
+y 21
+end
+arch dirtfloor
+x 7
+end
+arch cave_15
+x 7
+end
+arch dirtfloor
+x 7
+y 1
+end
+arch cave4
+x 7
+y 1
+end
+arch dirtfloor
+x 7
+y 2
+end
+arch dirtfloor
+x 7
+y 3
+end
+arch cave2
+x 7
+y 3
+end
+arch dirtfloor
+x 7
+y 4
+end
+arch cave24
+x 7
+y 4
+end
+arch dirtfloor
+x 7
+y 5
+end
+arch cave3
+x 7
+y 5
+end
+arch dirtfloor
+x 7
+y 6
+end
+arch cave3
+x 7
+y 6
+end
+arch dirtfloor
+x 7
+y 7
+end
+arch cave9
+x 7
+y 7
+end
+arch dirtfloor
+x 7
+y 8
+end
+arch dirtfloor
+x 7
+y 9
+end
+arch dirtfloor
+x 7
+y 10
+end
+arch dirtfloor
+x 7
+y 11
+end
+arch dirtfloor
+x 7
+y 12
+end
+arch cave2
+x 7
+y 12
+end
+arch dirtfloor
+x 7
+y 13
+end
+arch cave_15
+x 7
+y 13
+end
+arch dirtfloor
+x 7
+y 14
+end
+arch cave_15
+x 7
+y 14
+end
+arch dirtfloor
+x 7
+y 15
+end
+arch cave_15
+x 7
+y 15
+end
+arch dirtfloor
+x 7
+y 16
+end
+arch cave_15
+x 7
+y 16
+end
+arch dirtfloor
+x 7
+y 17
+end
+arch cave25
+x 7
+y 17
+end
+arch dirtfloor
+x 7
+y 18
+end
+arch cave10
+x 7
+y 18
+end
+arch dirtfloor
+x 7
+y 19
+end
+arch dirtfloor
+x 7
+y 20
+end
+arch cave2
+x 7
+y 20
+end
+arch cave_15
+x 7
+y 21
+end
+arch dirtfloor
+x 8
+end
+arch cave_15
+x 8
+end
+arch dirtfloor
+x 8
+y 1
+end
+arch cave4
+x 8
+y 1
+end
+arch dirtfloor
+x 8
+y 2
+end
+arch dirtfloor
+x 8
+y 3
+end
+arch cave2
+x 8
+y 3
+end
+arch dirtfloor
+x 8
+y 4
+end
+arch cave4
+x 8
+y 4
+end
+arch dirtfloor
+x 8
+y 5
+end
 arch key
-x 5
-y 4
-end
-arch dirtfloor
-x 5
-y 5
-end
-arch bwall_0
-x 5
+x 8
 y 5
 end
 arch dirtfloor
-x 5
-y 6
-end
-arch bwall_0
-x 5
+x 8
 y 6
 end
 arch dirtfloor
-x 5
+x 8
 y 7
 end
 arch dirtfloor
-x 5
-y 8
-end
-arch bwall_0
-x 5
+x 8
 y 8
 end
 arch dirtfloor
-x 5
+x 8
 y 9
 end
-arch bwall_0
-x 5
+arch cave11
+x 8
 y 9
 end
 arch dirtfloor
-x 5
+x 8
+y 10
+end
+arch cave1
+x 8
 y 10
 end
 arch dirtfloor
-x 5
+x 8
+y 11
+end
+arch cave1
+x 8
 y 11
 end
 arch dirtfloor
-x 5
+x 8
 y 12
 end
-arch bwall_0
-x 5
+arch cave22
+x 8
 y 12
 end
 arch dirtfloor
-x 5
+x 8
+y 13
+end
+arch cave24
+x 8
 y 13
 end
 arch dirtfloor
-x 5
+x 8
+y 14
+end
+arch cave3
+x 8
 y 14
 end
 arch dirtfloor
-x 5
+x 8
+y 15
+end
+arch cave23
+x 8
 y 15
 end
 arch dirtfloor
-x 5
+x 8
+y 16
+end
+arch cave_15
+x 8
 y 16
 end
 arch dirtfloor
-x 5
+x 8
 y 17
 end
-arch bwall_0
-x 5
+arch cave24
+x 8
 y 17
 end
 arch dirtfloor
-x 5
+x 8
+y 18
+end
+arch cave9
+x 8
 y 18
 end
 arch dirtfloor
-x 5
-y 19
-end
-arch bwall_0
-x 5
+x 8
 y 19
 end
 arch dirtfloor
-x 6
+x 8
+y 20
 end
-arch bwall_0
-x 6
+arch cave2
+x 8
+y 20
+end
+arch cave_15
+x 8
+y 21
 end
 arch dirtfloor
-x 6
+x 9
+end
+arch cave_15
+x 9
+end
+arch dirtfloor
+x 9
 y 1
 end
-arch bwall_0
-x 6
+arch cave4
+x 9
 y 1
 end
 arch dirtfloor
-x 6
+x 9
 y 2
 end
 arch dirtfloor
-x 6
+x 9
 y 3
 end
-arch bwall_0
-x 6
+arch cave2
+x 9
 y 3
 end
 arch dirtfloor
-x 6
+x 9
 y 4
 end
-arch key
-x 6
+arch cave25
+x 9
 y 4
 end
 arch dirtfloor
-x 6
+x 9
+y 5
+end
+arch cave10
+x 9
 y 5
 end
 arch dirtfloor
-x 6
-y 6
-end
-arch bwall_0
-x 6
+x 9
 y 6
 end
 arch dirtfloor
-x 6
+x 9
 y 7
 end
 arch dirtfloor
-x 6
+x 9
 y 8
 end
-arch dirtfloor
-x 6
-y 9
-end
-arch bwall_0
-x 6
-y 9
-end
-arch dirtfloor
-x 6
-y 10
-end
-arch dirtfloor
-x 6
-y 11
-end
 arch goblin
-x 6
-y 11
-end
-arch dirtfloor
-x 6
-y 12
-end
-arch bwall_0
-x 6
-y 12
-end
-arch dirtfloor
-x 6
-y 13
-end
-arch bwall_0
-x 6
-y 13
-end
-arch dirtfloor
-x 6
-y 14
-end
-arch bwall_0
-x 6
-y 14
-end
-arch dirtfloor
-x 6
-y 15
-end
-arch bwall_0
-x 6
-y 15
-end
-arch dirtfloor
-x 6
-y 16
-end
-arch bwall_0
-x 6
-y 16
-end
-arch dirtfloor
-x 6
-y 17
-end
-arch bwall_0
-x 6
-y 17
-end
-arch dirtfloor
-x 6
-y 18
-end
-arch dirtfloor
-x 6
-y 19
-end
-arch bwall_0
-x 6
-y 19
-end
-arch dirtfloor
-x 7
-end
-arch bwall_0
-x 7
-end
-arch dirtfloor
-x 7
-y 1
-end
-arch bwall_0
-x 7
-y 1
-end
-arch dirtfloor
-x 7
-y 2
-end
-arch dirtfloor
-x 7
-y 3
-end
-arch bwall_0
-x 7
-y 3
-end
-arch dirtfloor
-x 7
-y 4
-end
-arch bwall_0
-x 7
-y 4
-end
-arch dirtfloor
-x 7
-y 5
-end
-arch dirtfloor
-x 7
-y 6
-end
-arch bwall_0
-x 7
-y 6
-end
-arch dirtfloor
-x 7
-y 7
-end
-arch bwall_0
-x 7
-y 7
-end
-arch dirtfloor
-x 7
-y 8
-end
-arch dirtfloor
-x 7
-y 9
-end
-arch bwall_0
-x 7
-y 9
-end
-arch dirtfloor
-x 7
-y 10
-end
-arch dirtfloor
-x 7
-y 11
-end
-arch dirtfloor
-x 7
-y 12
-end
-arch dirtfloor
-x 7
-y 13
-end
-arch dirtfloor
-x 7
-y 14
-end
-arch dirtfloor
-x 7
-y 15
-end
-arch dirtfloor
-x 7
-y 16
-end
-arch bwall_0
-x 7
-y 16
-end
-arch dirtfloor
-x 7
-y 17
-end
-arch bwall_0
-x 7
-y 17
-end
-arch dirtfloor
-x 7
-y 18
-end
-arch dirtfloor
-x 7
-y 19
-end
-arch bwall_0
-x 7
-y 19
-end
-arch dirtfloor
-x 8
-end
-arch bwall_0
-x 8
-end
-arch dirtfloor
-x 8
-y 1
-end
-arch bwall_0
-x 8
-y 1
-end
-arch dirtfloor
-x 8
-y 2
-end
-arch dirtfloor
-x 8
-y 3
-end
-arch dirtfloor
-x 8
-y 4
-end
-arch bwall_0
-x 8
-y 4
-end
-arch dirtfloor
-x 8
-y 5
-end
-arch dirtfloor
-x 8
-y 6
-end
-arch goblin
-x 8
-y 6
-end
-arch dirtfloor
-x 8
-y 7
-end
-arch bwall_0
-x 8
-y 7
-end
-arch dirtfloor
-x 8
-y 8
-end
-arch dirtfloor
-x 8
-y 9
-end
-arch dirtfloor
-x 8
-y 10
-end
-arch dirtfloor
-x 8
-y 11
-end
-arch bwall_0
-x 8
-y 11
-end
-arch dirtfloor
-x 8
-y 12
-end
-arch bwall_0
-x 8
-y 12
-end
-arch dirtfloor
-x 8
-y 13
-end
-arch bwall_0
-x 8
-y 13
-end
-arch dirtfloor
-x 8
-y 14
-end
-arch bwall_0
-x 8
-y 14
-end
-arch dirtfloor
-x 8
-y 15
-end
-arch dirtfloor
-x 8
-y 16
-end
-arch bwall_0
-x 8
-y 16
-end
-arch dirtfloor
-x 8
-y 17
-end
-arch bwall_0
-x 8
-y 17
-end
-arch dirtfloor
-x 8
-y 18
-end
-arch dirtfloor
-x 8
-y 19
-end
-arch bwall_0
-x 8
-y 19
-end
-arch dirtfloor
-x 9
-end
-arch bwall_0
-x 9
-end
-arch dirtfloor
-x 9
-y 1
-end
-arch bwall_0
-x 9
-y 1
-end
-arch dirtfloor
-x 9
-y 2
-end
-arch bwall_0
-x 9
-y 2
-end
-arch dirtfloor
-x 9
-y 3
-end
-arch dirtfloor
-x 9
-y 4
-end
-arch bwall_0
-x 9
-y 4
-end
-arch dirtfloor
-x 9
-y 5
-end
-arch bwall_0
-x 9
-y 5
-end
-arch dirtfloor
-x 9
-y 6
-end
-arch dirtfloor
-x 9
-y 7
-end
-arch dirtfloor
 x 9
 y 8
 end
@@ -1191,7 +1324,7 @@ arch dirtfloor
 x 9
 y 9
 end
-arch bwall_0
+arch cave2
 x 9
 y 9
 end
@@ -1199,7 +1332,7 @@ arch dirtfloor
 x 9
 y 10
 end
-arch bwall_0
+arch cave_15
 x 9
 y 10
 end
@@ -1207,7 +1340,7 @@ arch dirtfloor
 x 9
 y 11
 end
-arch bwall_0
+arch cave24
 x 9
 y 11
 end
@@ -1215,7 +1348,7 @@ arch dirtfloor
 x 9
 y 12
 end
-arch bwall_0
+arch cave3
 x 9
 y 12
 end
@@ -1223,7 +1356,7 @@ arch dirtfloor
 x 9
 y 13
 end
-arch bwall_0
+arch cave9
 x 9
 y 13
 end
@@ -1231,113 +1364,141 @@ arch dirtfloor
 x 9
 y 14
 end
-arch bwall_0
-x 9
-y 14
-end
 arch dirtfloor
 x 9
 y 15
 end
+arch cave12
+x 9
+y 15
+end
 arch dirtfloor
 x 9
 y 16
 end
+arch cave23
+x 9
+y 16
+end
 arch dirtfloor
 x 9
 y 17
 end
+arch cave4
+x 9
+y 17
+end
 arch dirtfloor
 x 9
 y 18
 end
-arch dirtfloor
-x 9
-y 19
-end
-arch bwall_0
-x 9
-y 19
-end
-arch dirtfloor
-x 10
-end
-arch bwall_0
-x 10
-end
-arch dirtfloor
-x 10
-y 1
-end
-arch bwall_0
-x 10
-y 1
-end
-arch dirtfloor
-x 10
-y 2
-end
-arch bwall_0
-x 10
-y 2
-end
-arch dirtfloor
-x 10
-y 3
-end
-arch dirtfloor
-x 10
-y 4
-end
-arch dirtfloor
-x 10
-y 5
-end
-arch bwall_0
-x 10
-y 5
-end
-arch dirtfloor
-x 10
-y 6
-end
-arch bwall_0
-x 10
-y 6
-end
-arch dirtfloor
-x 10
-y 7
-end
-arch dirtfloor
-x 10
-y 8
-end
-arch dirtfloor
-x 10
-y 9
-end
-arch bwall_0
-x 10
-y 9
-end
-arch dirtfloor
-x 10
-y 10
-end
-arch dirtfloor
-x 10
-y 11
-end
-arch dirtfloor
-x 10
-y 12
-end
-arch dirtfloor
-x 10
-y 13
-end
 arch generate_orc
+x 9
+y 18
+end
+arch dirtfloor
+x 9
+y 19
+end
+arch dirtfloor
+x 9
+y 20
+end
+arch cave2
+x 9
+y 20
+end
+arch cave_15
+x 9
+y 21
+end
+arch dirtfloor
+x 10
+end
+arch cave_15
+x 10
+end
+arch dirtfloor
+x 10
+y 1
+end
+arch cave4
+x 10
+y 1
+end
+arch dirtfloor
+x 10
+y 2
+end
+arch dirtfloor
+x 10
+y 3
+end
+arch cave12
+x 10
+y 3
+end
+arch dirtfloor
+x 10
+y 4
+end
+arch cave23
+x 10
+y 4
+end
+arch dirtfloor
+x 10
+y 5
+end
+arch cave25
+x 10
+y 5
+end
+arch dirtfloor
+x 10
+y 6
+end
+arch cave10
+x 10
+y 6
+end
+arch dirtfloor
+x 10
+y 7
+end
+arch dirtfloor
+x 10
+y 8
+end
+arch dirtfloor
+x 10
+y 9
+end
+arch cave2
+x 10
+y 9
+end
+arch dirtfloor
+x 10
+y 10
+end
+arch cave_15
+x 10
+y 10
+end
+arch dirtfloor
+x 10
+y 11
+end
+arch cave4
+x 10
+y 11
+end
+arch dirtfloor
+x 10
+y 12
+end
+arch dirtfloor
 x 10
 y 13
 end
@@ -1345,10 +1506,6 @@ arch dirtfloor
 x 10
 y 14
 end
-arch bwall_0
-x 10
-y 14
-end
 arch dirtfloor
 x 10
 y 15
@@ -1357,11 +1514,15 @@ arch dirtfloor
 x 10
 y 16
 end
+arch cave2
+x 10
+y 16
+end
 arch dirtfloor
 x 10
 y 17
 end
-arch bwall_0
+arch cave4
 x 10
 y 17
 end
@@ -1369,31 +1530,33 @@ arch dirtfloor
 x 10
 y 18
 end
-arch firewall
-x 10
-y 18
-arch spell_small_fireball
-end
-end
 arch dirtfloor
 x 10
 y 19
 end
-arch bwall_0
+arch dirtfloor
 x 10
-y 19
+y 20
+end
+arch cave2
+x 10
+y 20
+end
+arch cave_15
+x 10
+y 21
 end
 arch dirtfloor
 x 11
 end
-arch bwall_0
+arch cave_15
 x 11
 end
 arch dirtfloor
 x 11
 y 1
 end
-arch bwall_0
+arch cave4
 x 11
 y 1
 end
@@ -1401,31 +1564,31 @@ arch dirtfloor
 x 11
 y 2
 end
-arch bwall_0
-x 11
-y 2
-end
 arch dirtfloor
 x 11
 y 3
 end
-arch bwall_0
-x 11
-y 3
-end
 arch dirtfloor
 x 11
 y 4
 end
+arch cave12
+x 11
+y 4
+end
 arch dirtfloor
 x 11
 y 5
 end
+arch cave23
+x 11
+y 5
+end
 arch dirtfloor
 x 11
 y 6
 end
-arch bwall_0
+arch cave25
 x 11
 y 6
 end
@@ -1433,7 +1596,7 @@ arch dirtfloor
 x 11
 y 7
 end
-arch bwall_0
+arch cave10
 x 11
 y 7
 end
@@ -1441,15 +1604,11 @@ arch dirtfloor
 x 11
 y 8
 end
-arch bwall_0
-x 11
-y 8
-end
 arch dirtfloor
 x 11
 y 9
 end
-arch bwall_0
+arch cave2
 x 11
 y 9
 end
@@ -1457,23 +1616,39 @@ arch dirtfloor
 x 11
 y 10
 end
+arch cave_15
+x 11
+y 10
+end
 arch dirtfloor
 x 11
 y 11
 end
+arch cave25
+x 11
+y 11
+end
 arch dirtfloor
 x 11
 y 12
 end
+arch cave1
+x 11
+y 12
+end
 arch dirtfloor
 x 11
 y 13
 end
+arch cave1
+x 11
+y 13
+end
 arch dirtfloor
 x 11
 y 14
 end
-arch bwall_0
+arch cave10
 x 11
 y 14
 end
@@ -1481,19 +1656,19 @@ arch dirtfloor
 x 11
 y 15
 end
-arch bwall_0
-x 11
-y 15
-end
 arch dirtfloor
 x 11
 y 16
 end
+arch cave12
+x 11
+y 16
+end
 arch dirtfloor
 x 11
 y 17
 end
-arch mouse
+arch cave9
 x 11
 y 17
 end
@@ -1501,29 +1676,33 @@ arch dirtfloor
 x 11
 y 18
 end
-arch bwall_0
-x 11
-y 18
-end
 arch dirtfloor
 x 11
 y 19
 end
-arch bwall_0
+arch dirtfloor
 x 11
-y 19
+y 20
+end
+arch cave2
+x 11
+y 20
+end
+arch cave_15
+x 11
+y 21
 end
 arch dirtfloor
 x 12
 end
-arch bwall_0
+arch cave_15
 x 12
 end
 arch dirtfloor
 x 12
 y 1
 end
-arch bwall_0
+arch cave25
 x 12
 y 1
 end
@@ -1531,7 +1710,7 @@ arch dirtfloor
 x 12
 y 2
 end
-arch bwall_0
+arch cave10
 x 12
 y 2
 end
@@ -1539,31 +1718,31 @@ arch dirtfloor
 x 12
 y 3
 end
-arch bwall_0
-x 12
-y 3
-end
 arch dirtfloor
 x 12
 y 4
 end
-arch bwall_0
-x 12
-y 4
-end
 arch dirtfloor
 x 12
 y 5
 end
+arch cave12
+x 12
+y 5
+end
 arch dirtfloor
 x 12
 y 6
 end
+arch cave23
+x 12
+y 6
+end
 arch dirtfloor
 x 12
 y 7
 end
-arch bwall_0
+arch cave25
 x 12
 y 7
 end
@@ -1571,7 +1750,7 @@ arch dirtfloor
 x 12
 y 8
 end
-arch bwall_0
+arch cave1
 x 12
 y 8
 end
@@ -1579,7 +1758,7 @@ arch dirtfloor
 x 12
 y 9
 end
-arch bwall_0
+arch cave22
 x 12
 y 9
 end
@@ -1587,38 +1766,50 @@ arch dirtfloor
 x 12
 y 10
 end
+arch cave_15
+x 12
+y 10
+end
 arch dirtfloor
 x 12
 y 11
 end
+arch cave_15
+x 12
+y 11
+end
 arch dirtfloor
 x 12
 y 12
 end
+arch cave_15
+x 12
+y 12
+end
 arch dirtfloor
 x 12
 y 13
 end
+arch cave_15
+x 12
+y 13
+end
 arch dirtfloor
 x 12
 y 14
 end
+arch cave4
+x 12
+y 14
+end
 arch dirtfloor
 x 12
 y 15
 end
-arch bwall_0
-x 12
-y 15
-end
 arch dirtfloor
 x 12
 y 16
 end
-arch bwall_0
-x 12
-y 16
-end
 arch dirtfloor
 x 12
 y 17
@@ -1631,21 +1822,29 @@ arch dirtfloor
 x 12
 y 19
 end
-arch bwall_0
+arch dirtfloor
 x 12
-y 19
+y 20
+end
+arch cave2
+x 12
+y 20
+end
+arch cave_15
+x 12
+y 21
 end
 arch dirtfloor
 x 13
 end
-arch bwall_0
+arch cave_15
 x 13
 end
 arch dirtfloor
 x 13
 y 1
 end
-arch bwall_0
+arch cave_15
 x 13
 y 1
 end
@@ -1653,7 +1852,7 @@ arch dirtfloor
 x 13
 y 2
 end
-arch bwall_0
+arch cave25
 x 13
 y 2
 end
@@ -1661,7 +1860,7 @@ arch dirtfloor
 x 13
 y 3
 end
-arch bwall_0
+arch cave10
 x 13
 y 3
 end
@@ -1669,31 +1868,31 @@ arch dirtfloor
 x 13
 y 4
 end
-arch bwall_0
-x 13
-y 4
-end
 arch dirtfloor
 x 13
 y 5
 end
-arch bwall_0
-x 13
-y 5
-end
 arch dirtfloor
 x 13
 y 6
 end
+arch cave12
+x 13
+y 6
+end
 arch dirtfloor
 x 13
 y 7
 end
+arch cave23
+x 13
+y 7
+end
 arch dirtfloor
 x 13
 y 8
 end
-arch bwall_0
+arch cave_15
 x 13
 y 8
 end
@@ -1701,7 +1900,7 @@ arch dirtfloor
 x 13
 y 9
 end
-arch bwall_0
+arch cave24
 x 13
 y 9
 end
@@ -1709,7 +1908,7 @@ arch dirtfloor
 x 13
 y 10
 end
-arch bwall_0
+arch cave3
 x 13
 y 10
 end
@@ -1717,838 +1916,1483 @@ arch dirtfloor
 x 13
 y 11
 end
+arch cave3
+x 13
+y 11
+end
+arch dirtfloor
+x 13
+y 12
+end
+arch cave3
+x 13
+y 12
+end
+arch dirtfloor
+x 13
+y 13
+end
+arch cave23
+x 13
+y 13
+end
+arch dirtfloor
+x 13
+y 14
+end
+arch cave25
+x 13
+y 14
+end
+arch dirtfloor
+x 13
+y 15
+end
+arch cave10
+x 13
+y 15
+end
+arch dirtfloor
+x 13
+y 16
+end
+arch dirtfloor
+x 13
+y 17
+end
+arch dirtfloor
+x 13
+y 18
+end
+arch dirtfloor
+x 13
+y 19
+end
+arch cave11
+x 13
+y 19
+end
+arch dirtfloor
+x 13
+y 20
+end
+arch cave22
+x 13
+y 20
+end
+arch cave_15
+x 13
+y 21
+end
+arch dirtfloor
+x 14
+end
+arch cave_15
+x 14
+end
+arch dirtfloor
+x 14
+y 1
+end
+arch cave_15
+x 14
+y 1
+end
+arch dirtfloor
+x 14
+y 2
+end
+arch cave_15
+x 14
+y 2
+end
+arch dirtfloor
+x 14
+y 3
+end
+arch cave25
+x 14
+y 3
+end
+arch dirtfloor
+x 14
+y 4
+end
+arch cave10
+x 14
+y 4
+end
+arch dirtfloor
+x 14
+y 5
+end
+arch dirtfloor
+x 14
+y 6
+end
+arch dirtfloor
+x 14
+y 7
+end
+arch cave12
+x 14
+y 7
+end
+arch dirtfloor
+x 14
+y 8
+end
+arch cave23
+x 14
+y 8
+end
+arch dirtfloor
+x 14
+y 9
+end
+arch cave4
+x 14
+y 9
+end
+arch dirtfloor
+x 14
+y 10
+end
+arch dirtfloor
+x 14
+y 11
+end
 arch generate_gnoll
-x 13
+x 14
 y 11
 end
 arch dirtfloor
-x 13
+x 14
 y 12
 end
 arch dirtfloor
-x 13
+x 14
+y 13
+end
+arch cave12
+x 14
 y 13
 end
 arch dirtfloor
-x 13
+x 14
 y 14
 end
+arch cave23
+x 14
+y 14
+end
+arch dirtfloor
+x 14
+y 15
+end
+arch cave25
+x 14
+y 15
+end
+arch dirtfloor
+x 14
+y 16
+end
+arch cave10
+x 14
+y 16
+end
+arch dirtfloor
+x 14
+y 17
+end
+arch mouse
+x 14
+y 17
+end
+arch dirtfloor
+x 14
+y 18
+end
+arch dirtfloor
+x 14
+y 19
+end
+arch cave12
+x 14
+y 19
+end
+arch dirtfloor
+x 14
+y 20
+end
+arch cave23
+x 14
+y 20
+end
+arch cave_15
+x 14
+y 21
+end
+arch dirtfloor
+x 15
+end
+arch cave_15
+x 15
+end
+arch dirtfloor
+x 15
+y 1
+end
+arch cave_15
+x 15
+y 1
+end
+arch dirtfloor
+x 15
+y 2
+end
+arch cave_15
+x 15
+y 2
+end
+arch dirtfloor
+x 15
+y 3
+end
+arch cave_15
+x 15
+y 3
+end
+arch dirtfloor
+x 15
+y 4
+end
+arch cave25
+x 15
+y 4
+end
+arch dirtfloor
+x 15
+y 5
+end
+arch cave10
+x 15
+y 5
+end
+arch dirtfloor
+x 15
+y 6
+end
+arch dirtfloor
+x 15
+y 7
+end
+arch dirtfloor
+x 15
+y 8
+end
+arch cave2
+x 15
+y 8
+end
+arch dirtfloor
+x 15
+y 9
+end
+arch cave4
+x 15
+y 9
+end
+arch dirtfloor
+x 15
+y 10
+end
 arch random_talisman
-x 13
-y 14
-end
-arch dirtfloor
-x 13
-y 15
-end
-arch dirtfloor
-x 13
-y 16
-end
-arch bwall_0
-x 13
-y 16
-end
-arch dirtfloor
-x 13
-y 17
-end
-arch bwall_0
-x 13
-y 17
-end
-arch dirtfloor
-x 13
-y 18
-end
-arch dirtfloor
-x 13
-y 19
-end
-arch bwall_0
-x 13
-y 19
-end
-arch dirtfloor
-x 14
-end
-arch bwall_0
-x 14
-end
-arch dirtfloor
-x 14
-y 1
-end
-arch bwall_0
-x 14
-y 1
-end
-arch dirtfloor
-x 14
-y 2
-end
-arch dirtfloor
-x 14
-y 3
-end
-arch dirtfloor
-x 14
-y 4
-end
-arch dirtfloor
-x 14
-y 5
-end
-arch bwall_0
-x 14
-y 5
-end
-arch dirtfloor
-x 14
-y 6
-end
-arch bwall_0
-x 14
-y 6
-end
-arch dirtfloor
-x 14
-y 7
-end
-arch dirtfloor
-x 14
-y 8
-end
-arch earthwall
-x 14
-y 8
-end
-arch dirtfloor
-x 14
-y 9
-end
-arch earthwall
-x 14
-y 9
-end
-arch dirtfloor
-x 14
-y 10
-end
-arch bwall_0
-x 14
+x 15
 y 10
 end
 arch dirtfloor
-x 14
-y 11
-end
-arch bwall_0
-x 14
+x 15
 y 11
 end
 arch dirtfloor
-x 14
-y 12
-end
-arch bwall_0
-x 14
+x 15
 y 12
 end
 arch dirtfloor
-x 14
+x 15
 y 13
 end
 arch dirtfloor
-x 14
+x 15
+y 14
+end
+arch cave12
+x 15
 y 14
 end
 arch dirtfloor
-x 14
+x 15
+y 15
+end
+arch cave23
+x 15
 y 15
 end
 arch dirtfloor
-x 14
+x 15
+y 16
+end
+arch cave25
+x 15
 y 16
 end
 arch dirtfloor
-x 14
+x 15
 y 17
 end
-arch bwall_0
-x 14
+arch cave10
+x 15
 y 17
 end
 arch dirtfloor
-x 14
+x 15
 y 18
 end
 arch dirtfloor
-x 14
-y 19
-end
-arch bwall_0
-x 14
+x 15
 y 19
 end
 arch dirtfloor
 x 15
+y 20
 end
-arch bwall_0
+arch cave2
 x 15
+y 20
+end
+arch cave_15
+x 15
+y 21
 end
 arch dirtfloor
-x 15
+x 16
+end
+arch cave_15
+x 16
+end
+arch dirtfloor
+x 16
 y 1
 end
-arch bwall_0
-x 15
+arch cave24
+x 16
 y 1
 end
 arch dirtfloor
-x 15
+x 16
+y 2
+end
+arch cave3
+x 16
+y 2
+end
+arch dirtfloor
+x 16
+y 3
+end
+arch cave3
+x 16
+y 3
+end
+arch dirtfloor
+x 16
+y 4
+end
+arch cave3
+x 16
+y 4
+end
+arch dirtfloor
+x 16
+y 5
+end
+arch cave9
+x 16
+y 5
+end
+arch dirtfloor
+x 16
+y 6
+end
+arch dirtfloor
+x 16
+y 7
+end
+arch dirtfloor
+x 16
+y 8
+end
+arch cave2
+x 16
+y 8
+end
+arch dirtfloor
+x 16
+y 9
+end
+arch cave25
+x 16
+y 9
+end
+arch dirtfloor
+x 16
+y 10
+end
+arch cave1
+x 16
+y 10
+end
+arch dirtfloor
+x 16
+y 11
+end
+arch cave1
+x 16
+y 11
+end
+arch dirtfloor
+x 16
+y 12
+end
+arch cave10
+x 16
+y 12
+end
+arch dirtfloor
+x 16
+y 13
+end
+arch dirtfloor
+x 16
+y 14
+end
+arch dirtfloor
+x 16
+y 15
+end
+arch cave12
+x 16
+y 15
+end
+arch dirtfloor
+x 16
+y 16
+end
+arch cave23
+x 16
+y 16
+end
+arch dirtfloor
+x 16
+y 17
+end
+arch cave25
+x 16
+y 17
+end
+arch dirtfloor
+x 16
+y 18
+end
+arch cave10
+x 16
+y 18
+end
+arch dirtfloor
+x 16
+y 19
+end
+arch dirtfloor
+x 16
+y 20
+end
+arch cave2
+x 16
+y 20
+end
+arch cave_15
+x 16
+y 21
+end
+arch dirtfloor
+x 17
+end
+arch cave_15
+x 17
+end
+arch dirtfloor
+x 17
+y 1
+end
+arch cave4
+x 17
+y 1
+end
+arch dirtfloor
+x 17
 y 2
 end
 arch mouse
-x 15
+x 17
 y 2
 end
 arch dirtfloor
-x 15
-y 3
-end
-arch bwall_0
-x 15
+x 17
 y 3
 end
 arch dirtfloor
-x 15
+x 17
 y 4
 end
 arch dirtfloor
-x 15
+x 17
 y 5
 end
 arch dirtfloor
-x 15
-y 6
-end
-arch bwall_0
-x 15
+x 17
 y 6
 end
 arch dirtfloor
-x 15
-y 7
-end
-arch bwall_0
-x 15
+x 17
 y 7
 end
 arch dirtfloor
-x 15
+x 17
 y 8
 end
-arch bwall_0
-x 15
+arch cave12
+x 17
 y 8
 end
 arch dirtfloor
-x 15
+x 17
+y 9
+end
+arch cave3
+x 17
 y 9
 end
 arch dirtfloor
-x 15
+x 17
+y 10
+end
+arch cave3
+x 17
 y 10
 end
 arch dirtfloor
-x 15
+x 17
+y 11
+end
+arch cave23
+x 17
 y 11
 end
 arch dirtfloor
-x 15
+x 17
 y 12
 end
-arch bwall_0
-x 15
+arch cave25
+x 17
 y 12
 end
 arch dirtfloor
-x 15
+x 17
 y 13
 end
-arch bwall_0
-x 15
+arch cave10
+x 17
 y 13
 end
 arch dirtfloor
-x 15
-y 14
-end
-arch bwall_0
-x 15
+x 17
 y 14
 end
 arch dirtfloor
-x 15
-y 15
-end
-arch bwall_0
-x 15
+x 17
 y 15
 end
 arch dirtfloor
-x 15
+x 17
+y 16
+end
+arch cave12
+x 17
 y 16
 end
 arch dirtfloor
-x 15
+x 17
 y 17
 end
-arch bwall_0
-x 15
+arch cave23
+x 17
 y 17
 end
 arch dirtfloor
-x 15
+x 17
+y 18
+end
+arch cave4
+x 17
 y 18
 end
 arch dirtfloor
-x 15
-y 19
-end
-arch bwall_0
-x 15
+x 17
 y 19
 end
 arch dirtfloor
-x 16
+x 17
+y 20
 end
-arch bwall_0
-x 16
+arch cave2
+x 17
+y 20
+end
+arch cave_15
+x 17
+y 21
 end
 arch dirtfloor
-x 16
+x 18
+end
+arch cave_15
+x 18
+end
+arch dirtfloor
+x 18
 y 1
 end
-arch bwall_0
-x 16
+arch cave4
+x 18
 y 1
 end
 arch dirtfloor
-x 16
-y 2
-end
-arch mouse
-x 16
+x 18
 y 2
 end
 arch dirtfloor
-x 16
-y 3
-end
-arch bwall_0
-x 16
+x 18
 y 3
 end
 arch dirtfloor
-x 16
-y 4
-end
-arch bwall_0
-x 16
+x 18
 y 4
 end
 arch dirtfloor
-x 16
+x 18
 y 5
 end
 arch dirtfloor
-x 16
+x 18
 y 6
 end
 arch dirtfloor
-x 16
+x 18
 y 7
 end
 arch dirtfloor
-x 16
-y 8
-end
-arch bwall_0
-x 16
+x 18
 y 8
 end
 arch dirtfloor
-x 16
-y 9
-end
-arch bwall_0
-x 16
+x 18
 y 9
 end
 arch dirtfloor
-x 16
-y 10
-end
-arch bwall_0
-x 16
+x 18
 y 10
 end
 arch dirtfloor
-x 16
+x 18
+y 11
+end
+arch cave12
+x 18
 y 11
 end
 arch dirtfloor
-x 16
+x 18
+y 12
+end
+arch cave23
+x 18
 y 12
 end
 arch dirtfloor
-x 16
+x 18
 y 13
 end
-arch bwall_0
-x 16
+arch cave25
+x 18
 y 13
 end
 arch dirtfloor
-x 16
+x 18
 y 14
 end
-arch bwall_0
-x 16
+arch cave10
+x 18
 y 14
 end
 arch dirtfloor
-x 16
-y 15
-end
-arch bwall_0
-x 16
+x 18
 y 15
 end
 arch dirtfloor
-x 16
+x 18
+y 16
+end
+arch dirtfloor
+x 18
+y 17
+end
+arch cave2
+x 18
+y 17
+end
+arch dirtfloor
+x 18
+y 18
+end
+arch cave4
+x 18
+y 18
+end
+arch dirtfloor
+x 18
+y 19
+end
+arch dirtfloor
+x 18
+y 20
+end
+arch cave2
+x 18
+y 20
+end
+arch cave_15
+x 18
+y 21
+end
+arch dirtfloor
+x 19
+end
+arch cave_15
+x 19
+end
+arch dirtfloor
+x 19
+y 1
+end
+arch cave4
+x 19
+y 1
+end
+arch dirtfloor
+x 19
+y 2
+end
+arch dirtfloor
+x 19
+y 3
+end
+arch cave11
+x 19
+y 3
+end
+arch dirtfloor
+x 19
+y 4
+end
+arch cave1
+x 19
+y 4
+end
+arch dirtfloor
+x 19
+y 5
+end
+arch cave10
+x 19
+y 5
+end
+arch dirtfloor
+x 19
+y 6
+end
+arch dirtfloor
+x 19
+y 7
+end
+arch cave11
+x 19
+y 7
+end
+arch dirtfloor
+x 19
+y 8
+end
+arch cave1
+x 19
+y 8
+end
+arch dirtfloor
+x 19
+y 9
+end
+arch cave10
+x 19
+y 9
+end
+arch dirtfloor
+x 19
+y 10
+end
+arch dirtfloor
+x 19
+y 11
+end
+arch dirtfloor
+x 19
+y 12
+end
+arch cave12
+x 19
+y 12
+end
+arch dirtfloor
+x 19
+y 13
+end
+arch cave23
+x 19
+y 13
+end
+arch dirtfloor
+x 19
+y 14
+end
+arch cave25
+x 19
+y 14
+end
+arch dirtfloor
+x 19
+y 15
+end
+arch cave10
+x 19
+y 15
+end
+arch dirtfloor
+x 19
 y 16
 end
 arch door_1
-x 16
+x 19
 y 16
 end
 arch dirtfloor
-x 16
+x 19
 y 17
 end
-arch bwall_0
-x 16
+arch cave12
+x 19
 y 17
 end
 arch dirtfloor
-x 16
+x 19
+y 18
+end
+arch cave9
+x 19
 y 18
 end
 arch dirtfloor
-x 16
-y 19
-end
-arch bwall_0
-x 16
+x 19
 y 19
 end
 arch dirtfloor
-x 17
+x 19
+y 20
 end
-arch bwall_0
-x 17
+arch cave2
+x 19
+y 20
+end
+arch cave_15
+x 19
+y 21
 end
 arch dirtfloor
-x 17
+x 20
+end
+arch cave_15
+x 20
+end
+arch dirtfloor
+x 20
 y 1
 end
-arch bwall_0
-x 17
+arch cave4
+x 20
 y 1
 end
 arch dirtfloor
-x 17
+x 20
 y 2
 end
 arch dirtfloor
-x 17
+x 20
 y 3
 end
-arch bwall_0
-x 17
+arch cave12
+x 20
 y 3
 end
 arch dirtfloor
-x 17
+x 20
 y 4
 end
-arch bwall_0
-x 17
+arch cave23
+x 20
 y 4
 end
 arch dirtfloor
-x 17
+x 20
 y 5
 end
-arch bwall_0
-x 17
+arch cave4
+x 20
 y 5
 end
 arch dirtfloor
-x 17
+x 20
 y 6
 end
-arch bwall_0
-x 17
+arch mouse
+x 20
 y 6
 end
 arch dirtfloor
-x 17
+x 20
+y 7
+end
+arch cave2
+x 20
 y 7
 end
 arch dirtfloor
-x 17
+x 20
 y 8
 end
-arch bwall_0
-x 17
+arch cave_15
+x 20
 y 8
 end
 arch dirtfloor
-x 17
+x 20
 y 9
 end
-arch bwall_0
-x 17
+arch cave25
+x 20
 y 9
 end
 arch dirtfloor
-x 17
+x 20
 y 10
 end
-arch bwall_0
-x 17
+arch cave10
+x 20
 y 10
 end
 arch dirtfloor
-x 17
-y 11
-end
-arch bwall_0
-x 17
+x 20
 y 11
 end
 arch dirtfloor
-x 17
+x 20
 y 12
 end
 arch dirtfloor
-x 17
+x 20
+y 13
+end
+arch cave12
+x 20
 y 13
 end
 arch dirtfloor
-x 17
+x 20
+y 14
+end
+arch cave23
+x 20
 y 14
 end
 arch dirtfloor
-x 17
+x 20
 y 15
 end
-arch bwall_0
-x 17
+arch cave4
+x 20
 y 15
 end
 arch dirtfloor
-x 17
+x 20
 y 16
 end
 arch dirtfloor
-x 17
+x 20
 y 17
 end
 arch dirtfloor
-x 17
+x 20
 y 18
 end
 arch dirtfloor
-x 17
-y 19
-end
-arch bwall_0
-x 17
+x 20
 y 19
 end
 arch dirtfloor
-x 18
+x 20
+y 20
 end
-arch bwall_0
-x 18
+arch cave2
+x 20
+y 20
+end
+arch cave_15
+x 20
+y 21
 end
 arch dirtfloor
-x 18
+x 21
+end
+arch cave_15
+x 21
+end
+arch dirtfloor
+x 21
 y 1
 end
-arch bwall_0
-x 18
+arch cave4
+x 21
 y 1
 end
 arch dirtfloor
-x 18
+x 21
 y 2
 end
 arch dirtfloor
-x 18
+x 21
 y 3
 end
 arch dirtfloor
-x 18
+x 21
 y 4
 end
-arch bwall_0
-x 18
+arch cave2
+x 21
 y 4
 end
 arch dirtfloor
-x 18
+x 21
+y 5
+end
+arch cave25
+x 21
 y 5
 end
 arch dirtfloor
-x 18
+x 21
+y 6
+end
+arch cave1
+x 21
 y 6
 end
 arch dirtfloor
-x 18
+x 21
+y 7
+end
+arch cave22
+x 21
 y 7
 end
 arch dirtfloor
-x 18
+x 21
+y 8
+end
+arch cave_15
+x 21
 y 8
 end
 arch dirtfloor
-x 18
+x 21
+y 9
+end
+arch cave_15
+x 21
 y 9
 end
 arch dirtfloor
-x 18
+x 21
+y 10
+end
+arch cave25
+x 21
 y 10
 end
 arch dirtfloor
-x 18
+x 21
+y 11
+end
+arch cave10
+x 21
 y 11
 end
 arch dirtfloor
-x 18
+x 21
 y 12
 end
 arch dirtfloor
-x 18
+x 21
 y 13
 end
-arch bwall_0
-x 18
+arch key
+x 21
 y 13
 end
 arch dirtfloor
-x 18
+x 21
 y 14
 end
-arch bwall_0
-x 18
+arch cave2
+x 21
 y 14
 end
 arch dirtfloor
-x 18
+x 21
 y 15
 end
-arch bwall_0
-x 18
+arch cave25
+x 21
 y 15
 end
 arch dirtfloor
-x 18
+x 21
 y 16
 end
-arch bwall_0
-x 18
+arch cave10
+x 21
 y 16
 end
 arch dirtfloor
-x 18
+x 21
+y 17
+end
+arch generate_orc
+x 21
 y 17
 end
 arch dirtfloor
-x 18
+x 21
 y 18
 end
 arch dirtfloor
-x 18
-y 19
-end
-arch bwall_0
-x 18
+x 21
 y 19
 end
 arch dirtfloor
-x 19
+x 21
+y 20
 end
-arch bwall_0
-x 19
+arch cave2
+x 21
+y 20
+end
+arch cave_15
+x 21
+y 21
 end
 arch dirtfloor
-x 19
+x 22
+end
+arch cave_15
+x 22
+end
+arch dirtfloor
+x 22
 y 1
 end
-arch bwall_0
-x 19
+arch cave25
+x 22
 y 1
 end
 arch dirtfloor
-x 19
+x 22
 y 2
 end
-arch bwall_0
-x 19
+arch cave10
+x 22
 y 2
 end
 arch dirtfloor
-x 19
+x 22
 y 3
 end
-arch oakdoor_1
+arch dirtfloor
+x 22
+y 4
+end
+arch cave2
+x 22
+y 4
+end
+arch dirtfloor
+x 22
+y 5
+end
+arch cave_15
+x 22
+y 5
+end
+arch dirtfloor
+x 22
+y 6
+end
+arch cave_15
+x 22
+y 6
+end
+arch dirtfloor
+x 22
+y 7
+end
+arch cave_15
+x 22
+y 7
+end
+arch dirtfloor
+x 22
+y 8
+end
+arch cave_15
+x 22
+y 8
+end
+arch dirtfloor
+x 22
+y 9
+end
+arch cave_15
+x 22
+y 9
+end
+arch dirtfloor
+x 22
+y 10
+end
+arch cave_15
+x 22
+y 10
+end
+arch dirtfloor
+x 22
+y 11
+end
+arch cave25
+x 22
+y 11
+end
+arch dirtfloor
+x 22
+y 12
+end
+arch cave1
+x 22
+y 12
+end
+arch dirtfloor
+x 22
+y 13
+end
+arch cave1
+x 22
+y 13
+end
+arch dirtfloor
+x 22
+y 14
+end
+arch cave22
+x 22
+y 14
+end
+arch dirtfloor
+x 22
+y 15
+end
+arch cave_15
+x 22
+y 15
+end
+arch dirtfloor
+x 22
+y 16
+end
+arch cave25
+x 22
+y 16
+end
+arch dirtfloor
+x 22
+y 17
+end
+arch cave1
+x 22
+y 17
+end
+arch dirtfloor
+x 22
+y 18
+end
+arch cave1
+x 22
+y 18
+end
+arch dirtfloor
+x 22
+y 19
+end
+arch cave1
+x 22
+y 19
+end
+arch dirtfloor
+x 22
+y 20
+end
+arch cave22
+x 22
+y 20
+end
+arch cave_15
+x 22
+y 21
+end
+arch cave_15
+x 23
+end
+arch cave_15
+x 23
+y 1
+end
+arch dirtfloor
+x 23
+y 2
+end
+arch cave4
+x 23
+y 2
+end
+arch dirtfloor
+x 23
+y 3
+end
+arch invis_exit
 slaying /world/world_105_116
 hp 9
 sp 21
-x 19
+x 23
 y 3
 end
 arch dirtfloor
-x 19
+x 23
 y 4
 end
-arch bwall_0
-x 19
+arch cave2
+x 23
 y 4
 end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 5
 end
-arch bwall_0
-x 19
-y 5
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 6
 end
-arch bwall_0
-x 19
-y 6
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 7
 end
-arch bwall_0
-x 19
-y 7
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 8
 end
-arch bwall_0
-x 19
-y 8
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 9
 end
-arch bwall_0
-x 19
-y 9
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 10
 end
-arch bwall_0
-x 19
-y 10
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 11
 end
-arch bwall_0
-x 19
-y 11
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 12
 end
-arch bwall_0
-x 19
-y 12
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 13
 end
-arch bwall_0
-x 19
-y 13
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 14
 end
-arch bwall_0
-x 19
-y 14
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 15
 end
-arch bwall_0
-x 19
-y 15
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 16
 end
-arch bwall_0
-x 19
-y 16
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 17
 end
-arch bwall_0
-x 19
-y 17
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 18
 end
-arch bwall_0
-x 19
-y 18
-end
-arch dirtfloor
-x 19
+arch cave_15
+x 23
 y 19
 end
-arch bwall_0
-x 19
-y 19
+arch cave_15
+x 23
+y 20
+end
+arch cave_15
+x 23
+y 21
 end
diff --git a/world/world_105_116 b/world/world_105_116
index 845ca1bd9..b3863bd64 100644
--- a/world/world_105_116
+++ b/world/world_105_116
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-01-09 Rick Tanner
+Modified: 2012-06-24 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_115
@@ -3146,7 +3146,7 @@ end
 arch mountain_cave
 name Goblin Den
 slaying /scorn/dtabb/cave3
-hp 19
+hp 22
 sp 3
 x 9
 y 21