From 6e2651c57124ff9f6f04e1652b1041f66483c18d Mon Sep 17 00:00:00 2001
From: avogl <avogl@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 24 May 2003 11:58:13 +0000
Subject: [PATCH] Used new ancient red dragon arch where the ancient dragons
 are. Also added one to the last dragon randommap style. --AV

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2142 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 pup_land/nurnberg/reception/fire5     |  13 +-
 quests/peterm/DragonQuest/FireLord    | 525 +-------------------------
 styles/monsterstyles/dragon/dragon_15 | 118 +-----
 3 files changed, 25 insertions(+), 631 deletions(-)

diff --git a/pup_land/nurnberg/reception/fire5 b/pup_land/nurnberg/reception/fire5
index c943ff053..758d3f237 100644
--- a/pup_land/nurnberg/reception/fire5
+++ b/pup_land/nurnberg/reception/fire5
@@ -2596,18 +2596,7 @@ arch blocked
 x 20
 y 15
 end
-arch big_dragon
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-speed -0.500000
-level 24
+arch big_dragon_ancient
 weight 3000000
 x 6
 y 11
diff --git a/quests/peterm/DragonQuest/FireLord b/quests/peterm/DragonQuest/FireLord
index c20036799..6b8e07719 100644
--- a/quests/peterm/DragonQuest/FireLord
+++ b/quests/peterm/DragonQuest/FireLord
@@ -5,66 +5,43 @@ Creator: peterm
 Email: peterm@soda.csua.berkeley.edu
 Date: Fri Aug 19 23:44:33 1994
 endmsg
-y 31
-invisible 5
+width 16
+height 31
+darkness 5
 end
 arch blocked
-msg
-endmsg
 end
 arch blocked
-msg
-endmsg
 y 1
 end
 arch blocked
-msg
-endmsg
 y 2
 end
 arch blocked
-msg
-endmsg
 y 3
 end
 arch blocked
-msg
-endmsg
 y 4
 end
 arch blocked
-msg
-endmsg
 y 5
 end
 arch blocked
-msg
-endmsg
 y 6
 end
 arch blocked
-msg
-endmsg
 y 7
 end
 arch blocked
-msg
-endmsg
 y 8
 end
 arch blocked
-msg
-endmsg
 y 9
 end
 arch blocked
-msg
-endmsg
 y 10
 end
 arch blocked
-msg
-endmsg
 y 11
 end
 arch pstone_2
@@ -98,53 +75,33 @@ arch cave23
 y 16
 end
 arch blocked
-msg
-endmsg
 y 17
 end
 arch blocked
-msg
-endmsg
 y 18
 end
 arch blocked
-msg
-endmsg
 y 19
 end
 arch blocked
-msg
-endmsg
 y 20
 end
 arch blocked
-msg
-endmsg
 y 21
 end
 arch blocked
-msg
-endmsg
 y 22
 end
 arch blocked
-msg
-endmsg
 y 23
 end
 arch blocked
-msg
-endmsg
 y 24
 end
 arch blocked
-msg
-endmsg
 y 25
 end
 arch blocked
-msg
-endmsg
 y 26
 end
 arch pstone_2
@@ -160,35 +117,23 @@ arch cave23
 y 28
 end
 arch blocked
-msg
-endmsg
 y 29
 end
 arch blocked
-msg
-endmsg
 y 30
 end
 arch blocked
-msg
-endmsg
 x 1
 end
 arch blocked
-msg
-endmsg
 x 1
 y 1
 end
 arch blocked
-msg
-endmsg
 x 1
 y 2
 end
 arch blocked
-msg
-endmsg
 x 1
 y 3
 end
@@ -209,32 +154,22 @@ x 1
 y 5
 end
 arch blocked
-msg
-endmsg
 x 1
 y 6
 end
 arch blocked
-msg
-endmsg
 x 1
 y 7
 end
 arch blocked
-msg
-endmsg
 x 1
 y 8
 end
 arch blocked
