From 752bb2aea749929ad1153ebb22f304fff4b78afd Mon Sep 17 00:00:00 2001
From: meflin2 <meflin2@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 26 Aug 2011 17:58:58 +0000
Subject: [PATCH] Khalehs updates to the training centers from the tracker for
 dragonbreath

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15004 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 dungeons/train/goblin   | 648 +++++++++++++++++++++++++---------------
 dungeons/train/ogre     | 648 +++++++++++++++++++++++++---------------
 dungeons/train/skeleton | 648 +++++++++++++++++++++++++---------------
 dungeons/train/zombie   | 648 +++++++++++++++++++++++++---------------
 4 files changed, 1612 insertions(+), 980 deletions(-)

diff --git a/dungeons/train/goblin b/dungeons/train/goblin
index 2096072ef..431e0b54c 100644
--- a/dungeons/train/goblin
+++ b/dungeons/train/goblin
@@ -9,7 +9,7 @@ enter_x 19
 enter_y 3
 msg
 Created:  2003-06-19 crowbert
-Modified: 2011-08-23 Khaleh
+Modified: 2011-08-26 Khaleh
 endmsg
 end
 arch flagstone
@@ -2500,24 +2500,84 @@ arch blocked
 x 31
 y 16
 end
-arch woodfloor
+arch blocked
 x 32
 end
-arch firewall_4
-x 32
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
 arch blocked
 x 32
 y 1
 end
-arch woodfloor
+arch blocked
 x 32
 y 2
 end
+arch blocked
+x 32
+y 3
+end
+arch blocked
+x 32
+y 4
+end
+arch blocked
+x 32
+y 5
+end
+arch blocked
+x 32
+y 6
+end
+arch blocked
+x 32
+y 7
+end
+arch blocked
+x 32
+y 8
+end
+arch blocked
+x 32
+y 9
+end
+arch blocked
+x 32
+y 10
+end
+arch blocked
+x 32
+y 11
+end
+arch blocked
+x 32
+y 12
+end
+arch blocked
+x 32
+y 13
+end
+arch blocked
+x 32
+y 14
+end
+arch blocked
+x 32
+y 15
+end
+arch blocked
+x 32
+y 16
+end
+arch blocked
+x 33
+end
+arch blocked
+x 33
+y 1
+end
+arch woodfloor
+x 33
+y 2
+end
 arch magic_mouth
 msg
 You have roughly 30 to 45 minutes to
@@ -2526,16 +2586,16 @@ Goblins will have a meeting to attend
 and will be unavailable a while.
 endmsg
 food 1
-x 32
+x 33
 y 2
 connected 777
 end
 arch blocked
-x 32
+x 33
 y 3
 end
 arch woodfloor
-x 32
+x 33
 y 4
 end
 arch magic_mouth
@@ -2543,368 +2603,242 @@ msg
 TRAINING PERIOD HAS ENDED.
 endmsg
 food 1
-x 32
+x 33
 y 4
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 5
 end
 arch woodfloor
-x 32
+x 33
 y 6
 end
 arch trigger
-x 32
+x 33
 y 6
 connected 333
 end
 arch vampire
 name Training Supervisor
-x 32
+x 33
 y 6
 sleep 0
 end
 arch blocked
-x 32
+x 33
 y 7
 end
 arch blocked
-x 32
+x 33
 y 8
 end
 arch woodfloor
-x 32
+x 33
 y 9
 end
 arch spikes_closed
-x 32
+x 33
 y 9
 connected 777
 end
 arch spikes_moving
-x 32
+x 33
 y 9
 end
 arch food
-x 32
+x 33
 y 9
 end
 arch woodfloor
-x 32
+x 33
 y 10
 end
 arch spikes_closed
-x 32
+x 33
 y 10
 connected 777
 end
 arch woodfloor
-x 32
+x 33
 y 11
 end
 arch altar_trigger
 name destroy generators then reset
 food 1
-x 32
+x 33
 y 11
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 12
 end
 arch woodfloor
-x 32
+x 33
 y 13
 end
 arch spikes_open
-x 32
+x 33
 y 13
 connected 1
 end
 arch food
-x 32
+x 33
 y 13
 end
 arch woodfloor
-x 32
+x 33
 y 14
 end
 arch altar_trigger
 name start timer
 exp 15500
 food 1
-x 32
+x 33
 y 14
 connected 777
 end
 arch blocked
-x 32
-y 15
-end
-arch woodfloor
-x 32
-y 16
-end
-arch firewall_2
-x 32
-y 16
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
-arch woodfloor
-x 33
-end
-arch grate_closed_2
-x 33
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 1
-end
-arch grate_closed_2
-x 33
-y 1
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 2
-end
-arch grate_closed_2
-x 33
-y 2
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 3
-end
-arch grate_closed_2
-x 33
-y 3
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 4
-end
-arch grate_closed_2
-x 33
-y 4
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 5
-end
-arch grate_closed_2
-x 33
-y 5
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 6
-end
-arch grate_closed_2
-x 33
-y 6
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 7
-end
-arch grate_closed_2
-x 33
-y 7
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 8
-end
-arch grate_closed_2
-x 33
-y 8
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 9
-end
-arch grate_closed_2
-x 33
-y 9
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 10
-end
-arch grate_closed_2
-x 33
-y 10
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 11
-end
-arch grate_closed_2
-x 33
-y 11
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 12
-end
-arch grate_closed_2
-x 33
-y 12
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 13
-end
-arch grate_closed_2
-x 33
-y 13
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 14
-end
-arch grate_closed_2
-x 33
-y 14
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
 x 33
 y 15
 end
