From e71b3376adbccfaa5180a0eb1f24471379ddb521 Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 6 Jun 2010 13:19:08 +0000
Subject: [PATCH] Convert the Mad Mage's tower to a lighthouse, add a specific
 top.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13366 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/towers/{tower.mad => lighthouse.0}  |   16 +-
 scorn/towers/{tower.mad1 => lighthouse.1} |   12 +-
 scorn/towers/{tower.mad2 => lighthouse.2} |   20 +-
 scorn/towers/lighthouse.3                 | 1202 +++++++++++++++++++++
 world/world_105_115                       |    5 +-
 5 files changed, 1230 insertions(+), 25 deletions(-)
 rename scorn/towers/{tower.mad => lighthouse.0} (98%)
 rename scorn/towers/{tower.mad1 => lighthouse.1} (98%)
 rename scorn/towers/{tower.mad2 => lighthouse.2} (98%)
 create mode 100644 scorn/towers/lighthouse.3

diff --git a/scorn/towers/tower.mad b/scorn/towers/lighthouse.0
similarity index 98%
rename from scorn/towers/tower.mad
rename to scorn/towers/lighthouse.0
index 77198ba26..eba9dd6a9 100644
--- a/scorn/towers/tower.mad
+++ b/scorn/towers/lighthouse.0
@@ -1,5 +1,5 @@
 arch map
-name Mad Mage's Tower, Entrance
+name Lighthouse, Entrance
 difficulty 3
 region scorn
 width 16
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  1993-10-15
-Modified: 2008-10-25 Rick Tanner
+Modified: 2010-06-06 Nicolas Weeger
 endmsg
 end
 arch grass
@@ -360,7 +360,7 @@ x 3
 y 9
 end
 arch stair_up
-slaying tower.mad1
+slaying lighthouse.1
 hp 1
 sp 13
 x 3
@@ -469,7 +469,7 @@ x 4
 y 9
 end
 arch stair_up
-slaying tower.mad1
+slaying lighthouse.1
 hp 1
 sp 14
 x 4
@@ -800,8 +800,8 @@ y 13
 end
 arch exit
 slaying /world/world_105_115
-hp 9
-sp 44
+hp 14
+sp 24
 x 7
 y 14
 end
@@ -886,8 +886,8 @@ y 13
 end
 arch exit
 slaying /world/world_105_115
-hp 9
-sp 44
+hp 14
+sp 24
 x 8
 y 14
 end
diff --git a/scorn/towers/tower.mad1 b/scorn/towers/lighthouse.1
similarity index 98%
rename from scorn/towers/tower.mad1
rename to scorn/towers/lighthouse.1
index b2715cf71..e4d128da3 100644
--- a/scorn/towers/tower.mad1
+++ b/scorn/towers/lighthouse.1
@@ -1,5 +1,5 @@
 arch map
-name Mad Mage's Tower, Level 1
+name Lighthouse, Level 1
 difficulty 3
 region scorn
 width 16
@@ -7,7 +7,7 @@ height 16
 enter_x 1
 enter_y 13
 msg
-Modified: 2008-10-25 Rick Tanner
+Modified: 2010-06-06 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -115,7 +115,7 @@ x 1
 y 1
 end
 arch stair_up
-slaying tower.mad2
+slaying lighthouse.2
 hp 2
 sp 2
 x 1
@@ -126,7 +126,7 @@ x 1
 y 2
 end
 arch stair_up
-slaying tower.mad2
+slaying lighthouse.2
 hp 2
 sp 1
 x 1
@@ -197,7 +197,7 @@ x 1
 y 13
 end
 arch stair_down
-slaying tower.mad
+slaying lighthouse.0
 hp 4
 sp 8
 x 1
@@ -208,7 +208,7 @@ x 1
 y 14
 end
 arch stair_down
-slaying tower.mad
+slaying lighthouse.0
 hp 4
 sp 8
 x 1
diff --git a/scorn/towers/tower.mad2 b/scorn/towers/lighthouse.2
similarity index 98%
rename from scorn/towers/tower.mad2
rename to scorn/towers/lighthouse.2
index 52ecebb66..18c4da15f 100644
--- a/scorn/towers/tower.mad2
+++ b/scorn/towers/lighthouse.2
@@ -1,5 +1,5 @@
 arch map
