From a8b09a528a985f1e12110f7da30659a2d5b82862 Mon Sep 17 00:00:00 2001
From: anmaster <anmaster@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 3 Jun 2008 19:34:21 +0000
Subject: [PATCH] Add missing floor tiles under walls to
 /lake_country/Butakis/prison_s and make the books appear on top of the tables
 in /lake_country/Butakis/Rlib2.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9226 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 lake_country/Butakis/Rlib2    |  45 ++++
 lake_country/Butakis/prison_s | 442 +++++++++++++++++++++++++++++++++-
 2 files changed, 480 insertions(+), 7 deletions(-)

diff --git a/lake_country/Butakis/Rlib2 b/lake_country/Butakis/Rlib2
index 1af08d0b0..ad200650a 100644
--- a/lake_country/Butakis/Rlib2
+++ b/lake_country/Butakis/Rlib2
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1995-03-28 Kundi, Xue (xkd@soda.csua.berkeley.edu)
+Modified: 2008-06-01 Arvid Norlander
 endmsg
 end
 arch marble
@@ -205,6 +206,7 @@ end
 arch table_3
 x 2
 y 1
+no_pick 1
 end
 arch scroll
 x 2
@@ -242,6 +244,7 @@ end
 arch table_3
 x 2
 y 6
+no_pick 1
 end
 arch scroll
 x 2
@@ -263,6 +266,7 @@ end
 arch table_3
 x 2
 y 8
+no_pick 1
 end
 arch book_read
 name thin book
@@ -311,6 +315,7 @@ end
 arch table_3
 x 2
 y 14
+no_pick 1
 end
 arch book_read
 x 2
@@ -338,6 +343,7 @@ end
 arch table_3
 x 3
 y 1
+no_pick 1
 end
 arch scroll
 x 3
@@ -355,6 +361,7 @@ end
 arch table_3
 x 3
 y 3
+no_pick 1
 end
 arch scroll
 x 3
@@ -380,6 +387,7 @@ end
 arch table_3
 x 3
 y 6
+no_pick 1
 end
 arch scroll
 x 3
@@ -401,6 +409,7 @@ end
 arch table_3
 x 3
 y 8
+no_pick 1
 end
 arch book_read
 name rune covered book
@@ -426,6 +435,7 @@ end
 arch table_3
 x 3
 y 10
+no_pick 1
 end
 arch book_read
 x 3
@@ -447,6 +457,7 @@ end
 arch table_3
 x 3
 y 12
+no_pick 1
 end
 arch book_read
 x 3
@@ -464,6 +475,7 @@ end
 arch table_3
 x 3
 y 14
+no_pick 1
 end
 arch book_read
 x 3
@@ -491,6 +503,7 @@ end
 arch table_3
 x 4
 y 1
+no_pick 1
 end
 arch scroll
 x 4
@@ -508,6 +521,7 @@ end
 arch table_3
 x 4
 y 3
+no_pick 1
 end
 arch scroll
 x 4
@@ -533,6 +547,7 @@ end
 arch table_3
 x 4
 y 6
+no_pick 1
 end
 arch scroll
 x 4
@@ -554,6 +569,7 @@ end
 arch table_3
 x 4
 y 8
+no_pick 1
 end
 arch book_read
 name white book
@@ -585,6 +601,7 @@ end
 arch table_3
 x 4
 y 10
+no_pick 1
 end
 arch book_read
 x 4
@@ -606,6 +623,7 @@ end
 arch table_3
 x 4
 y 12
+no_pick 1
 end
 arch book_read
 x 4
@@ -623,6 +641,7 @@ end
 arch table_3
 x 4
 y 14
+no_pick 1
 end
 arch book_read
 x 4
@@ -650,6 +669,7 @@ end
 arch table_3
 x 5
 y 1
+no_pick 1
 end
 arch scroll
 x 5
@@ -667,6 +687,7 @@ end
 arch table_3
 x 5
 y 3
+no_pick 1
 end
 arch scroll
 x 5
@@ -710,6 +731,7 @@ end
 arch table_3
 x 5
 y 8
+no_pick 1
 end
 arch book_read
 name silver book
@@ -737,6 +759,7 @@ end
 arch table_3
 x 5
 y 10
+no_pick 1
 end
 arch book_read
 name copper studded book
@@ -769,6 +792,7 @@ end
 arch table_3
 x 5
 y 12
+no_pick 1
 end
 arch book_read
 x 5