-msg
-endmsg
 x 1
 y 9
 end
 arch blocked
-msg
-endmsg
 x 1
 y 10
 end
@@ -291,14 +226,10 @@ x 1
 y 18
 end
 arch blocked
-msg
-endmsg
 x 1
 y 19
 end
 arch blocked
-msg
-endmsg
 x 1
 y 20
 end
@@ -319,20 +250,14 @@ x 1
 y 22
 end
 arch blocked
-msg
-endmsg
 x 1
 y 23
 end
 arch blocked
-msg
-endmsg
 x 1
 y 24
 end
 arch blocked
-msg
-endmsg
 x 1
 y 25
 end
@@ -365,8 +290,6 @@ x 1
 y 29
 end
 arch blocked
-msg
-endmsg
 x 1
 y 30
 end
@@ -382,8 +305,6 @@ x 2
 y 1
 end
 arch blocked
-msg
-endmsg
 x 2
 y 2
 end
@@ -572,8 +493,6 @@ x 2
 y 29
 end
 arch blocked
-msg
-endmsg
 x 2
 y 30
 end
@@ -779,8 +698,6 @@ x 3
 y 29
 end
 arch blocked
-msg
-endmsg
 x 3
 y 30
 end
@@ -975,8 +892,6 @@ x 4
 y 29
 end
 arch blocked
-msg
-endmsg
 x 4
 y 30
 end
@@ -1154,14 +1069,10 @@ x 5
 y 29
 end
 arch blocked
-msg
-endmsg
 x 5
 y 29
 end
 arch blocked
-msg
-endmsg
 x 5
 y 30
 end
@@ -1337,8 +1248,6 @@ x 6
 y 29
 end
 arch blocked
-msg
-endmsg
 x 6
 y 30
 end
@@ -1518,8 +1427,6 @@ x 7
 y 29
 end
 arch blocked
-msg
-endmsg
 x 7
 y 30
 end
@@ -1531,8 +1438,6 @@ x 8
 y 1
 end
 arch blocked
-msg
-endmsg
 x 8
 y 1
 end
@@ -1549,26 +1454,18 @@ x 8
 y 2
 end
 arch blocked
-msg
-endmsg
 x 8
 y 3
 end
 arch blocked
-msg
-endmsg
 x 8
 y 4
 end
 arch blocked
-msg
-endmsg
 x 8
 y 5
 end
 arch blocked
-msg
-endmsg
 x 8
 y 6
 end
@@ -1589,14 +1486,10 @@ x 8
 y 8
 end
 arch blocked
-msg
-endmsg
 x 8
 y 9
 end
 arch blocked
-msg
-endmsg
 x 8
 y 10
 end
@@ -1701,73 +1594,49 @@ x 8
 y 29
 end
 arch blocked
-msg
-endmsg
 x 8
 y 30
 end
 arch blocked
-msg
-endmsg
 x 9
 end
 arch blocked
-msg
-endmsg
 x 9
 y 1
 end
 arch blocked
-msg
-endmsg
 x 9
 y 2
 end
 arch blocked
-msg
-endmsg
 x 9
 y 3
 end
 arch blocked
-msg
-endmsg
 x 9
 y 4
 end
 arch blocked
-msg
-endmsg
 x 9
 y 5
 end
 arch blocked
-msg
-endmsg
 x 9
 y 6
 end
 arch blocked
-msg
-endmsg
 x 9
 y 7
 end
 arch blocked
-msg
-endmsg
 x 9
 y 8
 end
 arch blocked
-msg
-endmsg
 x 9
 y 9
 end
 arch blocked
-msg
-endmsg
 x 9
 y 10
 end
@@ -1872,79 +1741,53 @@ x 9
 y 29
 end
 arch blocked
-msg
-endmsg
 x 9
 y 30
 end
 arch blocked
-msg
-endmsg
 x 10
 end
 arch blocked
-msg
-endmsg
 x 10
 y 1
 end
 arch blocked
-msg
-endmsg
 x 10
 y 2
 end
 arch blocked