-arch grate_closed_2
+arch blocked
 x 33
-y 15
-connected 666
-no_magic 1
-damned 1
+y 16
 end
 arch woodfloor
-x 33
-y 16
-end
-arch grate_closed_2
-x 33
-y 16
-connected 666
-no_magic 1
-damned 1
-end
-arch permanent_lava
 x 34
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+end
+arch woodfloor
 x 34
 y 1
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 1
+end
+arch woodfloor
 x 34
 y 2
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 2
+end
+arch woodfloor
 x 34
 y 3
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 3
+end
+arch woodfloor
 x 34
 y 4
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 4
+end
+arch woodfloor
 x 34
 y 5
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 5
+end
+arch woodfloor
 x 34
 y 6
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 6
+end
+arch woodfloor
 x 34
 y 7
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 7
+end
+arch woodfloor
 x 34
 y 8
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 8
+end
+arch woodfloor
 x 34
 y 9
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 9
+end
+arch woodfloor
 x 34
 y 10
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 10
+end
+arch woodfloor
 x 34
 y 11
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 11
+end
+arch woodfloor
 x 34
 y 12
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 12
+end
+arch woodfloor
 x 34
 y 13
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 13
+end
+arch woodfloor
 x 34
 y 14
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 14
+end
+arch woodfloor
 x 34
 y 15
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 15
+end
+arch woodfloor
+x 34
+y 16
+end
+arch dwall_2_1_1
 x 34
 y 16
 end
@@ -3208,6 +3142,13 @@ sp 6
 x 36
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 1
+connected 666
+end
 arch woodfloor
 x 36
 y 1
@@ -3235,6 +3176,13 @@ x 36
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 3
+connected 666
+end
 arch woodfloor
 x 36
 y 3
@@ -3262,6 +3210,13 @@ x 36
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 5
+connected 666
+end
 arch woodfloor
 x 36
 y 5
@@ -3289,6 +3244,13 @@ x 36
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 7
+connected 666
+end
 arch woodfloor
 x 36
 y 7
@@ -3316,6 +3278,13 @@ x 36
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 9
+connected 666
+end
 arch woodfloor
 x 36
 y 9
@@ -3343,6 +3312,13 @@ x 36
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 11
+connected 666
+end
 arch woodfloor
 x 36
 y 11
@@ -3370,6 +3346,13 @@ x 36
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 13
+connected 666
+end
 arch woodfloor
 x 36
 y 13
@@ -3397,6 +3380,13 @@ x 36
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 36
+y 15
+connected 666
+end
 arch woodfloor
 x 36
 y 15
@@ -3724,6 +3714,13 @@ sp 7
 x 38
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 1
+connected 666
+end
 arch woodfloor
 x 38
 y 1
@@ -3751,6 +3748,13 @@ x 38
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 3
+connected 666
+end
 arch woodfloor
 x 38
 y 3
@@ -3778,6 +3782,13 @@ x 38
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 5
+connected 666
+end
 arch woodfloor
 x 38
 y 5
@@ -3805,6 +3816,13 @@ x 38
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 7
+connected 666
+end
 arch woodfloor
 x 38
 y 7
@@ -3832,6 +3850,13 @@ x 38
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 9
+connected 666
+end
 arch woodfloor
 x 38
 y 9
@@ -3859,6 +3884,13 @@ x 38
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 11
+connected 666
+end
 arch woodfloor
 x 38
 y 11
@@ -3886,6 +3918,13 @@ x 38
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 13
+connected 666
+end
 arch woodfloor
 x 38
 y 13
@@ -3913,6 +3952,13 @@ x 38
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 38
+y 15
+connected 666
+end
 arch woodfloor
 x 38
 y 15
@@ -4240,6 +4286,13 @@ sp 8
 x 40
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 1
+connected 666
+end
 arch woodfloor
 x 40
 y 1
@@ -4267,6 +4320,13 @@ x 40
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 3
+connected 666
+end
 arch woodfloor
 x 40
 y 3
@@ -4294,6 +4354,13 @@ x 40
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 5
+connected 666
+end
 arch woodfloor
 x 40
 y 5
@@ -4321,6 +4388,13 @@ x 40
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 7
+connected 666
+end
 arch woodfloor
 x 40
 y 7
@@ -4348,6 +4422,13 @@ x 40
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 9
+connected 666
+end
 arch woodfloor
 x 40
 y 9
@@ -4375,6 +4456,13 @@ x 40
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 11
+connected 666
+end
 arch woodfloor
 x 40
 y 11
@@ -4402,6 +4490,13 @@ x 40
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 13
+connected 666
+end
 arch woodfloor
 x 40
 y 13
@@ -4429,6 +4524,13 @@ x 40
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 40
+y 15
+connected 666
+end
 arch woodfloor
 x 40
 y 15
@@ -4756,6 +4858,13 @@ sp 4
 x 42
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 42
+y 1
+connected 666
+end
 arch woodfloor
 x 42
 y 1
@@ -4783,6 +4892,13 @@ x 42
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 42
+y 3
+connected 666
+end
 arch woodfloor
 x 42
 y 3
@@ -4810,6 +4926,13 @@ x 42
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 42
+y 5
+connected 666
+end
 arch woodfloor
 x 42
 y 5
@@ -4837,6 +4960,13 @@ x 42
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_gnoll
+x 42
+y 7
+connected 666
+end
 arch woodfloor
 x 42
 y 7
@@ -4863,6 +4993,13 @@ x 42
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_orc
+x 42
+y 9
+connected 666
+end
 arch woodfloor
 x 42
 y 9
