From a72694ca6a1d61db76f41be7a82140f61b3a59fc Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 5 Jan 2022 15:01:18 -0600 Subject: [PATCH] Add darkness to Old Scorn Old Scorn is underground, and so it should be dark. Add lighting to some points of interest. --- scorn/kar/drink | 11 ++- scorn/oldcity/end | 3 +- scorn/oldcity/oldcity1 | 7 +- scorn/oldcity/oldcity10 | 3 +- scorn/oldcity/oldcity11 | 27 ++++++- scorn/oldcity/oldcity12 | 151 ++++++++++++++++++++------------------- scorn/oldcity/oldcity13 | 3 +- scorn/oldcity/oldcity14 | 3 +- scorn/oldcity/oldcity15 | 3 +- scorn/oldcity/oldcity15e | 3 +- scorn/oldcity/oldcity2 | 3 +- scorn/oldcity/oldcity3 | 3 +- scorn/oldcity/oldcity54 | 25 ++++++- scorn/oldcity/oldcity6 | 3 +- scorn/oldcity/oldcity7 | 10 ++- scorn/oldcity/oldcity8 | 3 +- scorn/oldcity/oldcity9 | 3 +- 17 files changed, 172 insertions(+), 92 deletions(-) diff --git a/scorn/kar/drink b/scorn/kar/drink index d87c728dd..3c16da625 100644 --- a/scorn/kar/drink +++ b/scorn/kar/drink @@ -2,13 +2,14 @@ arch map name Drinking Fountain difficulty 7 region scorn +darkness 3 width 40 height 40 enter_x 1 enter_y 1 msg Created: 1993-10-05 -Modified: 2012-01-10 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg end arch pstone_1 @@ -268,6 +269,10 @@ sp 39 x 1 y 1 end +arch light2 +x 1 +y 1 +end arch pstone_1 x 1 y 2 @@ -1356,6 +1361,10 @@ sp 5 x 6 y 1 end +arch light1 +x 6 +y 1 +end arch pstone_1 x 6 y 2 diff --git a/scorn/oldcity/end b/scorn/oldcity/end index d3ac11423..e933b2f70 100644 --- a/scorn/oldcity/end +++ b/scorn/oldcity/end @@ -2,12 +2,13 @@ arch map name Old City, End difficulty 12 region scornoldcity +darkness 3 width 29 height 40 enter_y 26 msg Created: 1993-10-19 -Modified: 2012-01-15 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_4 oldcity3 end diff --git a/scorn/oldcity/oldcity1 b/scorn/oldcity/oldcity1 index 52d1cdadd..f01b03ec3 100644 --- a/scorn/oldcity/oldcity1 +++ b/scorn/oldcity/oldcity1 @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 20 enter_x 18 enter_y 11 msg Created: 1993-10-16 -Modified: 2012-03-27 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity10 tile_path_3 oldcity2 @@ -2137,6 +2138,10 @@ sp 11 x 18 y 11 end +arch light2 +x 18 +y 11 +end arch dungeon_floor x 18 y 12 diff --git a/scorn/oldcity/oldcity10 b/scorn/oldcity/oldcity10 index 54a3fb9db..5077e1170 100644 --- a/scorn/oldcity/oldcity10 +++ b/scorn/oldcity/oldcity10 @@ -2,10 +2,11 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 msg -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity11 tile_path_3 oldcity1 diff --git a/scorn/oldcity/oldcity11 b/scorn/oldcity/oldcity11 index bcb368d7f..9695b7446 100644 --- a/scorn/oldcity/oldcity11 +++ b/scorn/oldcity/oldcity11 @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 4 enter_y 15 msg Created: 1993-10-05 skud the great (tvangod@ecst.csuchico.edu) -Modified: 2012-01-15 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity14 tile_path_3 oldcity10 @@ -595,6 +596,10 @@ name well water x 2 y 15 end +arch light4 +x 2 +y 15 +end arch sea name well water x 2 @@ -1103,6 +1108,10 @@ name well water x 4 y 13 end +arch light4 +x 4 +y 13 +end arch sea name well water x 4 @@ -1130,6 +1139,10 @@ name well water x 4 y 17 end +arch light4 +x 4 +y 17 +end arch sea name well water x 4 @@ -1284,6 +1297,10 @@ arch generate_pixie x 4 y 36 end +arch torch_1 +x 4 +y 36 +end arch cobblestones x 4 y 37 @@ -1649,6 +1666,10 @@ arch woodfloor x 6 y 15 end +arch light4 +x 6 +y 15 +end arch sea name well water x 6 @@ -1772,6 +1793,10 @@ arch pixie x 6 y 36 end +arch torch_1 +x 6 +y 36 +end arch cobblestones x 6 y 37 diff --git a/scorn/oldcity/oldcity12 b/scorn/oldcity/oldcity12 index 2b92905d8..fb592320d 100644 --- a/scorn/oldcity/oldcity12 +++ b/scorn/oldcity/oldcity12 @@ -2,11 +2,12 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 40 msg Created: 1993-10-05 skud the great (tvangod@ecst.csuchico.edu) -Modified: 2021-07-25 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity13 tile_path_2 oldcity10 @@ -5235,7 +5236,7 @@ arch small_stones x 20 y 27 end -arch cwall_3_2 +arch cwall_2_1_1 x 20 y 27 end @@ -5391,6 +5392,10 @@ name skull floor x 21 y 10 end +arch brazier +x 21 +y 10 +end arch dungeon_floor x 21 y 11 @@ -5399,6 +5404,10 @@ arch dungeon_floor x 21 y 12 end +arch brazier +x 21 +y 12 +end arch dungeon_floor x 21 y 13 @@ -5407,6 +5416,10 @@ arch dungeon_floor x 21 y 14 end +arch brazier +x 21 +y 14 +end arch dungeon_floor name skull floor x 21 @@ -5429,7 +5442,7 @@ arch dungeon_floor x 21 y 18 end -arch cwall_3_2 +arch cwall_2_1_1 x 21 y 18 end @@ -5453,6 +5466,10 @@ arch dungeon_floor x 21 y 22 end +arch brazier +x 21 +y 22 +end arch dungeon_floor x 21 y 23 @@ -5473,7 +5490,7 @@ arch small_stones x 21 y 26 end -arch cwall_3_3 +arch cwall_2_1_2 x 21 y 26 end @@ -5481,15 +5498,11 @@ arch small_stones x 21 y 27 end -arch cwall_4 -x 21 -y 27 -end arch small_stones x 21 y 28 end -arch cwall_3_1 +arch cwall_2_1_2 x 21 y 28 end @@ -5659,7 +5672,7 @@ arch dungeon_floor x 22 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 22 y 17 end @@ -5667,15 +5680,11 @@ arch dungeon_floor x 22 y 18 end -arch cwall_4 -x 22 -y 18 -end arch dungeon_floor x 22 y 19 end -arch cwall_4 +arch cwall_3_3 x 22 y 19 end @@ -5723,7 +5732,7 @@ arch small_stones x 22 y 27 end -arch cwall_3_4 +arch cwall_2_1_1 x 22 y 27 end @@ -5898,7 +5907,7 @@ arch dungeon_floor x 23 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 23 y 17 end @@ -5906,15 +5915,11 @@ arch dungeon_floor x 23 y 18 end -arch cwall_4 -x 23 -y 18 -end arch dungeon_floor x 23 y 19 end -arch cwall_4 +arch cwall_3_3 x 23 y 19 end @@ -5958,6 +5963,10 @@ arch small_stones x 23 y 26 end +arch brazier +x 23 +y 26 +end arch small_stones x 23 y 27 @@ -6140,7 +6149,7 @@ arch dungeon_floor x 24 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 24 y 17 end @@ -6148,15 +6157,11 @@ arch dungeon_floor x 24 y 18 end -arch cwall_4 -x 24 -y 18 -end arch dungeon_floor x 24 y 19 end -arch cwall_3_1 +arch cwall_2_1_2 x 24 y 19 end @@ -6344,6 +6349,10 @@ arch flagstone x 25 y 10 end +arch light2 +x 25 +y 10 +end arch dungeon_floor name skull floor x 25 @@ -6381,7 +6390,7 @@ arch dungeon_floor x 25 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 25 y 17 end @@ -6389,15 +6398,11 @@ arch dungeon_floor x 25 y 18 end -arch cwall_4 -x 25 -y 18 -end arch dungeon_floor x 25 y 19 end -arch cwall_3_1 +arch cwall_2_1_2 x 25 y 19 end @@ -6610,6 +6615,10 @@ arch flagstone x 26 y 12 end +arch light2 +x 26 +y 12 +end arch dungeon_floor name skull floor x 26 @@ -6638,7 +6647,7 @@ arch dungeon_floor x 26 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 26 y 17 end @@ -6646,15 +6655,11 @@ arch dungeon_floor x 26 y 18 end -arch cwall_4 -x 26 -y 18 -end arch dungeon_floor x 26 y 19 end -arch cwall_3_1 +arch cwall_2_1_2 x 26 y 19 end @@ -6847,6 +6852,10 @@ arch flagstone x 27 y 10 end +arch light2 +x 27 +y 10 +end arch dungeon_floor name skull floor x 27 @@ -6884,7 +6893,7 @@ arch dungeon_floor x 27 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 27 y 17 end @@ -6892,15 +6901,11 @@ arch dungeon_floor x 27 y 18 end -arch cwall_4 -x 27 -y 18 -end arch dungeon_floor x 27 y 19 end -arch cwall_3_1 +arch cwall_2_1_2 x 27 y 19 end @@ -7135,7 +7140,7 @@ arch dungeon_floor x 28 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 28 y 17 end @@ -7143,15 +7148,11 @@ arch dungeon_floor x 28 y 18 end -arch cwall_4 -x 28 -y 18 -end arch dungeon_floor x 28 y 19 end -arch cwall_3_1 +arch cwall_2_1_2 x 28 y 19 end @@ -7195,7 +7196,7 @@ arch small_stones x 28 y 27 end -arch cwall_3_2 +arch cwall_2_1_1 x 28 y 27 end @@ -7394,7 +7395,7 @@ arch dungeon_floor x 29 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 29 y 17 end @@ -7402,15 +7403,11 @@ arch dungeon_floor x 29 y 18 end -arch cwall_4 -x 29 -y 18 -end arch dungeon_floor x 29 y 19 end -arch cwall_4 +arch cwall_3_3 x 29 y 19 end @@ -7454,7 +7451,7 @@ arch small_stones x 29 y 26 end -arch cwall_3_3 +arch cwall_2_1_2 x 29 y 26 end @@ -7462,15 +7459,11 @@ arch small_stones x 29 y 27 end -arch cwall_4 -x 29 -y 27 -end arch small_stones x 29 y 28 end -arch cwall_3_1 +arch cwall_2_1_2 x 29 y 28 end @@ -7660,7 +7653,7 @@ arch dungeon_floor x 30 y 17 end -arch cwall_3_3 +arch cwall_2_1_2 x 30 y 17 end @@ -7668,15 +7661,11 @@ arch dungeon_floor x 30 y 18 end -arch cwall_4 -x 30 -y 18 -end arch dungeon_floor x 30 y 19 end -arch cwall_4 +arch cwall_3_3 x 30 y 19 end @@ -7724,7 +7713,7 @@ arch small_stones x 30 y 27 end -arch cwall_3_4 +arch cwall_2_1_1 x 30 y 27 end @@ -7892,6 +7881,10 @@ name skull floor x 31 y 10 end +arch brazier +x 31 +y 10 +end arch dungeon_floor x 31 y 11 @@ -7900,6 +7893,10 @@ arch dungeon_floor x 31 y 12 end +arch brazier +x 31 +y 12 +end arch dungeon_floor x 31 y 13 @@ -7908,6 +7905,10 @@ arch dungeon_floor x 31 y 14 end +arch brazier +x 31 +y 14 +end arch dungeon_floor name skull floor x 31 @@ -7930,7 +7931,7 @@ arch dungeon_floor x 31 y 18 end -arch cwall_3_4 +arch cwall_2_1_1 x 31 y 18 end @@ -7954,6 +7955,10 @@ arch dungeon_floor x 31 y 22 end +arch brazier +x 31 +y 22 +end arch dungeon_floor x 31 y 23 diff --git a/scorn/oldcity/oldcity13 b/scorn/oldcity/oldcity13 index 697d0a35c..0ff65c3c7 100644 --- a/scorn/oldcity/oldcity13 +++ b/scorn/oldcity/oldcity13 @@ -2,12 +2,13 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 40 enter_x 14 enter_y 39 msg -Modified: 2012-01-15 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_2 oldcity11 tile_path_3 oldcity12 diff --git a/scorn/oldcity/oldcity14 b/scorn/oldcity/oldcity14 index a1b0e7a8c..2bc2da0aa 100644 --- a/scorn/oldcity/oldcity14 +++ b/scorn/oldcity/oldcity14 @@ -2,12 +2,13 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 9 enter_y 39 msg -Modified: 2012-01-15 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity15 tile_path_3 oldcity11 diff --git a/scorn/oldcity/oldcity15 b/scorn/oldcity/oldcity15 index a9cc08a46..bae772fff 100644 --- a/scorn/oldcity/oldcity15 +++ b/scorn/oldcity/oldcity15 @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 9 enter_y 15 msg Created: 1993-10-07 skud the great (tvangod@ecst.csuchico.edu) -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_2 oldcity15e tile_path_3 oldcity14 diff --git a/scorn/oldcity/oldcity15e b/scorn/oldcity/oldcity15e index 03e8c5721..95af331cc 100644 --- a/scorn/oldcity/oldcity15e +++ b/scorn/oldcity/oldcity15e @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 39 enter_y 6 msg Created: 1993-10-07 skud the great (tvangod@ecst.csuchico.edu) -Modified: 2012-03-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_4 oldcity15 end diff --git a/scorn/oldcity/oldcity2 b/scorn/oldcity/oldcity2 index add945dab..e415adeb7 100644 --- a/scorn/oldcity/oldcity2 +++ b/scorn/oldcity/oldcity2 @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 7 enter_y 1 msg Created: 1999-01-03 -Modified: 2012-03-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity1 tile_path_3 oldcity3 diff --git a/scorn/oldcity/oldcity3 b/scorn/oldcity/oldcity3 index cd2732462..a37cf0611 100644 --- a/scorn/oldcity/oldcity3 +++ b/scorn/oldcity/oldcity3 @@ -2,11 +2,12 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 msg Created: 1998-05-03 -Modified: 2021-07-25 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity2 tile_path_2 end diff --git a/scorn/oldcity/oldcity54 b/scorn/oldcity/oldcity54 index 8e398bea9..8ffc11232 100644 --- a/scorn/oldcity/oldcity54 +++ b/scorn/oldcity/oldcity54 @@ -2,11 +2,12 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 40 msg Created: 1993-10-19 -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity9 tile_path_2 oldcity2 @@ -877,7 +878,7 @@ end arch magic_ear msg @match cloud -Very good Adventurer! You have are indeed as cunning as me! But of course I will not FLEE! *The gnome smiles smoothly.* +Very good Adventurer! You have are indeed as cunning as me! But of course I will not FLEE! endmsg x 3 y 6 @@ -891,6 +892,10 @@ arch large_stones x 3 y 7 end +arch dim_torch +x 3 +y 7 +end arch medium_stones x 3 y 8 @@ -5435,6 +5440,10 @@ arch ninja_1 x 22 y 1 end +arch torch_1 +x 22 +y 1 +end arch woodfloor x 22 y 2 @@ -5479,6 +5488,10 @@ arch random_treasure x 22 y 5 end +arch torch_1 +x 22 +y 5 +end arch woodfloor x 22 y 6 @@ -6523,6 +6536,10 @@ arch madman x 26 y 1 end +arch torch_1 +x 26 +y 1 +end arch woodfloor x 26 y 2 @@ -6567,6 +6584,10 @@ dam 20 x 26 y 5 end +arch torch_1 +x 26 +y 5 +end arch woodfloor x 26 y 6 diff --git a/scorn/oldcity/oldcity6 b/scorn/oldcity/oldcity6 index c992d7c0d..6d788c6f0 100644 --- a/scorn/oldcity/oldcity6 +++ b/scorn/oldcity/oldcity6 @@ -2,10 +2,11 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 40 msg -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity54 tile_path_2 oldcity3 diff --git a/scorn/oldcity/oldcity7 b/scorn/oldcity/oldcity7 index 2022be8fa..80f390ada 100644 --- a/scorn/oldcity/oldcity7 +++ b/scorn/oldcity/oldcity7 @@ -2,13 +2,14 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 20 height 40 enter_x 5 enter_y 38 msg Created: 1994-05-28 -Modified: 2012-03-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_2 oldcity54 tile_path_4 oldcity8 @@ -1444,14 +1445,17 @@ arch dungeon_floor x 5 y 38 end -arch well -name well up +arch ladder_up slaying /world/world_105_115 hp 8 sp 49 x 5 y 38 end +arch light1 +x 5 +y 38 +end arch dungeon_floor x 5 y 39 diff --git a/scorn/oldcity/oldcity8 b/scorn/oldcity/oldcity8 index d9a20be35..9ca569e18 100644 --- a/scorn/oldcity/oldcity8 +++ b/scorn/oldcity/oldcity8 @@ -2,10 +2,11 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 40 msg -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_2 oldcity7 end diff --git a/scorn/oldcity/oldcity9 b/scorn/oldcity/oldcity9 index 4e508cfec..93aa34292 100644 --- a/scorn/oldcity/oldcity9 +++ b/scorn/oldcity/oldcity9 @@ -2,10 +2,11 @@ arch map name Old City difficulty 12 region scornoldcity +darkness 3 width 40 height 20 msg -Modified: 2008-09-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg tile_path_1 oldcity12 tile_path_2 oldcity1