From 36fda39304d3ac0815c3fe58dfd01cfda133188e Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 28 Jan 2021 16:26:41 +0000
Subject: [PATCH] Use blue and green dragon caves.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@21855 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 ChangeLog                                  |  5 +++
 quests/peterm/DragonQuest/ElectricHatchery | 48 +++++-----------------
 quests/peterm/DragonQuest/IceHatchery      | 44 ++++----------------
 3 files changed, 24 insertions(+), 73 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 451708869..74bdbbbf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-28 Nicolas Weeger
+        * quests/peterm/DragonQuest/ElectricHatchery,
+        * quests/peterm/DragonQuest/IceHatchery: Use blue and green dragon caves.
+
+
 2021-01-26 Nicolas Weeger
         * darcap/darcap/airhouse,
         * darcap/darcap/earthhouse,
diff --git a/quests/peterm/DragonQuest/ElectricHatchery b/quests/peterm/DragonQuest/ElectricHatchery
index 3f309f115..d8bbf4324 100644
--- a/quests/peterm/DragonQuest/ElectricHatchery
+++ b/quests/peterm/DragonQuest/ElectricHatchery
@@ -9,7 +9,7 @@ enter_x 10
 enter_y 24
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2012-01-01 Rick Tanner
+Modified: 2021-01-28 Nicolas Weeger
 endmsg
 end
 arch cave_15
@@ -468,13 +468,9 @@ arch pstone_2
 x 2
 y 21
 end
-arch generate_dragon
-other_arch elec_dragon
+arch generate_dragon_electric
 x 2
 y 21
-speed 0.004000
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 2
@@ -518,12 +514,10 @@ arch pstone_2
 x 2
 y 27
 end
-arch generate_dragon
+arch generate_dragon_electric
 other_arch big_elec
 x 2
 y 27
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 2
@@ -555,12 +549,10 @@ arch pstone_2
 x 3
 y 3
 end
-arch generate_dragon
+arch generate_dragon_electric
 other_arch big_elec
 x 3
 y 3
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 3
@@ -598,13 +590,9 @@ arch pstone_2
 x 3
 y 10
 end
-arch generate_dragon
-other_arch elec_dragon
+arch generate_dragon_electric
 x 3
 y 10
-speed 0.004000
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 3
@@ -1070,12 +1058,10 @@ arch pstone_2
 x 6
 y 6
 end
-arch generate_dragon
+arch generate_dragon_electric
 other_arch big_elec
 x 6
 y 6
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 6
@@ -1247,13 +1233,9 @@ arch pstone_2
 x 7
 y 8
 end
-arch generate_dragon
-other_arch elec_dragon
+arch generate_dragon_electric
 x 7
 y 8
-speed 0.004000
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 7
@@ -1632,13 +1614,9 @@ arch pstone_2
 x 9
 y 15
 end
-arch generate_dragon
-other_arch elec_dragon
+arch generate_dragon_electric
 x 9
 y 15
-speed 0.004000
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 9
@@ -1734,12 +1712,10 @@ arch pstone_2
 x 10
 y 3
 end
-arch generate_dragon
+arch generate_dragon_electric
 other_arch big_elec
 x 10
 y 3
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 10
@@ -2082,13 +2058,9 @@ arch pstone_2
 x 12
 y 9
 end
-arch generate_dragon
-other_arch elec_dragon
+arch generate_dragon_electric
 x 12
 y 9
-speed 0.004000
-resist_fire 0
-resist_electricity 100
 end
 arch pstone_2
 x 12
diff --git a/quests/peterm/DragonQuest/IceHatchery b/quests/peterm/DragonQuest/IceHatchery
index acf039824..27ee631af 100644
--- a/quests/peterm/DragonQuest/IceHatchery
+++ b/quests/peterm/DragonQuest/IceHatchery
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 5
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2012-01-01 Rick Tanner
+Modified: 2021-01-28 Nicolas Weeger
 endmsg
 end
 arch cave_15
@@ -413,13 +413,9 @@ arch pstone_2
 x 2
 y 15
 end
-arch generate_dragon
-other_arch cold_dragon
+arch generate_cold_dragon
 x 2
 y 15
-speed 0.004000
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 2
@@ -674,12 +670,10 @@ arch pstone_2
 x 3
 y 22
 end
-arch generate_dragon
+arch generate_cold_dragon
 other_arch chinese_dragon
 x 3
 y 22
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 3
@@ -1049,13 +1043,9 @@ arch pstone_2
 x 5
 y 27
 end
-arch generate_dragon
-other_arch cold_dragon
+arch generate_cold_dragon
 x 5
 y 27
-speed 0.004000
-resist_fire 0
-resist_cold 100
 end
 arch pstone_1
 x 5
@@ -1370,13 +1360,9 @@ arch pstone_2
 x 7
 y 20
 end
-arch generate_dragon
-other_arch cold_dragon
+arch generate_cold_dragon
 x 7
 y 20
-speed 0.004000
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 7
@@ -1667,12 +1653,10 @@ arch pstone_2
 x 9
 y 13
 end
-arch generate_dragon
+arch generate_cold_dragon
 other_arch chinese_dragon
 x 9
 y 13
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 9
@@ -2143,13 +2127,9 @@ arch pstone_2
 x 12
 y 17
 end
-arch generate_dragon
-other_arch cold_dragon
+arch generate_cold_dragon
 x 12
 y 17
-speed 0.004000
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 12
@@ -2326,12 +2306,10 @@ arch pstone_2
 x 13
 y 23
 end
-arch generate_dragon
+arch generate_cold_dragon
 other_arch chinese_dragon
 x 13
 y 23
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 13
@@ -2341,13 +2319,9 @@ arch pstone_2
 x 13
 y 25
 end
-arch generate_dragon
-other_arch cold_dragon
+arch generate_cold_dragon
 x 13
 y 25
-speed 0.004000
-resist_fire 0
-resist_cold 100
 end
 arch pstone_2
 x 13