@@ -4890,6 +5027,13 @@ x 42
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_gnoll
+x 42
+y 11
+connected 666
+end
 arch woodfloor
 x 42
 y 11
@@ -4916,6 +5060,13 @@ x 42
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 42
+y 13
+connected 666
+end
 arch woodfloor
 x 42
 y 13
@@ -4943,6 +5094,13 @@ x 42
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_goblin
+x 42
+y 15
+connected 666
+end
 arch woodfloor
 x 42
 y 15
diff --git a/dungeons/train/ogre b/dungeons/train/ogre
index 4107529da..f7767e842 100644
--- a/dungeons/train/ogre
+++ b/dungeons/train/ogre
@@ -9,7 +9,7 @@ enter_x 19
 enter_y 12
 msg
 Created:  2003-06-19 crowbert
-Modified: 2011-08-24 Khaleh
+Modified: 2011-08-26 Khaleh
 endmsg
 end
 arch flagstone
@@ -2500,24 +2500,84 @@ arch blocked
 x 31
 y 16
 end
-arch woodfloor
+arch blocked
 x 32
 end
-arch firewall_4
-x 32
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
 arch blocked
 x 32
 y 1
 end
-arch woodfloor
+arch blocked
 x 32
 y 2
 end
+arch blocked
+x 32
+y 3
+end
+arch blocked
+x 32
+y 4
+end
+arch blocked
+x 32
+y 5
+end
+arch blocked
+x 32
+y 6
+end
+arch blocked
+x 32
+y 7
+end
+arch blocked
+x 32
+y 8
+end
+arch blocked
+x 32
+y 9
+end
+arch blocked
+x 32
+y 10
+end
+arch blocked
+x 32
+y 11
+end
+arch blocked
+x 32
+y 12
+end
+arch blocked
+x 32
+y 13
+end
+arch blocked
+x 32
+y 14
+end
+arch blocked
+x 32
+y 15
+end
+arch blocked
+x 32
+y 16
+end
+arch blocked
+x 33
+end
+arch blocked
+x 33
+y 1
+end
+arch woodfloor
+x 33
+y 2
+end
 arch magic_mouth
 msg
 You have roughly 30 to 45 minutes to
@@ -2525,16 +2585,16 @@ train here. After that time the ogres will
 be taking a short nap.
 endmsg
 food 1
-x 32
+x 33
 y 2
 connected 777
 end
 arch blocked
-x 32
+x 33
 y 3
 end
 arch woodfloor
-x 32
+x 33
 y 4
 end
 arch magic_mouth
@@ -2542,368 +2602,242 @@ msg
 TRAINING PERIOD HAS ENDED.
 endmsg
 food 1
-x 32
+x 33
 y 4
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 5
 end
 arch woodfloor
-x 32
+x 33
 y 6
 end
 arch trigger
-x 32
+x 33
 y 6
 connected 333
 end
 arch vampire
 name Training Supervisor
-x 32
+x 33
 y 6
 sleep 0
 end
 arch blocked
-x 32
+x 33
 y 7
 end
 arch blocked
-x 32
+x 33
 y 8
 end
 arch woodfloor
-x 32
+x 33
 y 9
 end
 arch spikes_closed
-x 32
+x 33
 y 9
 connected 777
 end
 arch spikes_moving
-x 32
+x 33
 y 9
 end
 arch food
-x 32
+x 33
 y 9
 end
 arch woodfloor
-x 32
+x 33
 y 10
 end
 arch spikes_closed
-x 32
+x 33
 y 10
 connected 777
 end
 arch woodfloor
-x 32
+x 33
 y 11
 end
 arch altar_trigger
 name destroy generators then reset
 food 1
-x 32
+x 33
 y 11
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 12
 end
 arch woodfloor
-x 32
+x 33
 y 13
 end
 arch spikes_open
-x 32
+x 33
 y 13
 connected 1
 end
 arch food
-x 32
+x 33
 y 13
 end
 arch woodfloor
-x 32
+x 33
 y 14
 end
 arch altar_trigger
 name start timer
 exp 15500
 food 1
-x 32
+x 33
 y 14
 connected 777
 end
 arch blocked
-x 32
-y 15
-end
-arch woodfloor
-x 32
-y 16
-end
-arch firewall_2
-x 32
-y 16
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
-arch woodfloor
-x 33
-end
-arch grate_closed_2
-x 33
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 1
-end
-arch grate_closed_2
-x 33
-y 1
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 2
-end
-arch grate_closed_2
-x 33
-y 2
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 3
-end
-arch grate_closed_2
-x 33
-y 3
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 4
-end
-arch grate_closed_2
-x 33
-y 4
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 5
-end
-arch grate_closed_2
-x 33
-y 5
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 6
-end
-arch grate_closed_2
-x 33
-y 6
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 7
-end
-arch grate_closed_2
-x 33
-y 7
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 8
-end
-arch grate_closed_2
-x 33
-y 8
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 9
-end
-arch grate_closed_2
-x 33
-y 9
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 10
-end
-arch grate_closed_2
-x 33
-y 10
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 11
-end
-arch grate_closed_2
-x 33
-y 11
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 12
-end
-arch grate_closed_2
-x 33
-y 12
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 13
-end
-arch grate_closed_2
-x 33
-y 13
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 14
-end
-arch grate_closed_2
-x 33
-y 14
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
 x 33
 y 15
 end
-arch grate_closed_2
+arch blocked
 x 33
-y 15
-connected 666
-no_magic 1
-damned 1
+y 16
 end
 arch woodfloor
