diff --git a/sisters/necro_hole1 b/sisters/necro_hole1 index b7e9fbd14..bd1b64b0f 100644 --- a/sisters/necro_hole1 +++ b/sisters/necro_hole1 @@ -1429,10 +1429,6 @@ x 6 y 23 speed_left -0.260000 end -arch dungeon_floor -x 6 -y 24 -end arch magic_mouth msg Looks like a tomb! @@ -1440,6 +1436,10 @@ endmsg x 6 y 24 end +arch dungeon_floor +x 6 +y 24 +end arch weak_wall_2 x 6 y 24 diff --git a/sisters/shrine0 b/sisters/shrine0 index e226349d1..a9f191022 100644 --- a/sisters/shrine0 +++ b/sisters/shrine0 @@ -1914,10 +1914,6 @@ arch awall_2_2_4 x 16 y 7 end -arch cobblestones2 -x 16 -y 8 -end arch magic_mouth msg You see here a mural of a figure @@ -1930,6 +1926,10 @@ y 8 end arch cobblestones2 x 16 +y 8 +end +arch cobblestones2 +x 16 y 9 end arch cobblestones2 @@ -2358,10 +2358,6 @@ no_pass 0 x 17 y 6 end -arch cobblestones2 -x 17 -y 7 -end arch magic_mouth msg You see here a rune covered wall @@ -2371,6 +2367,10 @@ y 7 end arch cobblestones2 x 17 +y 7 +end +arch cobblestones2 +x 17 y 8 end arch cobblestones2 @@ -2401,10 +2401,6 @@ connected 20 x 17 y 12 end -arch marble -x 17 -y 13 -end arch magic_mouth msg Sacrilege! No human may @@ -2420,6 +2416,10 @@ y 13 end arch marble x 17 +y 13 +end +arch marble +x 17 y 14 end arch serp_priest @@ -3221,10 +3221,6 @@ arch awall_2_2_1 x 19 y 7 end -arch cobblestones2 -x 19 -y 8 -end arch magic_mouth msg You see here a mural of several @@ -3236,6 +3232,10 @@ y 8 end arch cobblestones2 x 19 +y 8 +end +arch cobblestones2 +x 19 y 9 end arch cobblestones2 diff --git a/sisters/shrine0_east b/sisters/shrine0_east index 46ca9a5cd..aa9941f77 100644 --- a/sisters/shrine0_east +++ b/sisters/shrine0_east @@ -722,10 +722,6 @@ arch awall_2_2_4 x 13 y 11 end -arch flagstone -x 13 -y 12 -end arch magic_mouth msg This chamber looks like a large @@ -736,13 +732,17 @@ y 12 end arch flagstone x 13 +y 12 +end +arch magic_mouth +msg +This chamber looks like a large +tomb. +endmsg +x 13 y 13 end -arch magic_mouth -msg -This chamber looks like a large -tomb. -endmsg +arch flagstone x 13 y 13 end @@ -1133,10 +1133,6 @@ vulnerable 0 x 15 y 19 end -arch flagstone -x 15 -y 20 -end arch magic_mouth msg There are cryptic symbols on the @@ -1145,6 +1141,10 @@ endmsg x 15 y 20 end +arch flagstone +x 15 +y 20 +end arch cobblestones2 x 15 y 21 @@ -1407,10 +1407,6 @@ arch weak_wall_2 x 17 y 4 end -arch flagstone -x 17 -y 5 -end arch magic_mouth msg There are cryptic symbols on the @@ -1421,6 +1417,10 @@ y 5 end arch flagstone x 17 +y 5 +end +arch flagstone +x 17 y 6 end arch flagstone @@ -1475,10 +1475,6 @@ arch flagstone x 17 y 19 end -arch flagstone -x 17 -y 20 -end arch magic_mouth msg There are cryptic symbols on the @@ -1487,6 +1483,10 @@ endmsg x 17 y 20 end +arch flagstone +x 17 +y 20 +end arch cobblestones2 x 17 y 21 @@ -2008,10 +2008,6 @@ arch cwall_0 x 20 y 20 end -arch flagstone -x 20 -y 21 -end arch magic_mouth msg There are cryptic symbols on the @@ -2020,6 +2016,10 @@ endmsg x 20 y 21 end +arch flagstone +x 20 +y 21 +end arch cobblestones2 x 20 y 22 @@ -2079,10 +2079,6 @@ arch weak_wall_2 x 21 y 4 end -arch flagstone -x 21 -y 5 -end arch magic_mouth msg There are cryptic symbols on the @@ -2093,6 +2089,10 @@ y 5 end arch flagstone x 21 +y 5 +end +arch flagstone +x 21 y 6 end arch dungeon_magic @@ -2552,10 +2552,6 @@ arch weak_wall_2 x 24 y 4 end -arch flagstone -x 24 -y 5 -end arch magic_mouth msg There are cryptic symbols on the @@ -2566,6 +2562,10 @@ y 5 end arch flagstone x 24 +y 5 +end +arch flagstone +x 24 y 6 end arch black_pudding @@ -2883,10 +2883,6 @@ vulnerable 0 x 25 y 18 end -arch flagstone -x 25 -y 19 -end arch magic_mouth msg There are cryptic symbols on the @@ -2897,6 +2893,10 @@ y 19 end arch flagstone x 25 +y 19 +end +arch flagstone +x 25 y 20 end arch cobblestones2 @@ -2946,10 +2946,6 @@ arch flagstone x 26 y 5 end -arch flagstone -x 26 -y 6 -end arch magic_mouth msg There are cryptic symbols on the @@ -2960,16 +2956,16 @@ y 6 end arch flagstone x 26 +y 6 +end +arch flagstone +x 26 y 7 end arch flagstone x 26 y 8 end -arch flagstone -x 26 -y 9 -end arch magic_mouth msg There are cryptic symbols on the @@ -2980,6 +2976,10 @@ y 9 end arch flagstone x 26 +y 9 +end +arch flagstone +x 26 y 10 end arch dungeon_magic @@ -2994,15 +2994,15 @@ arch dungeon_magic x 26 y 11 end -arch flagstone +arch magic_mouth +msg +There are cryptic symbols on the +wall here. +endmsg x 26 y 12 end -arch magic_mouth -msg -There are cryptic symbols on the -wall here. -endmsg +arch flagstone x 26 y 12 end @@ -3347,10 +3347,6 @@ arch random_wealth x 28 y 18 end -arch flagstone -x 28 -y 19 -end arch magic_mouth msg There are cryptic symbols on the @@ -3359,6 +3355,10 @@ endmsg x 28 y 19 end +arch flagstone +x 28 +y 19 +end arch cobblestones2 x 28 y 20 diff --git a/sisters/shrine0_west b/sisters/shrine0_west index dc3af7537..5dcb602fb 100644 --- a/sisters/shrine0_west +++ b/sisters/shrine0_west @@ -92,10 +92,6 @@ other_arch nightmare x 1 y 8 end -arch flagstone -x 1 -y 9 -end arch magic_mouth msg You see here a mural of four @@ -108,6 +104,10 @@ y 9 end arch flagstone x 1 +y 9 +end +arch flagstone +x 1 y 10 end arch cobblestones2 @@ -681,10 +681,6 @@ arch awall_2_1_2 x 6 y 1 end -arch flagstone -x 6 -y 2 -end arch magic_mouth msg You see here four black spirits @@ -697,6 +693,10 @@ y 2 end arch flagstone x 6 +y 2 +end +arch flagstone +x 6 y 3 end arch generate_kobold @@ -1021,10 +1021,6 @@ arch awall_1_4 x 8 y 17 end -arch flagstone -x 8 -y 18 -end arch magic_mouth msg You see here a mural of @@ -1036,6 +1032,10 @@ y 18 end arch flagstone x 8 +y 18 +end +arch flagstone +x 8 y 19 end arch flagstone @@ -1260,10 +1260,6 @@ arch awall_2_1_2 x 10 y 10 end -arch flagstone -x 10 -y 11 -end arch magic_mouth msg You see here a mural of a the @@ -1276,6 +1272,10 @@ y 11 end arch flagstone x 10 +y 11 +end +arch flagstone +x 10 y 12 end arch flagstone @@ -1730,10 +1730,6 @@ arch awall_2_1_2 x 13 y 19 end -arch flagstone -x 13 -y 20 -end arch magic_mouth msg You see here a mural of @@ -1745,6 +1741,10 @@ y 20 end arch flagstone x 13 +y 20 +end +arch flagstone +x 13 y 21 end arch flagstone @@ -1780,10 +1780,6 @@ arch awall_2_1_2 x 14 y 2 end -arch flagstone -x 14 -y 3 -end arch magic_mouth msg You see here a mural of three @@ -1796,6 +1792,10 @@ y 3 end arch flagstone x 14 +y 3 +end +arch flagstone +x 14 y 4 end arch cobblestones2 @@ -1846,10 +1846,6 @@ arch awall_2_2_1 x 14 y 12 end -arch flagstone -x 14 -y 13 -end arch magic_mouth msg This room is filled with many @@ -1860,7 +1856,7 @@ y 13 end arch flagstone x 14 -y 14 +y 13 end arch magic_mouth msg @@ -1872,6 +1868,10 @@ y 14 end arch flagstone x 14 +y 14 +end +arch flagstone +x 14 y 15 end arch cobblestones2 diff --git a/sisters/shrine1 b/sisters/shrine1 index b8eaeae4f..15f13ea4c 100644 --- a/sisters/shrine1 +++ b/sisters/shrine1 @@ -747,10 +747,6 @@ arch dungeon_floor x 4 y 23 end -arch dungeon_floor -x 4 -y 24 -end arch magic_mouth msg This side of the under-shrine @@ -760,6 +756,10 @@ endmsg x 4 y 24 end +arch dungeon_floor +x 4 +y 24 +end arch cobblestones2 x 4 y 25 @@ -1196,10 +1196,6 @@ blocksview 1 x 7 y 6 end -arch dungeon_floor -x 7 -y 7 -end arch magic_mouth msg Beyond this door lies the Warden @@ -1210,6 +1206,10 @@ y 7 end arch dungeon_floor x 7 +y 7 +end +arch dungeon_floor +x 7 y 8 end arch dungeon_floor @@ -1224,10 +1224,6 @@ arch dungeon_floor x 7 y 11 end -arch dungeon_floor -x 7 -y 12 -end arch magic_mouth msg Beyond this door lies the Warden @@ -1236,6 +1232,10 @@ endmsg x 7 y 12 end +arch dungeon_floor +x 7 +y 12 +end arch cobblestones2 x 7 y 13 @@ -2952,10 +2952,6 @@ arch dungeon_floor x 15 y 30 end -arch dungeon_floor -x 15 -y 31 -end arch magic_mouth msg The entrance to the tunnel here looks @@ -2964,6 +2960,10 @@ endmsg x 15 y 31 end +arch dungeon_floor +x 15 +y 31 +end arch blocked name path of night no_pass 0 @@ -4631,10 +4631,6 @@ blocksview 1 x 24 y 6 end -arch dungeon_floor -x 24 -y 7 -end arch magic_mouth msg Beyond this door lies the Warden @@ -4643,6 +4639,10 @@ endmsg x 24 y 7 end +arch dungeon_floor +x 24 +y 7 +end arch cobblestones2 x 24 y 8 @@ -4671,10 +4671,6 @@ arch awall_2_1_2 x 24 y 11 end -arch dungeon_floor -x 24 -y 12 -end arch magic_mouth msg Beyond this door lies the Warden @@ -4683,6 +4679,10 @@ endmsg x 24 y 12 end +arch dungeon_floor +x 24 +y 12 +end arch cobblestones2 x 24 y 13 diff --git a/sisters/small_manor1 b/sisters/small_manor1 index 11a6ebaff..7e25565c6 100644 --- a/sisters/small_manor1 +++ b/sisters/small_manor1 @@ -31,9 +31,6 @@ end arch grass_only y 7 end -arch grass_only -y 8 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -41,7 +38,7 @@ sp 39 y 8 end arch grass_only -y 9 +y 8 end arch invis_exit slaying /world/world_115_110 @@ -50,7 +47,7 @@ sp 39 y 9 end arch grass_only -y 10 +y 9 end arch invis_exit slaying /world/world_115_110 @@ -59,7 +56,7 @@ sp 39 y 10 end arch grass_only -y 11 +y 10 end arch invis_exit slaying /world/world_115_110 @@ -68,7 +65,7 @@ sp 39 y 11 end arch grass_only -y 12 +y 11 end arch invis_exit slaying /world/world_115_110 @@ -76,8 +73,8 @@ hp 13 sp 39 y 12 end -arch farmland -y 13 +arch grass_only +y 12 end arch invis_exit slaying /world/world_115_110 @@ -86,7 +83,7 @@ sp 39 y 13 end arch farmland -y 14 +y 13 end arch invis_exit slaying /world/world_115_110 @@ -95,12 +92,15 @@ sp 39 y 14 end arch farmland +y 14 +end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 y 15 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 +arch farmland y 15 end arch grass_only @@ -174,10 +174,6 @@ arch grass_only x 1 y 14 end -arch farmland -x 1 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -185,6 +181,10 @@ sp 39 x 1 y 15 end +arch farmland +x 1 +y 15 +end arch grass_only x 2 end @@ -289,10 +289,6 @@ arch grass_only x 2 y 14 end -arch grass -x 2 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -300,6 +296,10 @@ sp 39 x 2 y 15 end +arch grass +x 2 +y 15 +end arch grass_only x 3 end @@ -416,10 +416,6 @@ arch farmland x 3 y 14 end -arch grass_only -x 3 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -427,6 +423,10 @@ sp 39 x 3 y 15 end +arch grass_only +x 3 +y 15 +end arch grass x 4 end @@ -542,10 +542,6 @@ arch farmland x 4 y 14 end -arch grass_only -x 4 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -553,6 +549,10 @@ sp 39 x 4 y 15 end +arch grass_only +x 4 +y 15 +end arch flagstone x 5 end @@ -669,10 +669,6 @@ arch farmland x 5 y 14 end -arch grass_only -x 5 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -680,6 +676,10 @@ sp 39 x 5 y 15 end +arch grass_only +x 5 +y 15 +end arch flagstone x 6 end @@ -819,10 +819,6 @@ arch grass_only x 6 y 14 end -arch grass_only -x 6 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -830,6 +826,10 @@ sp 39 x 6 y 15 end +arch grass_only +x 6 +y 15 +end arch flagstone x 7 end @@ -988,10 +988,6 @@ arch grass_only x 7 y 14 end -arch grass_only -x 7 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -999,6 +995,10 @@ sp 39 x 7 y 15 end +arch grass_only +x 7 +y 15 +end arch grass x 8 end @@ -1140,10 +1140,6 @@ arch cobblestones2 x 8 y 14 end -arch grass_only -x 8 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1151,6 +1147,10 @@ sp 39 x 8 y 15 end +arch grass_only +x 8 +y 15 +end arch grass x 9 end @@ -1267,10 +1267,6 @@ arch cobblestones2 x 9 y 14 end -arch grass_only -x 9 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1279,6 +1275,10 @@ x 9 y 15 end arch grass_only +x 9 +y 15 +end +arch grass_only x 10 end arch flagstone @@ -1378,10 +1378,6 @@ arch cobblestones2 x 10 y 14 end -arch grass_only -x 10 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1390,12 +1386,16 @@ x 10 y 15 end arch grass_only +x 10 +y 15 +end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 x 11 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 +arch grass_only x 11 end arch flagstone @@ -1491,10 +1491,6 @@ arch pstone_1 x 11 y 14 end -arch grass_only -x 11 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1503,12 +1499,16 @@ x 11 y 15 end arch grass_only +x 11 +y 15 +end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 x 12 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 +arch grass_only x 12 end arch pstone_1 @@ -1600,10 +1600,6 @@ arch grass_only x 12 y 14 end -arch grass_only -x 12 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1612,12 +1608,16 @@ x 12 y 15 end arch grass_only +x 12 +y 15 +end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 x 13 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 +arch grass_only x 13 end arch pstone_1 @@ -1708,10 +1708,6 @@ arch pstone_1 x 13 y 14 end -arch grass_only -x 13 -y 15 -end arch invis_exit slaying /world/world_115_110 hp 13 @@ -1720,12 +1716,16 @@ x 13 y 15 end arch grass_only +x 13 +y 15 +end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 x 14 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 +arch grass_only x 14 end arch grass_only @@ -1796,6 +1796,13 @@ arch pstone_1 x 14 y 14 end +arch invis_exit +slaying /world/world_115_110 +hp 13 +sp 39 +x 14 +y 15 +end arch grass_only x 14 y 15 @@ -1804,8 +1811,7 @@ arch invis_exit slaying /world/world_115_110 hp 13 sp 39 -x 14 -y 15 +x 15 end arch pstone_1 x 15 @@ -1815,6 +1821,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 +y 1 end arch pstone_1 x 15 @@ -1825,7 +1832,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 1 +y 2 end arch grass_only x 15 @@ -1836,7 +1843,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 2 +y 3 end arch grass_only x 15 @@ -1847,7 +1854,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 3 +y 4 end arch pstone_1 x 15 @@ -1858,7 +1865,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 4 +y 5 end arch pstone_1 x 15 @@ -1869,7 +1876,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 5 +y 6 end arch pstone_1 x 15 @@ -1880,7 +1887,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 6 +y 7 end arch pstone_1 x 15 @@ -1891,7 +1898,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 7 +y 8 end arch pstone_1 x 15 @@ -1902,7 +1909,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 8 +y 9 end arch pstone_1 x 15 @@ -1913,7 +1920,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 9 +y 10 end arch pstone_1 x 15 @@ -1924,7 +1931,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 10 +y 11 end arch pstone_1 x 15 @@ -1935,7 +1942,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 11 +y 12 end arch pstone_1 x 15 @@ -1946,7 +1953,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 12 +y 13 end arch pstone_1 x 15 @@ -1957,7 +1964,7 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 13 +y 14 end arch pstone_1 x 15 @@ -1968,16 +1975,9 @@ slaying /world/world_115_110 hp 13 sp 39 x 15 -y 14 +y 15 end arch pstone_1 x 15 y 15 end -arch invis_exit -slaying /world/world_115_110 -hp 13 -sp 39 -x 15 -y 15 -end diff --git a/sisters/tower0 b/sisters/tower0 index 88e1f9af2..cb62bf374 100644 --- a/sisters/tower0 +++ b/sisters/tower0 @@ -39,9 +39,6 @@ end arch flagstone y 7 end -arch awall_2_1_1 -y 7 -end arch magic_mouth msg You hear the sound of rock sliding on @@ -50,6 +47,9 @@ endmsg y 7 connected 10 end +arch awall_2_1_1 +y 7 +end arch flagstone y 8 end diff --git a/sisters/tower2 b/sisters/tower2 index a049b5871..a43d267c4 100644 --- a/sisters/tower2 +++ b/sisters/tower2 @@ -673,10 +673,6 @@ arch flagstone x 5 y 6 end -arch cobblestones -x 5 -y 7 -end arch magic_mouth msg You sense something funny @@ -690,6 +686,10 @@ y 7 end arch cobblestones x 5 +y 7 +end +arch cobblestones +x 5 y 8 end arch pedestal_trigger diff --git a/sisters/tower3 b/sisters/tower3 index b5a970ca5..4dce745b4 100644 --- a/sisters/tower3 +++ b/sisters/tower3 @@ -710,10 +710,6 @@ sp 1 x 7 y 1 end -arch flagstone -x 7 -y 2 -end arch magic_mouth msg You hear old women talking nearby. @@ -723,6 +719,10 @@ y 2 end arch flagstone x 7 +y 2 +end +arch flagstone +x 7 y 3 end arch flagstone @@ -836,10 +836,6 @@ sp 1 x 8 y 1 end -arch flagstone -x 8 -y 2 -end arch magic_mouth msg You hear old women talking nearby. @@ -849,6 +845,10 @@ y 2 end arch flagstone x 8 +y 2 +end +arch flagstone +x 8 y 3 end arch flagstone