-msg
-endmsg
 x 10
 y 3
 end
 arch blocked
-msg
-endmsg
 x 10
 y 4
 end
 arch blocked
-msg
-endmsg
 x 10
 y 5
 end
 arch blocked
-msg
-endmsg
 x 10
 y 6
 end
 arch blocked
-msg
-endmsg
 x 10
 y 7
 end
 arch blocked
-msg
-endmsg
 x 10
 y 8
 end
 arch blocked
-msg
-endmsg
 x 10
 y 9
 end
 arch blocked
-msg
-endmsg
 x 10
 y 10
 end
 arch blocked
-msg
-endmsg
 x 10
 y 11
 end
@@ -2037,14 +1880,10 @@ x 10
 y 30
 end
 arch blocked
-msg
-endmsg
 x 11
 y 10
 end
 arch blocked
-msg
-endmsg
 x 11
 y 11
 end
@@ -2137,14 +1976,10 @@ x 11
 y 30
 end
 arch blocked
-msg
-endmsg
 x 12
 y 10
 end
 arch blocked
-msg
-endmsg
 x 12
 y 11
 end
@@ -2233,20 +2068,14 @@ x 12
 y 29
 end
 arch blocked
-msg
-endmsg
 x 12
 y 30
 end
 arch blocked
-msg
-endmsg
 x 13
 y 10
 end
 arch blocked
-msg
-endmsg
 x 13
 y 11
 end
@@ -2347,32 +2176,22 @@ x 13
 y 28
 end
 arch blocked
-msg
-endmsg
 x 13
 y 29
 end
 arch blocked
-msg
-endmsg
 x 13
 y 30
 end
 arch blocked
-msg
-endmsg
 x 14
 y 10
 end
 arch blocked
-msg
-endmsg
 x 14
 y 11
 end
 arch blocked
-msg
-endmsg
 x 14
 y 12
 end
@@ -2489,50 +2308,34 @@ x 14
 y 26
 end
 arch blocked
-msg
-endmsg
 x 14
 y 27
 end
 arch blocked
-msg
-endmsg
 x 14
 y 28
 end
 arch blocked
-msg
-endmsg
 x 14
 y 29
 end
 arch blocked
-msg
-endmsg
 x 14
 y 30
 end
 arch blocked
-msg
-endmsg
 x 15
 y 10
 end
 arch blocked
-msg
-endmsg
 x 15
 y 11
 end
 arch blocked
-msg
-endmsg
 x 15
 y 12
 end
 arch blocked
-msg
-endmsg
 x 15
 y 13
 end
@@ -2569,32 +2372,22 @@ x 15
 y 17
 end
 arch blocked
-msg
-endmsg
 x 15
 y 18
 end
 arch blocked
-msg
-endmsg
 x 15
 y 19
 end
 arch blocked
-msg
-endmsg
 x 15
 y 20
 end
 arch blocked
-msg
-endmsg
 x 15
 y 21
 end
 arch blocked
-msg
-endmsg
 x 15
 y 22
 end
@@ -2615,135 +2408,32 @@ x 15
 y 24
 end
 arch blocked
-msg
-endmsg
 x 15
 y 25
 end
 arch blocked
-msg
-endmsg
 x 15
 y 26
 end
 arch blocked
-msg
-endmsg
 x 15
 y 27
 end
 arch blocked
-msg
-endmsg
 x 15
 y 28
 end
 arch blocked
-msg
-endmsg
 x 15
 y 29
 end
 arch blocked
-msg
-endmsg
 x 15
 y 30
 end
-arch big_dragon
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
+arch big_dragon_ancient
 x 3
 y 13
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_2
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 4
-y 13
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_3
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 5
-y 13
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_4
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 3
-y 14
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_5
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 4
-y 14
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_6
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 5
-y 14
-speed -0.500000
-level 24
 end
 arch dragonman
 name High Dragon Lord
@@ -2755,11 +2445,11 @@ exp 300000
 dam 50
 wc -30
 ac -17