-x 33
-y 16
-end
-arch grate_closed_2
-x 33
-y 16
-connected 666
-no_magic 1
-damned 1
-end
-arch permanent_lava
 x 34
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+end
+arch woodfloor
 x 34
 y 1
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 1
+end
+arch woodfloor
 x 34
 y 2
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 2
+end
+arch woodfloor
 x 34
 y 3
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 3
+end
+arch woodfloor
 x 34
 y 4
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 4
+end
+arch woodfloor
 x 34
 y 5
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 5
+end
+arch woodfloor
 x 34
 y 6
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 6
+end
+arch woodfloor
 x 34
 y 7
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 7
+end
+arch woodfloor
 x 34
 y 8
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 8
+end
+arch woodfloor
 x 34
 y 9
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 9
+end
+arch woodfloor
 x 34
 y 10
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 10
+end
+arch woodfloor
 x 34
 y 11
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 11
+end
+arch woodfloor
 x 34
 y 12
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 12
+end
+arch woodfloor
 x 34
 y 13
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 13
+end
+arch woodfloor
 x 34
 y 14
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 14
+end
+arch woodfloor
 x 34
 y 15
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 15
+end
+arch woodfloor
+x 34
+y 16
+end
+arch dwall_2_1_1
 x 34
 y 16
 end
@@ -3207,6 +3141,13 @@ sp 6
 x 36
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 1
+connected 666
+end
 arch woodfloor
 x 36
 y 1
@@ -3234,6 +3175,13 @@ x 36
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 3
+connected 666
+end
 arch woodfloor
 x 36
 y 3
@@ -3261,6 +3209,13 @@ x 36
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 5
+connected 666
+end
 arch woodfloor
 x 36
 y 5
@@ -3288,6 +3243,13 @@ x 36
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 7
+connected 666
+end
 arch woodfloor
 x 36
 y 7
@@ -3315,6 +3277,13 @@ x 36
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 9
+connected 666
+end
 arch woodfloor
 x 36
 y 9
@@ -3342,6 +3311,13 @@ x 36
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 11
+connected 666
+end
 arch woodfloor
 x 36
 y 11
@@ -3369,6 +3345,13 @@ x 36
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 13
+connected 666
+end
 arch woodfloor
 x 36
 y 13
@@ -3396,6 +3379,13 @@ x 36
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 36
+y 15
+connected 666
+end
 arch woodfloor
 x 36
 y 15
@@ -3723,6 +3713,13 @@ sp 7
 x 38
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 1
+connected 666
+end
 arch woodfloor
 x 38
 y 1
@@ -3750,6 +3747,13 @@ x 38
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 3
+connected 666
+end
 arch woodfloor
 x 38
 y 3
@@ -3777,6 +3781,13 @@ x 38
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 5
+connected 666
+end
 arch woodfloor
 x 38
 y 5
@@ -3804,6 +3815,13 @@ x 38
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 7
+connected 666
+end
 arch woodfloor
 x 38
 y 7
@@ -3831,6 +3849,13 @@ x 38
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 9
+connected 666
+end
 arch woodfloor
 x 38
 y 9
@@ -3858,6 +3883,13 @@ x 38
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 11
+connected 666
+end
 arch woodfloor
 x 38
 y 11
@@ -3885,6 +3917,13 @@ x 38
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 13
+connected 666
+end
 arch woodfloor
 x 38
 y 13
@@ -3912,6 +3951,13 @@ x 38
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 38
+y 15
+connected 666
+end
 arch woodfloor
 x 38
 y 15
@@ -4239,6 +4285,13 @@ sp 8
 x 40
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 1
+connected 666
+end
 arch woodfloor
 x 40
 y 1
@@ -4266,6 +4319,13 @@ x 40
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 3
+connected 666
+end
 arch woodfloor
 x 40
 y 3
@@ -4293,6 +4353,13 @@ x 40
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 5
+connected 666
+end
 arch woodfloor
 x 40
 y 5
@@ -4320,6 +4387,13 @@ x 40
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 7
+connected 666
+end
 arch woodfloor
 x 40
 y 7
@@ -4347,6 +4421,13 @@ x 40
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 9
+connected 666
+end
 arch woodfloor
 x 40
 y 9
@@ -4374,6 +4455,13 @@ x 40
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 11
+connected 666
+end
 arch woodfloor
 x 40
 y 11
@@ -4401,6 +4489,13 @@ x 40
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 13
+connected 666
+end
 arch woodfloor
 x 40
 y 13
@@ -4428,6 +4523,13 @@ x 40
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 40
+y 15
+connected 666
+end
 arch woodfloor
 x 40
 y 15
@@ -4755,6 +4857,13 @@ sp 4
 x 42
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 1
+connected 666
+end
 arch woodfloor
 x 42
 y 1
@@ -4782,6 +4891,13 @@ x 42
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 3
+connected 666
+end
 arch woodfloor
 x 42
 y 3
@@ -4809,6 +4925,13 @@ x 42
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 5
+connected 666
+end
 arch woodfloor
 x 42
 y 5
@@ -4836,6 +4959,13 @@ x 42
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 7
+connected 666
+end
 arch woodfloor
 x 42
 y 7
@@ -4863,6 +4993,13 @@ x 42
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 9
+connected 666
+end
 arch woodfloor
 x 42
 y 9
@@ -4890,6 +5027,13 @@ x 42
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 11
+connected 666
+end
 arch woodfloor
 x 42
 y 11
@@ -4917,6 +5061,13 @@ x 42
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 13
+connected 666
+end
 arch woodfloor
 x 42
 y 13