@@ -786,6 +810,7 @@ end
 arch table_3
 x 5
 y 14
+no_pick 1
 end
 arch book_read
 name silver studded book
@@ -1031,6 +1056,7 @@ end
 arch table_3
 x 8
 y 3
+no_pick 1
 end
 arch scroll
 x 8
@@ -1126,6 +1152,7 @@ end
 arch table_3
 x 9
 y 3
+no_pick 1
 end
 arch scroll
 x 9
@@ -1195,6 +1222,7 @@ end
 arch table_3
 x 9
 y 12
+no_pick 1
 end
 arch note
 x 9
@@ -1212,6 +1240,7 @@ end
 arch table_3
 x 9
 y 14
+no_pick 1
 end
 arch note
 x 9
@@ -1239,6 +1268,7 @@ end
 arch table_3
 x 10
 y 1
+no_pick 1
 end
 arch scroll
 x 10
@@ -1256,6 +1286,7 @@ end
 arch table_3
 x 10
 y 3
+no_pick 1
 end
 arch scroll
 x 10
@@ -1325,6 +1356,7 @@ end
 arch table_3
 x 10
 y 12
+no_pick 1
 end
 arch note
 x 10
@@ -1342,6 +1374,7 @@ end
 arch table_3
 x 10
 y 14
+no_pick 1
 end
 arch note
 x 10
@@ -1369,6 +1402,7 @@ end
 arch table_3
 x 11
 y 1
+no_pick 1
 end
 arch scroll
 x 11
@@ -1386,6 +1420,7 @@ end
 arch table_3
 x 11
 y 3
+no_pick 1
 end
 arch scroll
 x 11
@@ -1457,6 +1492,7 @@ end
 arch table_3
 x 11
 y 12
+no_pick 1
 end
 arch note
 name crumbled note
@@ -1477,6 +1513,7 @@ end
 arch table_3
 x 11
 y 13
+no_pick 1
 end
 arch note
 x 11
@@ -1490,6 +1527,7 @@ end
 arch table_3
 x 11
 y 14
+no_pick 1
 end
 arch note
 x 11
@@ -1517,6 +1555,7 @@ end
 arch table_3
 x 12
 y 1
+no_pick 1
 end
 arch scroll
 x 12
@@ -1650,6 +1689,7 @@ end
 arch table_3
 x 13
 y 1
+no_pick 1
 end
 arch scroll
 x 13
@@ -1736,6 +1776,7 @@ end
 arch table_3
 x 13
 y 11
+no_pick 1
 end
 arch book_read
 name yellow book
@@ -1759,6 +1800,7 @@ end
 arch table_3
 x 13
 y 12
+no_pick 1
 end
 arch book_read
 name shiny black book
@@ -1779,6 +1821,7 @@ end
 arch table_3
 x 13
 y 13
+no_pick 1
 end
 arch book_read
 name blood stained book
@@ -1798,6 +1841,7 @@ end
 arch table_3
 x 13
 y 14
+no_pick 1
 end
 arch book_read
 x 13
@@ -1825,6 +1869,7 @@ end
 arch table_3
 x 14
 y 1
+no_pick 1
 end
 arch scroll
 x 14
diff --git a/lake_country/Butakis/prison_s b/lake_country/Butakis/prison_s
index 285999225..b341e3ad7 100644
--- a/lake_country/Butakis/prison_s
+++ b/lake_country/Butakis/prison_s
@@ -6,64 +6,124 @@ width 20
 height 20
 msg
 Created:  1995-03-29 Kundi, Xue (xkd@soda.csua.berkeley.edu)
+Modified: 2008-06-01 Arvid Norlander
 endmsg
 end
+arch marble
+end
 arch dun8
 end
+arch marble
+y 1
+end
 arch dun3
 y 1
 end
+arch marble
+y 2
+end
 arch dun3
 y 2
 end
+arch marble
+y 3
+end
 arch dun3
 y 3
 end
+arch marble
+y 4
+end
 arch dun3
 y 4
 end
+arch marble
+y 5
+end
 arch dun3
 y 5
 end
+arch marble
+y 6
+end
 arch dun3
 y 6
 end
+arch marble
+y 7
+end
 arch dun3
 y 7
 end
+arch marble
+y 8
+end
 arch dun3
 y 8
 end
+arch marble
+y 9
+end
 arch dun3
 y 9
 end
+arch marble
+y 10
+end
 arch dun3
 y 10
 end