-name Mad Mage's Tower, Level 2
+name Lighthouse, Level 2
 difficulty 3
 region scorn
 width 16
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2000-05-27
-Modified: 2008-10-25 Rick Tanner
+Modified: 2010-06-06 Nicolas Weeger
 endmsg
 end
 arch woodfloor
@@ -116,7 +116,7 @@ x 1
 y 1
 end
 arch stair_down
-slaying tower.mad1
+slaying lighthouse.1
 hp 2
 sp 2
 x 1
@@ -209,7 +209,7 @@ x 2
 y 1
 end
 arch stair_down
-slaying tower.mad1
+slaying lighthouse.1
 hp 2
 sp 2
 x 2
@@ -989,9 +989,9 @@ x 9
 y 10
 end
 arch stair_up
-slaying tower.mad3
-hp 10
-sp 10
+slaying lighthouse.3
+hp 8
+sp 8
 x 9
 y 10
 end
@@ -1101,9 +1101,9 @@ x 10
 y 10
 end
 arch stair_up
-slaying tower.mad3
-hp 10
-sp 11
+slaying lighthouse.3
+hp 8
+sp 8
 x 10
 y 10
 end
diff --git a/scorn/towers/lighthouse.3 b/scorn/towers/lighthouse.3
new file mode 100644
index 000000000..6877a2b8a
--- /dev/null
+++ b/scorn/towers/lighthouse.3
@@ -0,0 +1,1202 @@
+arch map
+name Lighthouse, Top
+region scorn
+width 16
+height 16
+msg
+Created:  2010-06-06 Nicolas Weeger
+Modified: 2010-06-06 Nicolas Weeger
+endmsg
+outdoor 1
+end
+arch sea
+end
+arch sea
+y 1
+end
+arch sea
+y 2
+end
+arch sea
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch sea
+x 1
+end
+arch sea
+x 1
+y 1
+end
+arch sea
+x 1
+y 2
+end
+arch sea
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 4
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 8
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
+x 1
+y 13
+end
+arch cobblestones2
+x 1
+y 14
+end
+arch cobblestones2
+x 1
+y 15
+end
+arch sea
+x 2
+end
+arch sea
+x 2
+y 1
+end
+arch sea
+x 2
+y 2
+end
+arch sea
+x 2
+y 3
+end
+arch cobblestones2
+x 2
+y 4
+end
+arch cobblestones2
+x 2
+y 5
+end
+arch cobblestones2
+x 2
+y 6
+end
+arch cobblestones2
+x 2
+y 7
+end
+arch cobblestones2
+x 2
+y 8
+end
+arch cobblestones2
+x 2
+y 9
+end
+arch cobblestones2
+x 2
+y 10
+end
+arch cobblestones2
+x 2
+y 11
+end
+arch cobblestones2
+x 2
+y 12
+end
+arch cobblestones2
+x 2
+y 13
+end
+arch cobblestones2
+x 2
+y 14
+end
+arch cobblestones2
+x 2
+y 15
+end
+arch sea
+x 3
+end
+arch sea
+x 3
+y 1
+end
+arch sea
+x 3
+y 2
+end
+arch sea
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 4
+end
+arch cobblestones2
+x 3
+y 5
+end
+arch cobblestones2
+x 3
+y 6
+end
+arch cobblestones2
+x 3
+y 7
+end
+arch cobblestones2
+x 3
+y 8
+end
+arch cobblestones2
+x 3
+y 9
+end
+arch cobblestones2
+x 3
+y 10
+end
+arch cobblestones2
+x 3
+y 11
+end
+arch cobblestones2
+x 3
+y 12
+end
+arch cobblestones2
+x 3
+y 13
+end
+arch cobblestones2
+x 3
+y 14
+end
+arch cobblestones2
+x 3
+y 15
+end
+arch sea
+x 4
+end
+arch sea
+x 4
+y 1
+end
+arch sea
+x 4
+y 2
+end
+arch sea
+x 4
+y 3
+end
+arch marble
+x 4
+y 4
+end
+arch swall_2_2_2
+x 4
+y 4
+end
+arch light4
+x 4
+y 4
+end
+arch marble
+x 4
+y 5
+end
+arch swall_2_1_1
+x 4
+y 5
+end
+arch marble
+x 4
+y 6
+end
+arch swall_2_1_1
+x 4
+y 6
+end
+arch marble
+x 4
+y 7
+end
+arch swall_2_1_1
+x 4
+y 7
+end
+arch marble
+x 4
+y 8
+end
+arch swall_2_1_1
+x 4
+y 8
+end
+arch marble
+x 4
+y 9
+end
+arch swall_2_1_1
+x 4
+y 9
+end
+arch marble
+x 4
+y 10
+end
+arch swall_2_1_1
+x 4
+y 10
+end
+arch marble
+x 4
+y 11
+end
+arch swall_2_2_1
+x 4
+y 11
+end
+arch light4
+x 4
+y 11
+end
+arch cobblestones2
+x 4
+y 12
+end
+arch cobblestones2
+x 4
+y 13
+end
+arch cobblestones2
+x 4
+y 14
+end
+arch cobblestones2
+x 4
+y 15
+end
+arch sea
+x 5
+end
+arch sea
+x 5
+y 1
+end
+arch sea
+x 5
+y 2
+end
+arch sea
+x 5
+y 3
+end
+arch marble
+x 5
+y 4
+end
+arch swall_2_1_2
+x 5
+y 4
+end
+arch marble
+x 5
+y 5
+end
+arch marble
+x 5
+y 6
+end
+arch marble
+x 5
+y 7
+end
+arch marble
+x 5
+y 8
+end
+arch marble
+x 5
+y 9
+end
+arch marble
+x 5
+y 10
+end
+arch marble
+x 5
+y 11
+end
+arch swall_2_1_2
+x 5
+y 11
+end
+arch cobblestones2
+x 5
+y 12
+end
+arch cobblestones2
+x 5
+y 13
+end
+arch cobblestones2
+x 5
+y 14
+end
+arch cobblestones2
+x 5
+y 15
+end
+arch sea
+x 6
+end
+arch sea
+x 6
+y 1
+end
+arch sea
+x 6
+y 2
+end
+arch sea
+x 6
+y 3
+end
+arch marble
+x 6
+y 4
+end
+arch swall_2_1_2
+x 6
+y 4
+end
+arch marble
+x 6
+y 5
+end
+arch marble
+x 6
+y 6
+end
+arch marble
+x 6
+y 7
+end
+arch marble
+x 6
+y 8
+end
+arch marble
+x 6
+y 9
+end
+arch marble
+x 6
+y 10
+end
+arch marble
+x 6
+y 11
+end
+arch swall_2_1_2
+x 6
+y 11
+end
+arch cobblestones2
+x 6
+y 12
+end
+arch cobblestones2
+x 6
+y 13
+end
+arch cobblestones2
+x 6
+y 14
+end
+arch cobblestones2
+x 6
+y 15
+end
+arch sea
+x 7
+end
+arch sea
+x 7
+y 1
+end
+arch sea
+x 7
+y 2
+end
+arch sea
+x 7
+y 3
+end
+arch marble
+x 7
+y 4
+end
+arch swall_2_1_2
+x 7
+y 4
+end
+arch marble
+x 7
+y 5
+end
+arch marble
+x 7
+y 6
+end
+arch marble
+x 7
+y 7
+end
+arch light4
+x 7
+y 7
+end
+arch marble
+x 7
+y 8
+end
+arch light4
+x 7
+y 8
+end
+arch marble
+x 7
+y 9
+end
+arch marble
+x 7
+y 10
+end
+arch marble
+x 7
+y 11
+end
+arch swall_2_1_2
+x 7
+y 11
+end
+arch cobblestones2
+x 7
+y 12
+end
+arch cobblestones2
+x 7
+y 13
+end
+arch cobblestones2
+x 7
+y 14
+end
+arch cobblestones2
+x 7
+y 15
+end
+arch sea
+x 8
+end
+arch sea
+x 8
+y 1
+end
+arch sea
+x 8
+y 2
+end
+arch sea
+x 8
+y 3
+end
+arch marble
+x 8
+y 4
+end
+arch swall_2_1_2
+x 8
+y 4
+end
+arch marble
+x 8
+y 5
+end
+arch marble
+x 8
+y 6
+end
+arch marble
+x 8
+y 7
+end
+arch light4
+x 8
+y 7
+end
+arch marble
+x 8
+y 8
+end
+arch stair_down_3
+slaying lighthouse.2
+hp 9
+sp 10
+x 8
+y 8
+end
+arch light4
+x 8
+y 8
+end
+arch marble
+x 8
+y 9
+end
+arch marble
+x 8
+y 10
+end
+arch marble
+x 8
+y 11
+end
+arch swall_2_1_2
+x 8
+y 11
+end
+arch cobblestones2
+x 8
+y 12
+end
+arch cobblestones2
+x 8
+y 13
+end
+arch cobblestones2
+x 8
+y 14
+end
+arch cobblestones2
+x 8
+y 15
+end
+arch sea
+x 9
+end
+arch sea
+x 9
+y 1
+end
+arch sea
+x 9
+y 2
+end
+arch sea
+x 9
+y 3
+end
+arch marble
+x 9
+y 4
+end
+arch swall_2_1_2
+x 9
+y 4
+end
+arch marble
+x 9
+y 5
+end
+arch marble
+x 9
+y 6
+end
+arch marble
+x 9
+y 7
+end
+arch marble
+x 9
+y 8
+end
+arch marble
+x 9
+y 9
+end
+arch marble
+x 9
+y 10
+end
+arch marble
+x 9
+y 11
+end
+arch swall_2_1_2
+x 9
+y 11
+end
+arch cobblestones2
+x 9
+y 12
+end
+arch cobblestones2
+x 9
+y 13
+end
+arch cobblestones2
+x 9
+y 14
+end
+arch cobblestones2
+x 9
+y 15
+end
+arch sea
+x 10
+end
+arch sea
+x 10
+y 1
+end
+arch sea
+x 10
+y 2
+end
+arch sea
+x 10
+y 3
+end
+arch marble
+x 10
+y 4
+end
+arch swall_2_1_2
+x 10
+y 4
+end
+arch marble
+x 10
+y 5
+end
+arch marble
+x 10
+y 6
+end
+arch marble
+x 10
+y 7
+end
+arch marble
+x 10
+y 8
+end
+arch marble
+x 10
+y 9
+end
+arch marble
+x 10
+y 10
+end
+arch marble
+x 10
+y 11
+end
+arch swall_2_1_2
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 12
+end
+arch cobblestones2
+x 10
+y 13
+end
+arch cobblestones2
+x 10
+y 14
+end
+arch cobblestones2
+x 10
+y 15
+end
+arch sea
+x 11
+end
+arch sea
+x 11
+y 1
+end
+arch sea
+x 11
+y 2
+end
+arch sea
+x 11
+y 3
+end
+arch marble
+x 11
+y 4
+end
+arch swall_2_2_3
+x 11
+y 4
+end
+arch light4
+x 11
+y 4
+end
+arch marble
+x 11
+y 5
+end
+arch swall_2_1_1
+x 11
+y 5
+end
+arch marble
+x 11
+y 6
+end
+arch swall_2_1_1
+x 11
+y 6
+end
+arch marble
+x 11
+y 7
+end
+arch swall_2_1_1
+x 11
+y 7
+end
+arch marble
+x 11
+y 8
+end
+arch swall_2_1_1
+x 11
+y 8
+end
+arch marble
+x 11
+y 9
+end
+arch swall_2_1_1
+x 11
+y 9
+end
+arch marble
+x 11
+y 10
+end
+arch swall_2_1_1
+x 11
+y 10
+end
+arch marble
+x 11
+y 11
+end
+arch swall_2_2_4
+x 11
+y 11
+end
+arch light4
+x 11
+y 11
+end
+arch cobblestones2
+x 11
+y 12
+end
+arch cobblestones2
+x 11
+y 13
+end
+arch cobblestones2
+x 11
+y 14
+end
+arch cobblestones2
+x 11
+y 15
+end
+arch sea
+x 12
+end
+arch sea
+x 12
+y 1
+end
+arch sea
+x 12
+y 2
+end
+arch sea
+x 12
+y 3
+end
+arch sea
+x 12
+y 4
+end
+arch sea
+x 12
+y 5
+end
+arch sea
+x 12
+y 6
+end
+arch sea
+x 12
+y 7
+end
+arch sea
+x 12
+y 8
+end
+arch sea
+x 12
+y 9
+end
+arch sea
+x 12
+y 10
+end
+arch sea
+x 12
+y 11
+end
+arch cobblestones2
+x 12
+y 12
+end
+arch cobblestones2
+x 12
+y 13
+end
+arch cobblestones2
+x 12
+y 14
+end
+arch cobblestones2
+x 12
+y 15
+end
+arch sea
+x 13
+end
+arch sea
+x 13
+y 1
+end
+arch sea
+x 13
+y 2
+end
+arch sea
+x 13
+y 3
+end
+arch sea
+x 13
+y 4
+end
+arch sea
+x 13
+y 5
+end
+arch sea
+x 13
+y 6
+end
+arch sea
+x 13
+y 7
+end
+arch sea
+x 13
+y 8
+end
+arch sea
+x 13
+y 9
+end
+arch sea
+x 13
+y 10
+end
+arch sea
+x 13
+y 11
+end
+arch cobblestones2
+x 13
+y 12
+end
+arch cobblestones2
+x 13
+y 13
+end
+arch cobblestones2
+x 13
+y 14
+end
+arch cobblestones2
+x 13
+y 15
+end
+arch sea
+x 14
+end
+arch sea
+x 14
+y 1
+end
+arch sea
+x 14
+y 2
+end
+arch sea
+x 14
+y 3
+end
+arch sea
+x 14
+y 4
+end
+arch sea
+x 14
+y 5
+end
+arch sea
+x 14
+y 6
+end
+arch sea
+x 14
+y 7
+end
+arch sea
+x 14
+y 8
+end
+arch sea
+x 14
+y 9
+end
+arch sea
+x 14
+y 10
+end
+arch sea
+x 14
+y 11
+end
+arch cobblestones2
+x 14
+y 12
+end
+arch cobblestones2
+x 14
+y 13
+end
+arch cobblestones2
+x 14
+y 14
+end
+arch cobblestones2
+x 14
+y 15
+end
+arch sea
+x 15
+end
+arch sea
+x 15
+y 1
+end
+arch sea
+x 15
+y 2
+end
+arch sea
+x 15
+y 3
+end
+arch sea
+x 15
+y 4
+end
+arch pier_1_1
+x 15
+y 4
+end
+arch sea
+x 15
+y 5
+end
+arch pier_2_1_1
+x 15
+y 5
+end
+arch sea
+x 15
+y 6
+end
+arch pier_2_1_1
+x 15
+y 6
+end
+arch sea
+x 15
+y 7
+end
+arch pier_2_1_1
+x 15
+y 7
+end
+arch sea
+x 15
+y 8
+end
+arch pier_2_1_1
+x 15
+y 8
+end
+arch sea
+x 15
+y 9
+end
+arch pier_2_1_1
+x 15
+y 9
+end
+arch sea
+x 15
+y 10
+end
+arch pier_2_1_1
+x 15
+y 10
+end
+arch sea
+x 15
+y 11
+end
+arch pier_2_1_1
+x 15
+y 11
+end
+arch cobblestones2
+x 15
+y 12
+end
+arch pier_2_1_1
+x 15
+y 12
+end
+arch cobblestones2
+x 15
+y 13
+end
+arch pier_2_1_1
+x 15
+y 13
+end
+arch cobblestones2
+x 15
+y 14
+end
+arch pier_2_1_1
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
+arch pier_1_2
+x 15
+y 15
+end
diff --git a/world/world_105_115 b/world/world_105_115
index fe9dcac13..a0bd6c84c 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2010-05-13 Nicolas Weeger
+Modified: 2010-06-06 Nicolas Weeger
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -6346,6 +6346,9 @@ elevation -2256
 end
 arch tower_a
 name Lighthouse
+slaying ../scorn/towers/lighthouse.0
+hp 7
+sp 13
 x 14
 y 23
 glow_radius 4