@@ -4944,6 +5095,13 @@ x 42
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_ogre
+x 42
+y 15
+connected 666
+end
 arch woodfloor
 x 42
 y 15
diff --git a/dungeons/train/skeleton b/dungeons/train/skeleton
index e707a7559..973fd9036 100644
--- a/dungeons/train/skeleton
+++ b/dungeons/train/skeleton
@@ -9,7 +9,7 @@ enter_x 18
 enter_y 11
 msg
 Created:  2003-06-19 crowbert
-Modified: 2011-08-24 Khaleh
+Modified: 2011-08-26 Khaleh
 endmsg
 end
 arch flagstone
@@ -2500,24 +2500,84 @@ arch blocked
 x 31
 y 16
 end
-arch woodfloor
+arch blocked
 x 32
 end
-arch firewall_4
-x 32
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
 arch blocked
 x 32
 y 1
 end
-arch woodfloor
+arch blocked
 x 32
 y 2
 end
+arch blocked
+x 32
+y 3
+end
+arch blocked
+x 32
+y 4
+end
+arch blocked
+x 32
+y 5
+end
+arch blocked
+x 32
+y 6
+end
+arch blocked
+x 32
+y 7
+end
+arch blocked
+x 32
+y 8
+end
+arch blocked
+x 32
+y 9
+end
+arch blocked
+x 32
+y 10
+end
+arch blocked
+x 32
+y 11
+end
+arch blocked
+x 32
+y 12
+end
+arch blocked
+x 32
+y 13
+end
+arch blocked
+x 32
+y 14
+end
+arch blocked
+x 32
+y 15
+end
+arch blocked
+x 32
+y 16
+end
+arch blocked
+x 33
+end
+arch blocked
+x 33
+y 1
+end
+arch woodfloor
+x 33
+y 2
+end
 arch magic_mouth
 msg
 You have roughly 30 to 45 minutes to
@@ -2525,16 +2585,16 @@ train here. After that time the skeletons
 will be to too tired to fight for a while.
 endmsg
 food 1
-x 32
+x 33
 y 2
 connected 777
 end
 arch blocked
-x 32
+x 33
 y 3
 end
 arch woodfloor
-x 32
+x 33
 y 4
 end
 arch magic_mouth
@@ -2542,368 +2602,242 @@ msg
 TRAINING PERIOD HAS ENDED.
 endmsg
 food 1
-x 32
+x 33
 y 4
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 5
 end
 arch woodfloor
-x 32
+x 33
 y 6
 end
 arch trigger
-x 32
+x 33
 y 6
 connected 333
 end
 arch vampire
 name Training Supervisor
-x 32
+x 33
 y 6
 sleep 0
 end
 arch blocked
-x 32
+x 33
 y 7
 end
 arch blocked
-x 32
+x 33
 y 8
 end
 arch woodfloor
-x 32
+x 33
 y 9
 end
 arch spikes_closed
-x 32
+x 33
 y 9
 connected 777
 end
 arch spikes_moving
-x 32
+x 33
 y 9
 end
 arch food
-x 32
+x 33
 y 9
 end
 arch woodfloor
-x 32
+x 33
 y 10
 end
 arch spikes_closed
-x 32
+x 33
 y 10
 connected 777
 end
 arch woodfloor
-x 32
+x 33
 y 11
 end
 arch altar_trigger
 name destroy generators then reset
 food 1
-x 32
+x 33
 y 11
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 12
 end
 arch woodfloor
-x 32
+x 33
 y 13
 end
 arch spikes_open
-x 32
+x 33
 y 13
 connected 1
 end
 arch food
-x 32
+x 33
 y 13
 end
 arch woodfloor
-x 32
+x 33
 y 14
 end
 arch altar_trigger
 name start timer
 exp 15500
 food 1
-x 32
+x 33
 y 14
 connected 777
 end
 arch blocked
-x 32
-y 15
-end
-arch woodfloor
-x 32
-y 16
-end
-arch firewall_2
-x 32
-y 16
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
-arch woodfloor
-x 33
-end
-arch grate_closed_2
-x 33
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 1
-end
-arch grate_closed_2
-x 33
-y 1
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 2
-end
-arch grate_closed_2
-x 33
-y 2
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 3
-end
-arch grate_closed_2
-x 33
-y 3
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 4
-end
-arch grate_closed_2
-x 33
-y 4
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 5
-end
-arch grate_closed_2
-x 33
-y 5
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 6
-end
-arch grate_closed_2
-x 33
-y 6
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 7
-end
-arch grate_closed_2
-x 33
-y 7
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 8
-end
-arch grate_closed_2
-x 33
-y 8
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 9
-end
-arch grate_closed_2
-x 33
-y 9
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 10
-end
-arch grate_closed_2
-x 33
-y 10
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 11
-end
-arch grate_closed_2
-x 33
-y 11
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 12
-end
-arch grate_closed_2
-x 33
-y 12
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 13
-end
-arch grate_closed_2
-x 33
-y 13
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 14
-end
-arch grate_closed_2
-x 33
-y 14
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
 x 33
 y 15
 end
-arch grate_closed_2
+arch blocked
 x 33
-y 15
-connected 666
-no_magic 1
-damned 1
+y 16
 end
 arch woodfloor