+arch marble
+y 11
+end
 arch dun3
 y 11
 end
+arch marble
+y 12
+end
 arch dun3
 y 12
 end
+arch marble
+y 13
+end
 arch dun3
 y 13
 end
+arch marble
+y 14
+end
 arch dun3
 y 14
 end
+arch marble
+y 15
+end
 arch dun3
 y 15
 end
+arch marble
+y 16
+end
 arch dun3
 y 16
 end
+arch marble
+y 17
+end
 arch dun3
 y 17
 end
+arch marble
+y 18
+end
 arch dun3
 y 18
 end
+arch marble
+y 19
+end
 arch dun4
 y 19
 end
@@ -219,6 +279,10 @@ arch knight
 x 1
 y 18
 end
+arch marble
+x 1
+y 19
+end
 arch dun2
 x 1
 y 19
@@ -321,6 +385,10 @@ arch marble
 x 2
 y 18
 end
+arch marble
+x 2
+y 19
+end
 arch dun2
 x 2
 y 19
@@ -403,30 +471,58 @@ arch marble
 x 3
 y 10
 end
+arch marble
+x 3
+y 11
+end
 arch dun8
 x 3
 y 11
 end
+arch marble
+x 3
+y 12
+end
 arch dun11
 x 3
 y 12
 end
-arch dun3
+arch marble
 x 3
 y 13
 end
 arch dun3
 x 3
+y 13
+end
+arch marble
+x 3
 y 14
 end
+arch dun3
+x 3
+y 14
+end
+arch marble
+x 3
+y 15
+end
 arch dun11
 x 3
 y 15
 end
+arch marble
+x 3
+y 16
+end
 arch dun3
 x 3
 y 16
 end
+arch marble
+x 3
+y 17
+end
 arch dun5
 x 3
 y 17
@@ -441,10 +537,17 @@ y 18
 speed 0.500000
 connected 1
 end
+arch marble
+x 3
+y 19
+end
 arch dun2
 x 3
 y 19
 end
+arch marble
+x 4
+end
 arch dun16
 x 4
 end
@@ -464,6 +567,10 @@ arch dun3
 x 4
 y 2
 end
+arch marble
+x 4
+y 3
+end
 arch dun11
 x 4
 y 3
@@ -492,6 +599,10 @@ arch dun3
 x 4
 y 6
 end
+arch marble
+x 4
+y 7
+end
 arch dun4
 x 4
 y 7
@@ -520,6 +631,10 @@ arch knight
 x 4
 y 11
 end
+arch marble
+x 4
+y 12
+end
 arch dun2
 x 4
 y 12
@@ -545,6 +660,10 @@ arch teleporter
 x 4
 y 14
 end
+arch marble
+x 4
+y 15
+end
 arch dun2
 x 4
 y 15
@@ -575,10 +694,17 @@ arch marble
 x 4
 y 18
 end
+arch marble
+x 4
+y 19
+end
 arch dun2
 x 4
 y 19
 end
+arch marble
+x 5
+end
 arch dun2
 x 5
 end
@@ -607,6 +733,10 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 5
+y 3
+end
 arch dun2
 x 5
 y 3
@@ -640,6 +770,10 @@ sp 6
 x 5
 y 6
 end
+arch marble
+x 5
+y 7
+end
 arch dun2
 x 5
 y 7
@@ -668,6 +802,10 @@ arch knight
 x 5
 y 11
 end
+arch marble
+x 5
+y 12
+end
 arch dun2
 x 5
 y 12
@@ -689,6 +827,10 @@ arch marble
 x 5
 y 14
 end
+arch marble
+x 5
+y 15
+end
 arch dun2
 x 5
 y 15
@@ -732,10 +874,17 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 5
+y 19
+end
 arch dun2
 x 5
 y 19
 end
+arch marble
+x 6
+end
 arch dun2
 x 6
 end
@@ -756,6 +905,10 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 6
+y 3
+end
 arch dun2
 x 6
 y 3
@@ -786,6 +939,10 @@ arch marble
 x 6
 y 6
 end
+arch marble
+x 6
+y 7
+end
 arch dun2
 x 6
 y 7
@@ -814,6 +971,10 @@ arch knight
 x 6
 y 11
 end
+arch marble
+x 6
+y 12
+end
 arch dun2
 x 6
 y 12
@@ -840,6 +1001,10 @@ arch marble
 x 6
 y 14
 end