-x 5
-y 8
 speed -0.600000
 level 30
 carrying 17100
+x 5
+y 8
 arch key2
 slaying FireLordKey
 end
@@ -2778,210 +2468,11 @@ weight 17000
 magic 7
 end
 end
-More
-arch dragonman_2
-name High Dragon Lord
-Con 7
-Int 6
-hp 6000
-maxhp 6000
-maxsp 100
-exp 300000
-dam 50
-wc -30
-ac -17
-x 5
-y 9
-speed -0.600000
-level 30
-end
-arch big_dragon
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
+arch big_dragon_ancient
 x 5
 y 19
-speed -0.500000
-level 24
 end
-More
-arch big_dragon_2
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 6
-y 19
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_3
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 7
-y 19
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_4
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 5
-y 20
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_5
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 6
-y 20
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_6
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 7
-y 20
-speed -0.500000
-level 24
-end
-arch big_dragon
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
+arch big_dragon_ancient
 x 10
 y 16
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_2
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 11
-y 16
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_3
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 12
-y 16
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_4
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 10
-y 17
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_5
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 11
-y 17
-speed -0.500000
-level 24
-end
-More
-arch big_dragon_6
-name Ancient Red Dragon
-Int 5
-hp 7500
-maxhp 7500
-maxsp 80
-exp 200000
-dam 40
-wc -25
-ac -16
-x 12
-y 17
-speed -0.500000
-level 24
 end
diff --git a/styles/monsterstyles/dragon/dragon_15 b/styles/monsterstyles/dragon/dragon_15
index 1b9181e1d..d54a7b6fd 100644
--- a/styles/monsterstyles/dragon/dragon_15
+++ b/styles/monsterstyles/dragon/dragon_15
@@ -1,11 +1,12 @@
 arch map
+name <untitled>
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Dec 26 20:52:22 1998
 endmsg
-x 6
-y 6
+width 6
+height 6
 end
 arch baby_dragon
 end
@@ -13,133 +14,46 @@ arch baby_dragon
 y 1
 end
 arch baby_dragon
-x 3
-y 2
+x 4
+y 5
 end
 arch baby_dragon
-x 3
-y 3
+x 5
+y 5
 end
-arch dragonman
+arch big_dragon_ancient
 y 2
 end
-More
-arch dragonman_2
-y 3
-end
 arch dragonman
 y 4
 end
-More
-arch dragonman_2
-y 5
-end
 arch big_dragon
 x 1
 end
-More
-arch big_dragon_2
-x 2
-end
-More
-arch big_dragon_3
-x 3
-end
-More
-arch big_dragon_4
-x 1
-end
-More
-arch big_dragon_5
-x 2
-end
-More
-arch big_dragon_6
-x 3
-end
 arch dragonman
 x 1
+y 4
+end
+arch dragonman
+x 2
+y 4
+end
+arch dragonman
+x 3
 y 2
 end
-More
-arch dragonman_2
-x 1
-y 3
-end
-arch dragonman
-x 1
-y 4
-end
-More
-arch dragonman_2
-x 1
-y 5
-end
-arch dragonman
-x 2
-y 2
-end
-More
-arch dragonman_2
-x 2
-y 3
-end
-arch dragonman
-x 2
-y 4
-end
-More
-arch dragonman_2
-x 2
-y 5
-end
 arch dragonman
 x 3
 y 4
 end
-More
-arch dragonman_2
-x 3
-y 5
-end
 arch big_elec
 x 4
 end
-More
-arch big_elec_2
-x 5
-end
-More
-arch big_elec_3
-x 4
-end
-More
-arch big_elec_4
-x 5
-end
-More
-arch big_elec_5
-x 4
-end
-More
-arch big_elec_6
-x 5
-end
 arch dragonman
 x 4
 y 3
 end
-More
-arch dragonman_2
-x 4
-y 4
-end
 arch dragonman
 x 5
 y 3
 end
-More
-arch dragonman_2
-x 5
-y 4
-end