-x 33
-y 16
-end
-arch grate_closed_2
-x 33
-y 16
-connected 666
-no_magic 1
-damned 1
-end
-arch permanent_lava
 x 34
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+end
+arch woodfloor
 x 34
 y 1
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 1
+end
+arch woodfloor
 x 34
 y 2
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 2
+end
+arch woodfloor
 x 34
 y 3
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 3
+end
+arch woodfloor
 x 34
 y 4
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 4
+end
+arch woodfloor
 x 34
 y 5
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 5
+end
+arch woodfloor
 x 34
 y 6
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 6
+end
+arch woodfloor
 x 34
 y 7
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 7
+end
+arch woodfloor
 x 34
 y 8
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 8
+end
+arch woodfloor
 x 34
 y 9
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 9
+end
+arch woodfloor
 x 34
 y 10
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 10
+end
+arch woodfloor
 x 34
 y 11
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 11
+end
+arch woodfloor
 x 34
 y 12
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 12
+end
+arch woodfloor
 x 34
 y 13
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 13
+end
+arch woodfloor
 x 34
 y 14
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 14
+end
+arch woodfloor
 x 34
 y 15
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 15
+end
+arch woodfloor
+x 34
+y 16
+end
+arch dwall_2_1_1
 x 34
 y 16
 end
@@ -3207,6 +3141,13 @@ sp 6
 x 36
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 1
+connected 666
+end
 arch woodfloor
 x 36
 y 1
@@ -3234,6 +3175,13 @@ x 36
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 3
+connected 666
+end
 arch woodfloor
 x 36
 y 3
@@ -3261,6 +3209,13 @@ x 36
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 5
+connected 666
+end
 arch woodfloor
 x 36
 y 5
@@ -3288,6 +3243,13 @@ x 36
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 7
+connected 666
+end
 arch woodfloor
 x 36
 y 7
@@ -3315,6 +3277,13 @@ x 36
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 9
+connected 666
+end
 arch woodfloor
 x 36
 y 9
@@ -3342,6 +3311,13 @@ x 36
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 11
+connected 666
+end
 arch woodfloor
 x 36
 y 11
@@ -3369,6 +3345,13 @@ x 36
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 13
+connected 666
+end
 arch woodfloor
 x 36
 y 13
@@ -3396,6 +3379,13 @@ x 36
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 36
+y 15
+connected 666
+end
 arch woodfloor
 x 36
 y 15
@@ -3723,6 +3713,13 @@ sp 7
 x 38
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 1
+connected 666
+end
 arch woodfloor
 x 38
 y 1
@@ -3750,6 +3747,13 @@ x 38
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 3
+connected 666
+end
 arch woodfloor
 x 38
 y 3
@@ -3777,6 +3781,13 @@ x 38
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 5
+connected 666
+end
 arch woodfloor
 x 38
 y 5
@@ -3804,6 +3815,13 @@ x 38
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 7
+connected 666
+end
 arch woodfloor
 x 38
 y 7
@@ -3831,6 +3849,13 @@ x 38
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 9
+connected 666
+end
 arch woodfloor
 x 38
 y 9
@@ -3858,6 +3883,13 @@ x 38
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 11
+connected 666
+end
 arch woodfloor
 x 38
 y 11
@@ -3885,6 +3917,13 @@ x 38
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 13
+connected 666
+end
 arch woodfloor
 x 38
 y 13
@@ -3912,6 +3951,13 @@ x 38
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 38
+y 15
+connected 666
+end
 arch woodfloor
 x 38
 y 15
@@ -4239,6 +4285,13 @@ sp 8
 x 40
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 1
+connected 666
+end
 arch woodfloor
 x 40
 y 1
@@ -4266,6 +4319,13 @@ x 40
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 3
+connected 666
+end
 arch woodfloor
 x 40
 y 3
@@ -4293,6 +4353,13 @@ x 40
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 5
+connected 666
+end
 arch woodfloor
 x 40
 y 5
@@ -4320,6 +4387,13 @@ x 40
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 7
+connected 666
+end
 arch woodfloor
 x 40
 y 7
@@ -4347,6 +4421,13 @@ x 40
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 9
+connected 666
+end
 arch woodfloor
 x 40
 y 9
@@ -4374,6 +4455,13 @@ x 40
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 11
+connected 666
+end
 arch woodfloor
 x 40
 y 11
@@ -4401,6 +4489,13 @@ x 40
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 13
+connected 666
+end
 arch woodfloor
 x 40
 y 13
@@ -4428,6 +4523,13 @@ x 40
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 40
+y 15
+connected 666
+end
 arch woodfloor
 x 40
 y 15
@@ -4755,6 +4857,13 @@ sp 4
 x 42
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 1
+connected 666
+end
 arch woodfloor
 x 42
 y 1
@@ -4782,6 +4891,13 @@ x 42
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 3
+connected 666
+end
 arch woodfloor
 x 42
 y 3
@@ -4809,6 +4925,13 @@ x 42
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 5
+connected 666
+end
 arch woodfloor
 x 42
 y 5
@@ -4836,6 +4959,13 @@ x 42
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 7
+connected 666
+end
 arch woodfloor
 x 42
 y 7
@@ -4863,6 +4993,13 @@ x 42
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 9
+connected 666
+end
 arch woodfloor
 x 42
 y 9
@@ -4890,6 +5027,13 @@ x 42
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 11
+connected 666
+end
 arch woodfloor
 x 42
 y 11
@@ -4917,6 +5061,13 @@ x 42
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 13
+connected 666
+end
 arch woodfloor
 x 42
 y 13
@@ -4944,6 +5095,13 @@ x 42
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_skeleton
+x 42
+y 15
+connected 666
+end
 arch woodfloor
 x 42
 y 15