+arch marble
+x 6
+y 15
+end
 arch dun2
 x 6
 y 15
@@ -901,10 +1066,17 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 6
+y 19
+end
 arch dun2
 x 6
 y 19
 end
+arch marble
+x 7
+end
 arch dun2
 x 7
 end
@@ -1058,14 +1230,25 @@ arch dun3
 x 7
 y 17
 end
+arch marble
+x 7
+y 18
+end
 arch dun3
 x 7
 y 18
 end
+arch marble
+x 7
+y 19
+end
 arch dun13
 x 7
 y 19
 end
+arch marble
+x 8
+end
 arch dun2
 x 8
 end
@@ -1243,13 +1426,24 @@ arch teleporter
 x 8
 y 18
 end
+arch marble
+x 8
+y 19
+end
 arch dun2
 x 8
 y 19
 end
+arch marble
+x 9
+end
 arch dun16
 x 9
 end
+arch marble
+x 9
+y 1
+end
 arch dun3
 x 9
 y 1
@@ -1408,14 +1602,25 @@ arch dun3
 x 9
 y 17
 end
+arch marble
+x 9
+y 18
+end
 arch dun3
 x 9
 y 18
 end
+arch marble
+x 9
+y 19
+end
 arch dun13
 x 9
 y 19
 end
+arch marble
+x 10
+end
 arch dun2
 x 10
 end
@@ -1541,13 +1746,24 @@ arch teleporter
 x 10
 y 18
 end
+arch marble
+x 10
+y 19
+end
 arch dun2
 x 10
 y 19
 end
+arch marble
+x 11
+end
 arch dun16
 x 11
 end
+arch marble
+x 11
+y 1
+end
 arch dun3
 x 11
 y 1
@@ -1650,14 +1866,25 @@ arch dun3
 x 11
 y 17
 end
+arch marble
+x 11
+y 18
+end
 arch dun3
 x 11
 y 18
 end
+arch marble
+x 11
+y 19
+end
 arch dun13
 x 11
 y 19
 end
+arch marble
+x 12
+end
 arch dun2
 x 12
 end
@@ -1811,13 +2038,24 @@ arch teleporter
 x 12
 y 18
 end
+arch marble
+x 12
+y 19
+end
 arch dun2
 x 12
 y 19
 end
+arch marble
+x 13
+end
 arch dun16
 x 13
 end
+arch marble
+x 13
+y 1
+end
 arch dun3
 x 13
 y 1
@@ -1920,14 +2158,25 @@ arch dun3
 x 13
 y 17
 end
+arch marble
+x 13
+y 18
+end
 arch dun3
 x 13
 y 18
 end
+arch marble
+x 13
+y 19
+end
 arch dun13
 x 13
 y 19
 end
+arch marble
+x 14
+end
 arch dun2
 x 14
 end
@@ -2115,13 +2364,24 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 14
+y 19
+end
 arch dun2
 x 14
 y 19
 end
+arch marble
+x 15
+end
 arch dun16
 x 15
 end
+arch marble
+x 15
+y 1
+end
 arch dun5
 x 15
 y 1
@@ -2272,14 +2532,25 @@ y 17
 speed 0.500000
 connected 12
 end
+arch marble
+x 15
+y 18
+end
 arch dun8
 x 15
 y 18
 end
+arch marble
+x 15
+y 19
+end
 arch dun13
 x 15
 y 19
 end
+arch marble
+x 16
+end
 arch dun2
 x 16
 end
@@ -2305,6 +2576,10 @@ arch marble
 x 16
 y 2
 end
+arch marble
+x 16
+y 3
+end
 arch dun2
 x 16
 y 3
@@ -2331,6 +2606,10 @@ arch marble
 x 16
 y 5
 end
+arch marble
+x 16
+y 6
+end
 arch dun2
 x 16
 y 6
@@ -2357,6 +2636,10 @@ arch marble
 x 16
 y 8
 end
+arch marble
+x 16
+y 9
+end
 arch dun2
 x 16
 y 9
@@ -2387,6 +2670,10 @@ arch marble
 x 16
 y 12
 end
+arch marble
+x 16
+y 13
+end
 arch dun2
 x 16
 y 13
@@ -2413,6 +2700,10 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 16
+y 16
+end
 arch dun2
 x 16
 y 16
@@ -2439,10 +2730,17 @@ attack_movement 4
 arch spell_small_bullet
 end
 end
