diff --git a/quests/greyshield/GreyMaster b/quests/greyshield/GreyMaster index 5c8eb7d91..ec2a22771 100644 --- a/quests/greyshield/GreyMaster +++ b/quests/greyshield/GreyMaster @@ -8,26 +8,49 @@ Created: 1996-11-06 Chris Jeske Modified: 2008-06-06 Arvid Norlander endmsg end +arch marble +end arch dun10 end +arch marble +y 1 +end arch dun3 y 1 end +arch marble +y 2 +end arch dun3 y 2 end +arch marble +y 3 +end arch dun3 y 3 end +arch marble +y 4 +end arch dun11 y 4 end +arch marble +y 5 +end arch dun3 y 5 end +arch marble +y 6 +end arch dun3 y 6 end +arch marble +y 7 +end arch dun4 y 7 end @@ -168,6 +191,9 @@ arch guard hp 5000 y 23 end +arch marble +x 1 +end arch dun2 x 1 end @@ -195,6 +221,10 @@ arch marble x 1 y 3 end +arch marble +x 1 +y 4 +end arch dun12 x 1 y 4 @@ -213,6 +243,10 @@ y 6 speed 1.000000 connected 2 end +arch marble +x 1 +y 7 +end arch dun2 x 1 y 7 @@ -295,6 +329,9 @@ arch swall_1_2 x 1 y 23 end +arch marble +x 2 +end arch dun2 x 2 end @@ -349,6 +386,10 @@ arch table_3 x 2 y 6 end +arch marble +x 2 +y 7 +end arch dun2 x 2 y 7 @@ -397,6 +438,9 @@ x 2 y 23 connected 8 end +arch marble +x 3 +end arch dun2 x 3 end @@ -424,18 +468,34 @@ arch marble x 3 y 3 end +arch marble +x 3 +y 4 +end arch dun10 x 3 y 4 end -arch dun3 +arch marble x 3 y 5 end arch dun3 x 3 +y 5 +end +arch marble +x 3 y 6 end +arch dun3 +x 3 +y 6 +end +arch marble +x 3 +y 7 +end arch dun7 x 3 y 7 @@ -476,6 +536,9 @@ sp 7 x 3 y 23 end +arch marble +x 4 +end arch dun2 x 4 end @@ -503,6 +566,10 @@ arch marble x 4 y 3 end +arch marble +x 4 +y 4 +end arch dun2 x 4 y 4 @@ -594,6 +661,9 @@ sp 8 x 4 y 23 end +arch marble +x 5 +end arch dun2 x 5 end @@ -621,6 +691,10 @@ arch marble x 5 y 3 end +arch marble +x 5 +y 4 +end arch dun2 x 5 y 4 @@ -779,6 +853,9 @@ arch swall_1_2 x 5 y 23 end +arch marble +x 6 +end arch dun2 x 6 end @@ -806,14 +883,26 @@ arch marble x 6 y 3 end +arch marble +x 6 +y 4 +end arch dun9 x 6 y 4 end +arch marble +x 6 +y 5 +end arch dun3 x 6 y 5 end +arch marble +x 6 +y 6 +end arch dun4 x 6 y 6 @@ -895,6 +984,9 @@ arch food x 6 y 23 end +arch marble +x 7 +end arch dun2 x 7 end @@ -938,6 +1030,10 @@ arch marble x 7 y 5 end +arch marble +x 7 +y 6 +end arch dun2 x 7 y 6 @@ -995,6 +1091,9 @@ y 23 speed 0.000000 connected 2 end +arch marble +x 8 +end arch dun2 x 8 end @@ -1038,6 +1137,10 @@ arch marble x 8 y 5 end +arch marble +x 8 +y 6 +end arch dun2 x 8 y 6 @@ -1119,6 +1222,9 @@ y 23 speed 0.000000 connected 2 end +arch marble +x 9 +end arch dun2 x 9 end @@ -1162,6 +1268,10 @@ arch marble x 9 y 5 end +arch marble +x 9 +y 6 +end arch dun2 x 9 y 6 @@ -1255,6 +1365,9 @@ y 23 speed 0.000000 connected 2 end +arch marble +x 10 +end arch dun2 x 10 end @@ -1298,6 +1411,10 @@ arch marble x 10 y 5 end +arch marble +x 10 +y 6 +end arch dun2 x 10 y 6 @@ -1383,6 +1500,9 @@ x 10 y 23 connected 1 end +arch marble +x 11 +end arch dun2 x 11 end @@ -1426,6 +1546,10 @@ arch marble x 11 y 5 end +arch marble +x 11 +y 6 +end arch dun2 x 11 y 6 @@ -1498,6 +1622,9 @@ arch blocked x 11 y 23 end +arch marble +x 12 +end arch dun16 x 12 end @@ -1581,78 +1708,153 @@ y 5 connected 1 blocksview 1 end +arch marble +x 12 +y 6 +end arch dun14 x 12 y 6 end -arch dun3 +arch marble x 12 y 7 end arch dun3 x 12 +y 7 +end +arch marble +x 12 y 8 end arch dun3 x 12 +y 8 +end +arch marble +x 12 y 9 end arch dun3 x 12 +y 9 +end +arch marble +x 12 y 10 end arch dun3 x 12 +y 10 +end +arch marble +x 12 y 11 end arch dun3 x 12 +y 11 +end +arch marble +x 12 y 12 end arch dun3 x 12 +y 12 +end +arch marble +x 12 y 13 end arch dun3 x 12 +y 13 +end +arch marble +x 12 y 14 end arch dun3 x 12 +y 14 +end +arch marble +x 12 y 15 end arch dun3 x 12 +y 15 +end +arch marble +x 12 y 16 end arch dun3 x 12 +y 16 +end +arch marble +x 12 y 17 end arch dun3 x 12 +y 17 +end +arch marble +x 12 y 18 end arch dun3 x 12 +y 18 +end +arch marble +x 12 y 19 end arch dun3 x 12 +y 19 +end +arch marble +x 12 y 20 end arch dun3 x 12 +y 20 +end +arch marble +x 12 y 21 end arch dun3 x 12 +y 21 +end +arch marble +x 12 y 22 end +arch dun3 +x 12 +y 22 +end +arch marble +x 12 +y 23 +end arch cave_9 x 12 y 23 end +arch marble +x 13 +end arch dun2 x 13 end @@ -1842,11 +2044,18 @@ arch marble x 13 y 22 end -arch dun2 +arch marble x 13 y 23 end arch dun2 +x 13 +y 23 +end +arch marble +x 14 +end +arch dun2 x 14 end arch unholy_ground @@ -2025,10 +2234,17 @@ arch marble x 14 y 22 end +arch marble +x 14 +y 23 +end arch dun2 x 14 y 23 end +arch marble +x 15 +end arch dun2 x 15 end @@ -2144,24 +2360,44 @@ arch cave_14 x 15 y 14 end -arch dun3 +arch marble x 15 y 15 end arch dun3 x 15 +y 15 +end +arch marble +x 15 y 16 end arch dun3 x 15 +y 16 +end +arch marble +x 15 y 17 end arch dun3 x 15 +y 17 +end +arch marble +x 15 y 18 end arch dun3 x 15 +y 18 +end +arch marble +x 15 +y 19 +end +arch dun3 +x 15 y 19 end arch marble @@ -2188,11 +2424,18 @@ arch marble x 15 y 22 end -arch dun2 +arch marble x 15 y 23 end arch dun2 +x 15 +y 23 +end +arch marble +x 16 +end +arch dun2 x 16 end arch unholy_ground @@ -2347,6 +2590,10 @@ arch flagstone x 16 y 19 end +arch marble +x 16 +y 20 +end arch dun2 x 16 y 20 @@ -2367,11 +2614,18 @@ arch marble x 16 y 22 end -arch dun2 +arch marble x 16 y 23 end arch dun2 +x 16 +y 23 +end +arch marble +x 17 +end +arch dun2 x 17 end arch unholy_ground @@ -2526,6 +2780,10 @@ arch flagstone x 17 y 19 end +arch marble +x 17 +y 20 +end arch dun2 x 17 y 20 @@ -2546,11 +2804,18 @@ arch marble x 17 y 22 end -arch dun2 +arch marble x 17 y 23 end arch dun2 +x 17 +y 23 +end +arch marble +x 18 +end +arch dun2 x 18 end arch unholy_ground @@ -2593,6 +2858,10 @@ arch marble x 18 y 5 end +arch marble +x 18 +y 6 +end arch cave_12 x 18 y 6 @@ -2621,28 +2890,52 @@ arch cave_14 x 18 y 9 end -arch dun3 +arch marble x 18 y 10 end arch dun3 x 18 +y 10 +end +arch marble +x 18 y 11 end arch dun3 x 18 +y 11 +end +arch marble +x 18 y 12 end arch dun3 x 18 +y 12 +end +arch marble +x 18 y 13 end arch dun3 x 18 +y 13 +end +arch marble +x 18 y 14 end arch dun3 x 18 +y 14 +end +arch marble +x 18 +y 15 +end +arch dun3 +x 18 y 15 end arch marble @@ -2701,11 +2994,18 @@ arch marble x 18 y 22 end -arch dun2 +arch marble x 18 y 23 end arch dun2 +x 18 +y 23 +end +arch marble +x 19 +end +arch dun2 x 19 end arch unholy_ground @@ -2748,6 +3048,10 @@ arch marble x 19 y 5 end +arch marble +x 19 +y 6 +end arch cave_13 x 19 y 6 @@ -2880,11 +3184,18 @@ arch marble x 19 y 22 end -arch dun2 +arch marble x 19 y 23 end arch dun2 +x 19 +y 23 +end +arch marble +x 20 +end +arch dun2 x 20 end arch unholy_ground @@ -3063,10 +3374,17 @@ arch marble x 20 y 22 end +arch marble +x 20 +y 23 +end arch dun2 x 20 y 23 end +arch marble +x 21 +end arch dun2 x 21 end @@ -3290,18 +3608,33 @@ arch marble x 21 y 20 end +arch marble +x 21 +y 21 +end arch cave_7 x 21 y 21 end +arch marble +x 21 +y 22 +end arch dun3 x 21 y 22 end +arch marble +x 21 +y 23 +end arch dun13 x 21 y 23 end +arch marble +x 22 +end arch dun2 x 22 end @@ -3602,11 +3935,18 @@ swept along with them forever... endmsg end end -arch dun2 +arch marble x 22 y 23 end arch dun2 +x 22 +y 23 +end +arch marble +x 23 +end +arch dun2 x 23 end arch unholy_ground @@ -3849,10 +4189,17 @@ arch random_treasure x 23 y 22 end +arch marble +x 23 +y 23 +end arch dun2 x 23 y 23 end +arch marble +x 24 +end arch dun2 x 24 end @@ -4036,10 +4383,17 @@ arch random_treasure x 24 y 22 end +arch marble +x 24 +y 23 +end arch dun2 x 24 y 23 end +arch marble +x 25 +end arch dun2 x 25 end @@ -4223,10 +4577,17 @@ arch random_treasure x 25 y 22 end +arch marble +x 25 +y 23 +end arch dun2 x 25 y 23 end +arch marble +x 26 +end arch dun2 x 26 end @@ -4402,10 +4763,17 @@ arch flagstone x 26 y 22 end +arch marble +x 26 +y 23 +end arch dun2 x 26 y 23 end +arch marble +x 27 +end arch dun2 x 27 end @@ -4585,10 +4953,17 @@ arch flagstone x 27 y 22 end +arch marble +x 27 +y 23 +end arch dun2 x 27 y 23 end +arch marble +x 28 +end arch dun2 x 28 end @@ -4763,10 +5138,17 @@ arch flagstone x 28 y 22 end +arch marble +x 28 +y 23 +end arch dun2 x 28 y 23 end +arch marble +x 29 +end arch dun2 x 29 end @@ -4943,10 +5325,17 @@ arch flagstone x 29 y 22 end +arch marble +x 29 +y 23 +end arch dun2 x 29 y 23 end +arch marble +x 30 +end arch dun2 x 30 end @@ -5090,101 +5479,200 @@ arch flagstone x 30 y 22 end +arch marble +x 30 +y 23 +end arch dun2 x 30 y 23 end +arch marble +x 31 +end arch cave_8 x 31 end -arch dun3 +arch marble x 31 y 1 end arch dun3 x 31 +y 1 +end +arch marble +x 31 y 2 end arch dun3 x 31 +y 2 +end +arch marble +x 31 y 3 end arch dun3 x 31 +y 3 +end +arch marble +x 31 y 4 end arch dun3 x 31 +y 4 +end +arch marble +x 31 y 5 end arch dun3 x 31 +y 5 +end +arch marble +x 31 y 6 end arch dun3 x 31 +y 6 +end +arch marble +x 31 y 7 end arch dun3 x 31 +y 7 +end +arch marble +x 31 y 8 end arch dun3 x 31 +y 8 +end +arch marble +x 31 y 9 end arch dun3 x 31 +y 9 +end +arch marble +x 31 y 10 end arch dun3 x 31 +y 10 +end +arch marble +x 31 +y 11 +end +arch dun3 +x 31 y 11 end +arch marble +x 31 +y 12 +end arch dun14 x 31 y 12 end -arch dun3 +arch marble x 31 y 13 end arch dun3 x 31 +y 13 +end +arch marble +x 31 y 14 end +arch dun3 +x 31 +y 14 +end +arch marble +x 31 +y 15 +end arch dun14 x 31 y 15 end -arch dun3 +arch marble x 31 y 16 end arch dun3 x 31 +y 16 +end +arch marble +x 31 y 17 end arch dun3 x 31 +y 17 +end +arch marble +x 31 y 18 end arch dun3 x 31 +y 18 +end +arch marble +x 31 y 19 end arch dun3 x 31 +y 19 +end +arch marble +x 31 y 20 end arch dun3 x 31 +y 20 +end +arch marble +x 31 y 21 end arch dun3 x 31 +y 21 +end +arch marble +x 31 +y 22 +end +arch dun3 +x 31 y 22 end +arch marble +x 31 +y 23 +end arch cave_10 x 31 y 23