diff --git a/dungeons/train/zombie b/dungeons/train/zombie
index b708865bb..32098fc21 100644
--- a/dungeons/train/zombie
+++ b/dungeons/train/zombie
@@ -9,7 +9,7 @@ enter_x 16
 enter_y 4
 msg
 Created:  2003-06-19 crowbert
-Modified: 2011-08-24 Khaleh
+Modified: 2011-08-26 Khaleh
 endmsg
 end
 arch flagstone
@@ -2496,24 +2496,84 @@ arch blocked
 x 31
 y 16
 end
-arch woodfloor
+arch blocked
 x 32
 end
-arch firewall_4
-x 32
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
 arch blocked
 x 32
 y 1
 end
-arch woodfloor
+arch blocked
 x 32
 y 2
 end
+arch blocked
+x 32
+y 3
+end
+arch blocked
+x 32
+y 4
+end
+arch blocked
+x 32
+y 5
+end
+arch blocked
+x 32
+y 6
+end
+arch blocked
+x 32
+y 7
+end
+arch blocked
+x 32
+y 8
+end
+arch blocked
+x 32
+y 9
+end
+arch blocked
+x 32
+y 10
+end
+arch blocked
+x 32
+y 11
+end
+arch blocked
+x 32
+y 12
+end
+arch blocked
+x 32
+y 13
+end
+arch blocked
+x 32
+y 14
+end
+arch blocked
+x 32
+y 15
+end
+arch blocked
+x 32
+y 16
+end
+arch blocked
+x 33
+end
+arch blocked
+x 33
+y 1
+end
+arch woodfloor
+x 33
+y 2
+end
 arch magic_mouth
 msg
 You have roughly 30 to 45 minutes to
@@ -2522,16 +2582,16 @@ Zombies will return to their graves
 and will be unavailable a while.
 endmsg
 food 1
-x 32
+x 33
 y 2
 connected 777
 end
 arch blocked
-x 32
+x 33
 y 3
 end
 arch woodfloor
-x 32
+x 33
 y 4
 end
 arch magic_mouth
@@ -2539,368 +2599,242 @@ msg
 TRAINING PERIOD HAS ENDED.
 endmsg
 food 1
-x 32
+x 33
 y 4
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 5
 end
 arch woodfloor
-x 32
+x 33
 y 6
 end
 arch trigger
-x 32
+x 33
 y 6
 connected 333
 end
 arch vampire
 name Training Supervisor
-x 32
+x 33
 y 6
 sleep 0
 end
 arch blocked
-x 32
+x 33
 y 7
 end
 arch blocked
-x 32
+x 33
 y 8
 end
 arch woodfloor
-x 32
+x 33
 y 9
 end
 arch spikes_closed
-x 32
+x 33
 y 9
 connected 777
 end
 arch spikes_moving
-x 32
+x 33
 y 9
 end
 arch food
-x 32
+x 33
 y 9
 end
 arch woodfloor
-x 32
+x 33
 y 10
 end
 arch spikes_closed
-x 32
+x 33
 y 10
 connected 777
 end
 arch woodfloor
-x 32
+x 33
 y 11
 end
 arch altar_trigger
 name destroy generators then reset
 food 1
-x 32
+x 33
 y 11
 connected 666
 end
 arch blocked
-x 32
+x 33
 y 12
 end
 arch woodfloor
-x 32
+x 33
 y 13
 end
 arch spikes_open
-x 32
+x 33
 y 13
 connected 1
 end
 arch food
-x 32
+x 33
 y 13
 end
 arch woodfloor
-x 32
+x 33
 y 14
 end
 arch altar_trigger
 name start timer
 exp 15500
 food 1
-x 32
+x 33
 y 14
 connected 777
 end
 arch blocked
-x 32
-y 15
-end
-arch woodfloor
-x 32
-y 16
-end
-arch firewall_2
-x 32
-y 16
-speed -0.5
-level 100
-arch spell_dragonbreath
-end
-end
-arch woodfloor
-x 33
-end
-arch grate_closed_2
-x 33
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 1
-end
-arch grate_closed_2
-x 33
-y 1
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 2
-end
-arch grate_closed_2
-x 33
-y 2
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 3
-end
-arch grate_closed_2
-x 33
-y 3
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 4
-end
-arch grate_closed_2
-x 33
-y 4
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 5
-end
-arch grate_closed_2
-x 33
-y 5
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 6
-end
-arch grate_closed_2
-x 33
-y 6
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 7
-end
-arch grate_closed_2
-x 33
-y 7
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 8
-end
-arch grate_closed_2
-x 33
-y 8
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 9
-end
-arch grate_closed_2
-x 33
-y 9
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 10
-end
-arch grate_closed_2
-x 33
-y 10
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 11
-end
-arch grate_closed_2
-x 33
-y 11
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 12
-end
-arch grate_closed_2
-x 33
-y 12
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 13
-end
-arch grate_closed_2
-x 33
-y 13
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
-x 33
-y 14
-end
-arch grate_closed_2
-x 33
-y 14
-connected 666
-no_magic 1
-damned 1
-end
-arch woodfloor
 x 33
 y 15
 end
-arch grate_closed_2
+arch blocked
 x 33
-y 15
-connected 666
-no_magic 1
-damned 1
+y 16
 end
 arch woodfloor