+arch marble
+x 16
+y 19
+end
 arch dun2
 x 16
 y 19
 end
+arch marble
+x 17
+end
 arch dun2
 x 17
 end
@@ -2454,6 +2752,10 @@ arch marble
 x 17
 y 2
 end
+arch marble
+x 17
+y 3
+end
 arch dun2
 x 17
 y 3
@@ -2466,6 +2768,10 @@ arch marble
 x 17
 y 5
 end
+arch marble
+x 17
+y 6
+end
 arch dun2
 x 17
 y 6
@@ -2478,6 +2784,10 @@ arch marble
 x 17
 y 8
 end
+arch marble
+x 17
+y 9
+end
 arch dun2
 x 17
 y 9
@@ -2503,6 +2813,10 @@ arch marble
 x 17
 y 12
 end
+arch marble
+x 17
+y 13
+end
 arch dun2
 x 17
 y 13
@@ -2515,6 +2829,10 @@ arch marble
 x 17
 y 15
 end
+arch marble
+x 17
+y 16
+end
 arch dun2
 x 17
 y 16
@@ -2527,10 +2845,17 @@ arch marble
 x 17
 y 18
 end
+arch marble
+x 17
+y 19
+end
 arch dun2
 x 17
 y 19
 end
+arch marble
+x 18
+end
 arch dun2
 x 18
 end
@@ -2550,6 +2875,10 @@ sp 45
 x 18
 y 2
 end
+arch marble
+x 18
+y 3
+end
 arch dun2
 x 18
 y 3
@@ -2579,6 +2908,10 @@ sp 21
 x 18
 y 5
 end
+arch marble
+x 18
+y 6
+end
 arch dun2
 x 18
 y 6
@@ -2608,6 +2941,10 @@ sp 35
 x 18
 y 8
 end
+arch marble
+x 18
+y 9
+end
 arch dun2
 x 18
 y 9
@@ -2641,6 +2978,10 @@ arch marble
 x 18
 y 12
 end
+arch marble
+x 18
+y 13
+end
 arch dun2
 x 18
 y 13
@@ -2661,6 +3002,10 @@ arch marble
 x 18
 y 15
 end
+arch marble
+x 18
+y 16
+end
 arch dun2
 x 18
 y 16
@@ -2677,85 +3022,168 @@ arch teleporter
 x 18
 y 18
 end
+arch marble
+x 18
+y 19
+end
 arch dun2
 x 18
 y 19
 end
+arch marble
+x 19
+end
 arch dun9
 x 19
 end
-arch dun3
+arch marble
 x 19
 y 1
 end
 arch dun3
 x 19
+y 1
+end
+arch marble
+x 19
 y 2
 end
+arch dun3
+x 19
+y 2
+end
+arch marble
+x 19
+y 3
+end
 arch dun14
 x 19
 y 3
 end
-arch dun3
+arch marble
 x 19
 y 4
 end
 arch dun3
 x 19
+y 4
+end
+arch marble
+x 19
 y 5
 end
+arch dun3
+x 19
+y 5
+end
+arch marble
+x 19
+y 6
+end
 arch dun14
 x 19
 y 6
 end
-arch dun3
+arch marble
 x 19
 y 7
 end
 arch dun3
 x 19
+y 7
+end
+arch marble
+x 19
 y 8
 end
+arch dun3
+x 19
+y 8
+end
+arch marble
+x 19
+y 9
+end
 arch dun14
 x 19
 y 9
 end
-arch dun3
+arch marble
 x 19
 y 10
 end
 arch dun3
 x 19
+y 10
+end
+arch marble
+x 19
 y 11
 end
 arch dun3
 x 19
+y 11
+end
+arch marble
+x 19
+y 12
+end
+arch dun3
+x 19
 y 12
 end
+arch marble
+x 19
+y 13
+end
 arch dun14
 x 19
 y 13
 end
-arch dun3
+arch marble
 x 19
 y 14
 end
 arch dun3
 x 19
+y 14
+end
+arch marble
+x 19
 y 15
 end
+arch dun3
+x 19
+y 15
+end
+arch marble
+x 19
+y 16
+end
 arch dun14
 x 19
 y 16
 end
-arch dun3
+arch marble
 x 19
 y 17
 end
 arch dun3
 x 19
+y 17
+end
+arch marble
+x 19
 y 18
 end
+arch dun3
+x 19
+y 18
+end
+arch marble
+x 19
+y 19
+end
 arch dun7
 x 19
 y 19