diff --git a/quests/mak/chaos/up3 b/quests/mak/chaos/up3
index 8872590dd..09442be75 100644
--- a/quests/mak/chaos/up3
+++ b/quests/mak/chaos/up3
@@ -491,31 +491,9 @@ arch woodfloor
 x 3
 y 4
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 3
 y 4
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 3
@@ -529,31 +507,9 @@ arch woodfloor
 x 3
 y 7
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 3
 y 7
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 3
@@ -647,31 +603,9 @@ arch woodfloor
 x 3
 y 27
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 3
 y 27
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 3
@@ -767,31 +701,9 @@ arch woodfloor
 x 4
 y 18
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 4
 y 18
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 4
@@ -1029,31 +941,9 @@ arch woodfloor
 x 6
 y 7
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 6
 y 7
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 6
@@ -1091,31 +981,9 @@ arch woodfloor
 x 6
 y 15
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 6
 y 15
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 6
@@ -1165,31 +1033,9 @@ arch woodfloor
 x 6
 y 25
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 6
 y 25
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 6
@@ -2262,31 +2108,9 @@ arch woodfloor
 x 13
 y 2
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 13
 y 2
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 13
@@ -2296,31 +2120,9 @@ arch woodfloor
 x 13
 y 4
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 13
 y 4
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 13
@@ -3024,31 +2826,9 @@ arch woodfloor
 x 17
 y 4
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 17
 y 4
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 17
@@ -3689,31 +3469,9 @@ arch woodfloor
 x 21
 y 10
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 21
 y 10
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 21
@@ -3869,31 +3627,9 @@ arch woodfloor
 x 22
 y 2
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 22
 y 2
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 22
@@ -4141,31 +3877,9 @@ arch woodfloor
 x 23
 y 25
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 23
 y 25
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 23
@@ -4249,31 +3963,9 @@ arch woodfloor
 x 24
 y 12
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 24
 y 12
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 24
@@ -4385,31 +4077,9 @@ arch woodfloor
 x 25
 y 3
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 25
 y 3
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 25
@@ -4523,31 +4193,9 @@ arch woodfloor
 x 25
 y 28
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 25
 y 28
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 25
@@ -4587,31 +4235,9 @@ arch woodfloor
 x 26
 y 5
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 26
 y 5
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 26
@@ -4629,31 +4255,9 @@ arch woodfloor
 x 26
 y 8
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 26
 y 8
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 26
@@ -4727,31 +4331,9 @@ arch woodfloor
 x 26
 y 23
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 26
 y 23
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 26
@@ -5053,31 +4635,9 @@ arch woodfloor
 x 28
 y 24
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 28
 y 24
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 28
@@ -5157,31 +4717,9 @@ arch woodfloor
 x 29
 y 10
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 29
 y 10
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 29
@@ -5191,31 +4729,9 @@ arch woodfloor
 x 29
 y 12
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 29
 y 12
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 29
@@ -5241,31 +4757,9 @@ arch woodfloor
 x 29
 y 17
 end
-arch gargolye
-name large gargoyle
-Str 80
-Con 56
-hp 8000
-maxhp 8000
-exp 150000
-dam 50
-wc -15
-ac -5
+arch large_gargolye
 x 29
 y 17
-speed -0.400000
-level 25
-resist_physical 30
-resist_fire 100
-resist_electricity 100
-resist_cold 100
-resist_confusion 100
-resist_acid -100
-resist_drain 100
-resist_ghosthit 100
-resist_paralyze 100
-resist_fear 100
-resist_death 100
 end
 arch woodfloor
 x 29