-x 33
-y 16
-end
-arch grate_closed_2
-x 33
-y 16
-connected 666
-no_magic 1
-damned 1
-end
-arch permanent_lava
 x 34
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+end
+arch woodfloor
 x 34
 y 1
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 1
+end
+arch woodfloor
 x 34
 y 2
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 2
+end
+arch woodfloor
 x 34
 y 3
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 3
+end
+arch woodfloor
 x 34
 y 4
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 4
+end
+arch woodfloor
 x 34
 y 5
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 5
+end
+arch woodfloor
 x 34
 y 6
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 6
+end
+arch woodfloor
 x 34
 y 7
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 7
+end
+arch woodfloor
 x 34
 y 8
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 8
+end
+arch woodfloor
 x 34
 y 9
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 9
+end
+arch woodfloor
 x 34
 y 10
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 10
+end
+arch woodfloor
 x 34
 y 11
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 11
+end
+arch woodfloor
 x 34
 y 12
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 12
+end
+arch woodfloor
 x 34
 y 13
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 13
+end
+arch woodfloor
 x 34
 y 14
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 14
+end
+arch woodfloor
 x 34
 y 15
 end
-arch permanent_lava
+arch dwall_2_1_1
+x 34
+y 15
+end
+arch woodfloor
+x 34
+y 16
+end
+arch dwall_2_1_1
 x 34
 y 16
 end
@@ -3204,6 +3138,13 @@ sp 6
 x 36
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 1
+connected 666
+end
 arch woodfloor
 x 36
 y 1
@@ -3232,6 +3173,13 @@ x 36
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 3
+connected 666
+end
 arch woodfloor
 x 36
 y 3
@@ -3260,6 +3208,13 @@ x 36
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 5
+connected 666
+end
 arch woodfloor
 x 36
 y 5
@@ -3288,6 +3243,13 @@ x 36
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 7
+connected 666
+end
 arch woodfloor
 x 36
 y 7
@@ -3316,6 +3278,13 @@ x 36
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 9
+connected 666
+end
 arch woodfloor
 x 36
 y 9
@@ -3344,6 +3313,13 @@ x 36
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 11
+connected 666
+end
 arch woodfloor
 x 36
 y 11
@@ -3372,6 +3348,13 @@ x 36
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 13
+connected 666
+end
 arch woodfloor
 x 36
 y 13
@@ -3400,6 +3383,13 @@ x 36
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 36
+y 15
+connected 666
+end
 arch woodfloor
 x 36
 y 15
@@ -3728,6 +3718,13 @@ sp 7
 x 38
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 1
+connected 666
+end
 arch woodfloor
 x 38
 y 1
@@ -3756,6 +3753,13 @@ x 38
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 3
+connected 666
+end
 arch woodfloor
 x 38
 y 3
@@ -3784,6 +3788,13 @@ x 38
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 5
+connected 666
+end
 arch woodfloor
 x 38
 y 5
@@ -3812,6 +3823,13 @@ x 38
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 7
+connected 666
+end
 arch woodfloor
 x 38
 y 7
@@ -3840,6 +3858,13 @@ x 38
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 9
+connected 666
+end
 arch woodfloor
 x 38
 y 9
@@ -3868,6 +3893,13 @@ x 38
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 11
+connected 666
+end
 arch woodfloor
 x 38
 y 11
@@ -3896,6 +3928,13 @@ x 38
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 13
+connected 666
+end
 arch woodfloor
 x 38
 y 13
@@ -3924,6 +3963,13 @@ x 38
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 38
+y 15
+connected 666
+end
 arch woodfloor
 x 38
 y 15
@@ -4252,6 +4298,13 @@ sp 8
 x 40
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 1
+connected 666
+end
 arch woodfloor
 x 40
 y 1
@@ -4280,6 +4333,13 @@ x 40
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 3
+connected 666
+end
 arch woodfloor
 x 40
 y 3
@@ -4308,6 +4368,13 @@ x 40
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 5
+connected 666
+end
 arch woodfloor
 x 40
 y 5
@@ -4336,6 +4403,13 @@ x 40
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 7
+connected 666
+end
 arch woodfloor
 x 40
 y 7
@@ -4364,6 +4438,13 @@ x 40
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 9
+connected 666
+end
 arch woodfloor
 x 40
 y 9
@@ -4392,6 +4473,13 @@ x 40
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 11
+connected 666
+end
 arch woodfloor
 x 40
 y 11
@@ -4420,6 +4508,13 @@ x 40
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 13
+connected 666
+end
 arch woodfloor
 x 40
 y 13
@@ -4448,6 +4543,13 @@ x 40
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 40
+y 15
+connected 666
+end
 arch woodfloor
 x 40
 y 15
@@ -4776,6 +4878,13 @@ sp 4
 x 42
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 1
+connected 666
+end
 arch woodfloor
 x 42
 y 1
@@ -4804,6 +4913,13 @@ x 42
 y 2
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 3
+connected 666
+end
 arch woodfloor
 x 42
 y 3
@@ -4832,6 +4948,13 @@ x 42
 y 4
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 5
+connected 666
+end
 arch woodfloor
 x 42
 y 5
@@ -4860,6 +4983,13 @@ x 42
 y 6
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 7
+connected 666
+end
 arch woodfloor
 x 42
 y 7
@@ -4888,6 +5018,13 @@ x 42
 y 8
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 9
+connected 666
+end
 arch woodfloor
 x 42
 y 9
@@ -4916,6 +5053,13 @@ x 42
 y 10
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 11
+connected 666
+end
 arch woodfloor
 x 42
 y 11
@@ -4944,6 +5088,13 @@ x 42
 y 12
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 13
+connected 666
+end
 arch woodfloor
 x 42
 y 13
@@ -4972,6 +5123,13 @@ x 42
 y 14
 connected 333
 end
+arch duplicator
+name bye bye generator
+other_arch generate_zombie
+x 42
+y 15
+connected 666
+end
 arch woodfloor
 x 42
 y 15