From d79bf5960ee9b44302bc756e42a9a59fc37b74f7 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Wed, 5 Jan 2022 15:58:27 -0600 Subject: [PATCH] Adjust lighting Make outdoor maps outdoor, add darkness where appropriate. Add lighting to shops or other points of interest. --- pup_land/castle_eureca/cave_pass | 3 +- pup_land/kurte/hut1 | 3 +- pup_land/lone_town/cordish | 3 +- pup_land/lone_town/heinrich | 3 +- pup_land/lone_town/town | 31 +++++- pup_land/nurnberg/aqueduct | 3 +- pup_land/nurnberg/bshop | 23 ++++- pup_land/nurnberg/city | 34 ++++++- pup_land/nurnberg/guild | 31 +++++- pup_land/nurnberg/jshop | 39 +++++++- pup_land/nurnberg/nf_bar | 47 ++++++++- pup_land/nurnberg/washop | 3 +- pup_land/port_w | 3 +- pup_land/terminal | 19 +++- pup_land/terminal_u1 | 15 ++- scorn/anthony/passoffice | 11 ++- scorn/houses/angrygiant | 3 +- scorn/houses/chess_club | 163 ++++++++++++++++++++++++++++++- scorn/houses/doors_galore | 3 +- scorn/houses/house.haunted | 3 +- scorn/houses/house1 | 3 +- scorn/houses/house2 | 3 +- scorn/houses/house3.1st | 3 +- scorn/houses/house3.2nd | 3 +- scorn/houses/jones | 3 +- scorn/houses/map.fr.ruin | 3 +- scorn/houses/maze1 | 3 +- scorn/houses/newhouse1 | 3 +- scorn/houses/resir | 3 +- scorn/houses/tyl | 3 +- scorn/houses/wizz.entry | 3 +- scorn/kar/gorks1 | 3 +- scorn/mansion/muriskunes | 3 +- scorn/mansion/stronghold | 3 +- scorn/mansion/subbasement1 | 3 +- scorn/misc/HouseofHealing | 71 +++++++++++++- scorn/misc/animal_quarantine | 3 +- scorn/misc/drywell | 3 +- scorn/misc/map.esben.2 | 3 +- scorn/misc/mercenaries | 3 +- scorn/misc/port_arena | 3 +- scorn/misc/puddings.place | 3 +- scorn/misc/zoo | 3 +- scorn/shops/coffeeshop | 3 +- scorn/shops/oleds_cafe | 3 +- scorn/temples/devourers | 3 +- scorn/temples/gaea | 3 +- scorn/temples/gorokh | 3 +- scorn/temples/lythander | 3 +- scorn/temples/mostrai | 3 +- scorn/temples/mostrai2 | 3 +- scorn/temples/ruggilli1 | 3 +- scorn/temples/sorig | 3 +- scorn/temples/valriel | 3 +- scorn/towers/lighthouse.0 | 3 +- scorn/towers/tower.mad0 | 3 +- 56 files changed, 563 insertions(+), 56 deletions(-) diff --git a/pup_land/castle_eureca/cave_pass b/pup_land/castle_eureca/cave_pass index 309f8a7ed..2a7204f50 100644 --- a/pup_land/castle_eureca/cave_pass +++ b/pup_land/castle_eureca/cave_pass @@ -9,8 +9,9 @@ enter_x 5 enter_y 1 msg Created: 1996-01-27 -Modified: 2008-10-27 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch blocked end diff --git a/pup_land/kurte/hut1 b/pup_land/kurte/hut1 index 4d7a80876..4e9515a76 100644 --- a/pup_land/kurte/hut1 +++ b/pup_land/kurte/hut1 @@ -8,8 +8,9 @@ enter_x 1 enter_y 8 msg Created: 1996-04-01 -Modified: 2021-10-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/pup_land/lone_town/cordish b/pup_land/lone_town/cordish index 175439f37..d42a348be 100644 --- a/pup_land/lone_town/cordish +++ b/pup_land/lone_town/cordish @@ -8,8 +8,9 @@ enter_x 7 enter_y 14 msg Created: 1996-01-28 -Modified: 2021-07-25 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch invis_exit slaying town diff --git a/pup_land/lone_town/heinrich b/pup_land/lone_town/heinrich index 60454d1aa..3c540e209 100644 --- a/pup_land/lone_town/heinrich +++ b/pup_land/lone_town/heinrich @@ -8,8 +8,9 @@ enter_x 7 enter_y 14 msg Created: 1997-01-25 -Modified: 2012-02-29 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town index c73bfc231..09374550f 100644 --- a/pup_land/lone_town/town +++ b/pup_land/lone_town/town @@ -8,8 +8,9 @@ enter_x 5 enter_y 18 msg Created: 1996-02-25 -Modified: 2020-06-08 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 background_music lonetown end arch grass @@ -570,6 +571,10 @@ arch grass x 4 y 16 end +arch lamppost +x 4 +y 16 +end arch grass x 4 y 17 @@ -903,6 +908,10 @@ arch grass x 7 y 10 end +arch lamppost +x 7 +y 10 +end arch cobblestones x 7 y 11 @@ -1306,6 +1315,10 @@ arch grass x 10 y 15 end +arch lamppost +x 10 +y 15 +end arch cobblestones x 10 y 16 @@ -1336,6 +1349,10 @@ arch grass x 11 y 1 end +arch lamppost +x 11 +y 1 +end arch cobblestones x 11 y 2 @@ -1360,6 +1377,10 @@ arch grass x 11 y 5 end +arch lamppost +x 11 +y 5 +end arch grass x 11 y 6 @@ -2057,6 +2078,10 @@ arch grass x 15 y 16 end +arch lamppost +x 15 +y 16 +end arch grass x 15 y 17 @@ -2245,6 +2270,10 @@ arch grass x 17 y 10 end +arch lamppost +x 17 +y 10 +end arch pstone_1 x 17 y 11 diff --git a/pup_land/nurnberg/aqueduct b/pup_land/nurnberg/aqueduct index 64c8c6091..0517991f8 100644 --- a/pup_land/nurnberg/aqueduct +++ b/pup_land/nurnberg/aqueduct @@ -2,13 +2,14 @@ arch map name Aqueduct difficulty 10 region nurnberg +darkness 2 width 48 height 48 enter_x 32 enter_y 24 msg Created: 1996-02-04 -Modified: 2012-03-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg end arch dungeon_floor diff --git a/pup_land/nurnberg/bshop b/pup_land/nurnberg/bshop index 8f806f16f..c9a29c3fd 100644 --- a/pup_land/nurnberg/bshop +++ b/pup_land/nurnberg/bshop @@ -10,8 +10,9 @@ enter_x 8 enter_y 1 msg Created: 1996-02-09 -Modified: 2011-12-09 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch invis_exit slaying city @@ -968,6 +969,10 @@ arch shop_empty x 8 y 12 end +arch light4 +x 8 +y 12 +end arch shop_empty x 8 y 13 @@ -1311,6 +1316,10 @@ arch shop_mat x 11 y 7 end +arch light4 +x 11 +y 7 +end arch cobblestones2 x 11 y 8 @@ -1327,6 +1336,10 @@ arch shop_mat x 11 y 9 end +arch light4 +x 11 +y 9 +end arch shop_books x 11 y 10 @@ -1359,6 +1372,10 @@ arch shop_empty x 11 y 16 end +arch light4 +x 11 +y 16 +end arch shop_empty x 11 y 17 @@ -1708,6 +1725,10 @@ arch shop_empty x 14 y 12 end +arch light4 +x 14 +y 12 +end arch shop_empty x 14 y 13 diff --git a/pup_land/nurnberg/city b/pup_land/nurnberg/city index 239e5b04d..5e0cd740c 100644 --- a/pup_land/nurnberg/city +++ b/pup_land/nurnberg/city @@ -6,7 +6,7 @@ width 30 height 30 msg Created: 1996-02-07 -Modified: 2020-06-08 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg outdoor 1 background_music nurnberg @@ -399,6 +399,10 @@ arch grass x 2 y 12 end +arch lamppost +x 2 +y 12 +end arch grass x 2 y 13 @@ -1971,6 +1975,10 @@ arch grass x 11 y 21 end +arch lamppost +x 11 +y 21 +end arch cobblestones x 11 y 22 @@ -2052,6 +2060,10 @@ arch grass x 12 y 7 end +arch lamppost +x 12 +y 7 +end arch cobblestones x 12 y 8 @@ -2706,6 +2718,10 @@ arch grass x 16 y 11 end +arch lamppost +x 16 +y 11 +end arch evergreen x 16 y 12 @@ -2734,6 +2750,10 @@ arch grass x 16 y 18 end +arch lamppost +x 16 +y 18 +end arch grass x 16 y 19 @@ -3976,6 +3996,10 @@ arch grass x 24 y 7 end +arch lamppost +x 24 +y 7 +end arch cobblestones x 24 y 8 @@ -4008,6 +4032,10 @@ arch grass x 24 y 14 end +arch lamppost +x 24 +y 14 +end arch cobblestones x 24 y 15 @@ -4363,6 +4391,10 @@ arch grass x 26 y 26 end +arch lamppost +x 26 +y 26 +end arch grass x 26 y 27 diff --git a/pup_land/nurnberg/guild b/pup_land/nurnberg/guild index 82c79efc2..cc9019f25 100644 --- a/pup_land/nurnberg/guild +++ b/pup_land/nurnberg/guild @@ -8,8 +8,9 @@ enter_x 10 enter_y 20 msg Created: 1996-02-15 -Modified: 2021-10-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end @@ -452,6 +453,10 @@ arch flagstone x 3 y 8 end +arch light4 +x 3 +y 8 +end arch flagstone x 3 y 9 @@ -622,6 +627,10 @@ arch table_4 x 4 y 13 end +arch light4 +x 4 +y 13 +end arch flagstone x 4 y 14 @@ -1416,6 +1425,10 @@ arch table_4 x 10 y 3 end +arch light4 +x 10 +y 3 +end arch flagstone x 10 y 4 @@ -1440,6 +1453,10 @@ arch table_4 x 10 y 6 end +arch light4 +x 10 +y 6 +end arch flagstone x 10 y 7 @@ -1542,6 +1559,10 @@ arch flagstone x 10 y 13 end +arch light4 +x 10 +y 13 +end arch flagstone x 10 y 14 @@ -2541,6 +2562,10 @@ arch flagstone x 17 y 13 end +arch light4 +x 17 +y 13 +end arch flagstone x 17 y 14 @@ -2649,6 +2674,10 @@ arch flagstone x 18 y 8 end +arch light4 +x 18 +y 8 +end arch flagstone x 18 y 9 diff --git a/pup_land/nurnberg/jshop b/pup_land/nurnberg/jshop index 3ca0a4a4b..cc99a4eb4 100644 --- a/pup_land/nurnberg/jshop +++ b/pup_land/nurnberg/jshop @@ -11,8 +11,9 @@ enter_x 11 enter_y 23 msg Created: 1996-02-12 -Modified: 2012-03-20 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end @@ -490,6 +491,10 @@ arch shop_empty x 4 y 11 end +arch light4 +x 4 +y 11 +end arch shop_empty x 4 y 12 @@ -819,6 +824,10 @@ arch shop_empty x 7 y 7 end +arch light4 +x 7 +y 7 +end arch shop_empty x 7 y 8 @@ -863,6 +872,10 @@ arch shop_empty x 7 y 15 end +arch light4 +x 7 +y 15 +end arch shop_gems x 7 y 16 @@ -1462,6 +1475,10 @@ arch shop_empty x 12 y 7 end +arch light4 +x 12 +y 7 +end arch shop_empty x 12 y 8 @@ -1478,6 +1495,10 @@ arch shop_empty x 12 y 11 end +arch light4 +x 12 +y 11 +end arch shop_empty x 12 y 12 @@ -1506,6 +1527,10 @@ arch shop_empty x 12 y 17 end +arch light4 +x 12 +y 17 +end arch cobblestones2 x 12 y 18 @@ -1991,6 +2016,10 @@ arch shop_empty x 16 y 7 end +arch light4 +x 16 +y 7 +end arch shop_empty x 16 y 8 @@ -2035,6 +2064,10 @@ arch shop_empty x 16 y 15 end +arch light4 +x 16 +y 15 +end arch shop_gems x 16 y 16 @@ -2368,6 +2401,10 @@ arch shop_empty x 19 y 11 end +arch light4 +x 19 +y 11 +end arch shop_empty x 19 y 12 diff --git a/pup_land/nurnberg/nf_bar b/pup_land/nurnberg/nf_bar index b43fc33b6..ed6c0b8a2 100644 --- a/pup_land/nurnberg/nf_bar +++ b/pup_land/nurnberg/nf_bar @@ -11,8 +11,9 @@ enter_x 12 enter_y 1 msg Created: 1996-02-10 -Modified: 2021-10-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones end @@ -362,6 +363,10 @@ arch poison x 2 y 10 end +arch light4 +x 2 +y 10 +end arch woodfloor x 2 y 11 @@ -395,6 +400,10 @@ y 13 friendly 1 unaggressive 0 end +arch light4 +x 2 +y 13 +end arch woodfloor x 2 y 14 @@ -419,6 +428,10 @@ arch poison x 2 y 16 end +arch light4 +x 2 +y 16 +end arch woodfloor x 2 y 17 @@ -1092,6 +1105,10 @@ arch chair_1.4 x 7 y 6 end +arch light4 +x 7 +y 6 +end arch woodfloor x 7 y 7 @@ -1400,6 +1417,10 @@ arch woodfloor x 9 y 17 end +arch light4 +x 9 +y 17 +end arch woodfloor x 9 y 18 @@ -1640,6 +1661,10 @@ randomitems none friendly 1 can_use_skill 0 end +arch light4 +x 11 +y 7 +end arch dungeon_magic x 11 y 8 @@ -1713,6 +1738,10 @@ arch woodfloor x 11 y 17 end +arch light4 +x 11 +y 17 +end arch woodfloor x 11 y 18 @@ -2413,6 +2442,10 @@ arch chair_1.2 x 16 y 6 end +arch light4 +x 16 +y 6 +end arch woodfloor x 16 y 7 @@ -2471,6 +2504,10 @@ arch woodfloor x 16 y 16 end +arch light4 +x 16 +y 16 +end arch woodfloor x 16 y 17 @@ -3031,6 +3068,10 @@ arch shop_mat x 21 y 4 end +arch light4 +x 21 +y 4 +end arch woodfloor x 21 y 5 @@ -3547,6 +3588,10 @@ arch shop_food x 24 y 5 end +arch light4 +x 24 +y 5 +end arch woodfloor x 24 y 6 diff --git a/pup_land/nurnberg/washop b/pup_land/nurnberg/washop index 2a614a1e6..374bbe3b6 100644 --- a/pup_land/nurnberg/washop +++ b/pup_land/nurnberg/washop @@ -11,8 +11,9 @@ enter_x 23 enter_y 7 msg Created: 1996-02-23 -Modified: 2012-04-08 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch evergreens end diff --git a/pup_land/port_w b/pup_land/port_w index 8713935ea..f65e6456c 100644 --- a/pup_land/port_w +++ b/pup_land/port_w @@ -8,8 +8,9 @@ enter_x 1 enter_y 9 msg Created: 1996-01-29 -Modified: 2021-08-20 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch sea end diff --git a/pup_land/terminal b/pup_land/terminal index 0b92f0a99..c14e58e74 100644 --- a/pup_land/terminal +++ b/pup_land/terminal @@ -8,8 +8,9 @@ enter_x 10 enter_y 2 msg Created: 1996-04-05 -Modified: 2016-06-25 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch sky end @@ -1067,6 +1068,10 @@ arch grass x 7 y 6 end +arch light3 +x 7 +y 6 +end arch grass x 7 y 7 @@ -1083,6 +1088,10 @@ arch grass x 7 y 10 end +arch light3 +x 7 +y 10 +end arch grass x 7 y 11 @@ -1680,6 +1689,10 @@ arch grass x 12 y 6 end +arch light3 +x 12 +y 6 +end arch cobblestones2 x 12 y 7 @@ -1696,6 +1709,10 @@ arch cobblestones2 x 12 y 10 end +arch light3 +x 12 +y 10 +end arch grass x 12 y 11 diff --git a/pup_land/terminal_u1 b/pup_land/terminal_u1 index 35dc44f1f..5caa40546 100644 --- a/pup_land/terminal_u1 +++ b/pup_land/terminal_u1 @@ -8,8 +8,9 @@ enter_x 13 enter_y 10 msg Created: 1996-04-05 -Modified: 2013-03-19 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch sky end @@ -1305,6 +1306,10 @@ sp 7 x 9 y 8 end +arch light1 +x 9 +y 8 +end arch cobblestones2 x 9 y 9 @@ -1435,6 +1440,10 @@ sp 7 x 10 y 8 end +arch light1 +x 10 +y 8 +end arch cobblestones2 x 10 y 9 @@ -1577,6 +1586,10 @@ sp 7 x 11 y 8 end +arch light1 +x 11 +y 8 +end arch cobblestones2 x 11 y 9 diff --git a/scorn/anthony/passoffice b/scorn/anthony/passoffice index e10708929..16a2d2dfb 100644 --- a/scorn/anthony/passoffice +++ b/scorn/anthony/passoffice @@ -8,8 +8,9 @@ enter_x 5 enter_y 8 msg Created: 1998-12-28 Anthony Thyssen (anthony@cit.gu.edu.au) -Modified: 2012-03-25 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch woodfloor end @@ -671,6 +672,10 @@ y 2 type 0 move_block all end +arch light3 +x 7 +y 2 +end arch dungeon_magic x 7 y 3 @@ -727,6 +732,10 @@ y 6 type 0 move_block all end +arch light3 +x 7 +y 6 +end arch dungeon_magic x 7 y 7 diff --git a/scorn/houses/angrygiant b/scorn/houses/angrygiant index ef52be624..377b6660f 100644 --- a/scorn/houses/angrygiant +++ b/scorn/houses/angrygiant @@ -9,8 +9,9 @@ enter_x 7 enter_y 14 msg Created: 2003-01-04 -Modified: 2012-01-08 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/houses/chess_club b/scorn/houses/chess_club index 6ea28cd05..785f20be4 100644 --- a/scorn/houses/chess_club +++ b/scorn/houses/chess_club @@ -8,8 +8,9 @@ enter_x 19 enter_y 1 msg Created: 2000-11-11 Andreas Vogl (red.blaze@gmx.net) -Modified: 2021-10-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch exit slaying /world/world_105_115 @@ -426,6 +427,10 @@ arch woodfloor x 2 y 8 end +arch light4 +x 2 +y 8 +end arch dungeon_magic x 2 y 9 @@ -458,6 +463,10 @@ arch woodfloor x 2 y 12 end +arch light4 +x 2 +y 12 +end arch dungeon_magic x 2 y 13 @@ -482,6 +491,10 @@ arch woodfloor x 2 y 15 end +arch light4 +x 2 +y 15 +end arch dungeon_magic x 2 y 16 @@ -514,6 +527,10 @@ arch woodfloor x 2 y 19 end +arch light4 +x 2 +y 19 +end arch dungeon_magic x 2 y 20 @@ -1232,6 +1249,10 @@ arch woodfloor x 6 y 8 end +arch light4 +x 6 +y 8 +end arch dungeon_magic x 6 y 9 @@ -1288,6 +1309,10 @@ face shop_empty.111 x 6 y 12 end +arch light4 +x 6 +y 12 +end arch dungeon_magic x 6 y 13 @@ -1318,6 +1343,10 @@ face dirtfloor.111 x 6 y 15 end +arch light4 +x 6 +y 15 +end arch dungeon_magic x 6 y 16 @@ -1369,6 +1398,10 @@ arch woodfloor x 6 y 19 end +arch light4 +x 6 +y 19 +end arch dungeon_magic x 6 y 20 @@ -2116,6 +2149,10 @@ arch woodfloor x 10 y 8 end +arch light4 +x 10 +y 8 +end arch dungeon_magic x 10 y 9 @@ -2172,6 +2209,10 @@ face shop_empty.111 x 10 y 12 end +arch light4 +x 10 +y 12 +end arch dungeon_magic x 10 y 13 @@ -2202,6 +2243,10 @@ face dirtfloor.111 x 10 y 15 end +arch light4 +x 10 +y 15 +end arch dungeon_magic x 10 y 16 @@ -2253,6 +2298,10 @@ arch woodfloor x 10 y 19 end +arch light4 +x 10 +y 19 +end arch dungeon_magic x 10 y 20 @@ -2946,6 +2995,10 @@ arch woodfloor x 14 y 8 end +arch light4 +x 14 +y 8 +end arch dungeon_magic x 14 y 9 @@ -2983,6 +3036,10 @@ x 14 y 12 connected 2 end +arch light4 +x 14 +y 12 +end arch dungeon_magic x 14 y 13 @@ -3012,6 +3069,10 @@ x 14 y 15 connected 2 end +arch light4 +x 14 +y 15 +end arch dungeon_magic x 14 y 16 @@ -3044,6 +3105,10 @@ arch woodfloor x 14 y 19 end +arch light4 +x 14 +y 19 +end arch dungeon_magic x 14 y 20 @@ -3627,6 +3692,10 @@ arch table_2 x 17 y 7 end +arch light4 +x 17 +y 7 +end arch dungeon_magic x 17 y 8 @@ -3671,6 +3740,10 @@ arch table_2 x 17 y 11 end +arch light4 +x 17 +y 11 +end arch dungeon_magic x 17 y 12 @@ -3707,6 +3780,10 @@ arch woodfloor x 17 y 15 end +arch light4 +x 17 +y 15 +end arch dungeon_magic x 17 y 16 @@ -3739,6 +3816,10 @@ arch woodfloor x 17 y 19 end +arch light4 +x 17 +y 19 +end arch dungeon_magic x 17 y 20 @@ -4442,6 +4523,10 @@ arch table_2 x 21 y 7 end +arch light4 +x 21 +y 7 +end arch dungeon_magic x 21 y 8 @@ -4496,6 +4581,10 @@ arch table_2 x 21 y 11 end +arch light4 +x 21 +y 11 +end arch dungeon_magic x 21 y 12 @@ -4532,6 +4621,10 @@ arch woodfloor x 21 y 15 end +arch light4 +x 21 +y 15 +end arch dungeon_magic x 21 y 16 @@ -4564,6 +4657,10 @@ arch woodfloor x 21 y 19 end +arch light4 +x 21 +y 19 +end arch dungeon_magic x 21 y 20 @@ -5122,6 +5219,10 @@ arch woodfloor x 24 y 8 end +arch light4 +x 24 +y 8 +end arch dungeon_magic x 24 y 9 @@ -5159,6 +5260,10 @@ x 24 y 12 connected 3 end +arch light4 +x 24 +y 12 +end arch dungeon_magic x 24 y 13 @@ -5188,6 +5293,10 @@ x 24 y 15 connected 3 end +arch light4 +x 24 +y 15 +end arch dungeon_magic x 24 y 16 @@ -5220,6 +5329,10 @@ arch woodfloor x 24 y 19 end +arch light4 +x 24 +y 19 +end arch dungeon_magic x 24 y 20 @@ -5905,6 +6018,10 @@ arch woodfloor x 28 y 8 end +arch light4 +x 28 +y 8 +end arch dungeon_magic x 28 y 9 @@ -5961,6 +6078,10 @@ face dirtfloor.111 x 28 y 12 end +arch light4 +x 28 +y 12 +end arch dungeon_magic x 28 y 13 @@ -5991,6 +6112,10 @@ face shop_empty.111 x 28 y 15 end +arch light4 +x 28 +y 15 +end arch dungeon_magic x 28 y 16 @@ -6042,6 +6167,10 @@ arch woodfloor x 28 y 19 end +arch light4 +x 28 +y 19 +end arch dungeon_magic x 28 y 20 @@ -6797,6 +6926,10 @@ arch woodfloor x 32 y 8 end +arch light4 +x 32 +y 8 +end arch dungeon_magic x 32 y 9 @@ -6853,6 +6986,10 @@ face dirtfloor.111 x 32 y 12 end +arch light4 +x 32 +y 12 +end arch dungeon_magic x 32 y 13 @@ -6883,6 +7020,10 @@ face shop_empty.111 x 32 y 15 end +arch light4 +x 32 +y 15 +end arch dungeon_magic x 32 y 16 @@ -6934,6 +7075,10 @@ arch woodfloor x 32 y 19 end +arch light4 +x 32 +y 19 +end arch dungeon_magic x 32 y 20 @@ -7652,6 +7797,10 @@ arch woodfloor x 36 y 8 end +arch light4 +x 36 +y 8 +end arch dungeon_magic x 36 y 9 @@ -7684,6 +7833,10 @@ arch woodfloor x 36 y 12 end +arch light4 +x 36 +y 12 +end arch dungeon_magic x 36 y 13 @@ -7708,6 +7861,10 @@ arch woodfloor x 36 y 15 end +arch light4 +x 36 +y 15 +end arch dungeon_magic x 36 y 16 @@ -7740,6 +7897,10 @@ arch woodfloor x 36 y 19 end +arch light4 +x 36 +y 19 +end arch dungeon_magic x 36 y 20 diff --git a/scorn/houses/doors_galore b/scorn/houses/doors_galore index e265bd2b9..007a1d304 100644 --- a/scorn/houses/doors_galore +++ b/scorn/houses/doors_galore @@ -8,8 +8,9 @@ enter_x 14 enter_y 16 msg Created: 2010-08-22 Khaleh (map) and Nicolas Weeger (script) -Modified: 2017-07-28 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch hills_rocky end diff --git a/scorn/houses/house.haunted b/scorn/houses/house.haunted index dfc137896..cbc9f5583 100644 --- a/scorn/houses/house.haunted +++ b/scorn/houses/house.haunted @@ -8,8 +8,9 @@ enter_x 16 enter_y 18 msg Created: 1993-10-15 -Modified: 2012-01-09 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones end diff --git a/scorn/houses/house1 b/scorn/houses/house1 index 8bd3794ee..f40243237 100644 --- a/scorn/houses/house1 +++ b/scorn/houses/house1 @@ -8,8 +8,9 @@ enter_x 10 enter_y 14 msg Created: 1993-10-15 -Modified: 2012-03-26 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch woodfloor end diff --git a/scorn/houses/house2 b/scorn/houses/house2 index 656f6f047..3ab39db1c 100644 --- a/scorn/houses/house2 +++ b/scorn/houses/house2 @@ -7,8 +7,9 @@ height 16 enter_x 11 msg Created: 1993-10-15 -Modified: 2019-02-02 DraugTheWhopper +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/houses/house3.1st b/scorn/houses/house3.1st index 48d53098b..dcd353ff9 100644 --- a/scorn/houses/house3.1st +++ b/scorn/houses/house3.1st @@ -8,8 +8,9 @@ enter_x 8 enter_y 10 msg Created: 2005-03-23 Huhanhi -Modified: 2021-11-01 DraugTheWhopper +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/houses/house3.2nd b/scorn/houses/house3.2nd index 37805c14c..3eca057e2 100644 --- a/scorn/houses/house3.2nd +++ b/scorn/houses/house3.2nd @@ -8,8 +8,9 @@ enter_x 5 enter_y 9 msg Created: 2005-03-23 Huhanhi -Modified: 2021-08-13 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch dungeon_magic end diff --git a/scorn/houses/jones b/scorn/houses/jones index 84d690cbd..a9669302e 100644 --- a/scorn/houses/jones +++ b/scorn/houses/jones @@ -8,8 +8,9 @@ enter_x 15 enter_y 10 msg Created: 1994-02-23 -Modified: 2008-09-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch exit slaying /world/world_105_116 diff --git a/scorn/houses/map.fr.ruin b/scorn/houses/map.fr.ruin index f8a4aa343..47e86d483 100644 --- a/scorn/houses/map.fr.ruin +++ b/scorn/houses/map.fr.ruin @@ -7,8 +7,9 @@ height 20 enter_x 1 enter_y 19 msg -Modified: 2008-09-28 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch brush end diff --git a/scorn/houses/maze1 b/scorn/houses/maze1 index 8ff666056..df31cafb5 100644 --- a/scorn/houses/maze1 +++ b/scorn/houses/maze1 @@ -8,8 +8,9 @@ enter_x 3 enter_y 20 msg Created: 1994-11-13 -Modified: 2017-07-28 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass_only end diff --git a/scorn/houses/newhouse1 b/scorn/houses/newhouse1 index e1922bc65..052eab628 100644 --- a/scorn/houses/newhouse1 +++ b/scorn/houses/newhouse1 @@ -8,8 +8,9 @@ enter_x 2 enter_y 1 msg Created: 1994-10-19 -Modified: 2012-01-09 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/houses/resir b/scorn/houses/resir index 290993c37..16eb33408 100644 --- a/scorn/houses/resir +++ b/scorn/houses/resir @@ -9,7 +9,7 @@ enter_x 24 enter_y 4 msg Created: 2005-07-16 Knut Ahlers (webmaster@knutshome.de) -Modified: 2021-08-29 Nicolas Weeger +Modified: 2022-01-05 Kevin Zheng endmsg maplore @def Resir's house @@ -17,6 +17,7 @@ This is a simple house with a nice reward at the end. Stand-alone map. endmaplore +outdoor 1 end arch cobblestones2 end diff --git a/scorn/houses/tyl b/scorn/houses/tyl index b485bf41d..0dfb05425 100644 --- a/scorn/houses/tyl +++ b/scorn/houses/tyl @@ -7,8 +7,9 @@ enter_x 3 enter_y 9 msg Created: 2009-12-05 Nicolas Weeger -Modified: 2021-10-03 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/houses/wizz.entry b/scorn/houses/wizz.entry index 865c12c26..6480df1f6 100644 --- a/scorn/houses/wizz.entry +++ b/scorn/houses/wizz.entry @@ -9,8 +9,9 @@ enter_x 14 enter_y 7 msg Created: 1996-01-06 Bjoern Helfesrieder (helfesri@igd.fhg.de) -Modified: 2021-07-25 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch dungeon_floor end diff --git a/scorn/kar/gorks1 b/scorn/kar/gorks1 index 88f5f65b1..b9783224b 100644 --- a/scorn/kar/gorks1 +++ b/scorn/kar/gorks1 @@ -7,8 +7,9 @@ height 20 enter_x 10 enter_y 17 msg -Modified: 2012-03-16 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/mansion/muriskunes b/scorn/mansion/muriskunes index 5052ecfae..f8d73709f 100644 --- a/scorn/mansion/muriskunes +++ b/scorn/mansion/muriskunes @@ -2,12 +2,13 @@ arch map name Scorn Mansion - Muriskunes difficulty 15 region scorn +darkness 3 width 32 height 48 enter_x 15 enter_y 46 msg -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg end arch Nimground3_purple diff --git a/scorn/mansion/stronghold b/scorn/mansion/stronghold index b9e46edca..9ada58f74 100644 --- a/scorn/mansion/stronghold +++ b/scorn/mansion/stronghold @@ -8,8 +8,9 @@ enter_x 36 enter_y 27 msg Created: Morten Hanshaugen (meh@ifi.uio.no, meh@usit.uio.no) -Modified: 2012-01-11 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch woodfloor end diff --git a/scorn/mansion/subbasement1 b/scorn/mansion/subbasement1 index 63728b3ca..a13ffa53c 100644 --- a/scorn/mansion/subbasement1 +++ b/scorn/mansion/subbasement1 @@ -1,11 +1,12 @@ arch map name Ancient Basement region scorn +darkness 4 width 18 height 30 msg Created: 2010-08-15 chris -Modified: 2021-11-14 Nicolas Weeger +Modified: 2022-01-05 Kevin Zheng endmsg end arch graymarble diff --git a/scorn/misc/HouseofHealing b/scorn/misc/HouseofHealing index 8b7466bea..9b7235b44 100644 --- a/scorn/misc/HouseofHealing +++ b/scorn/misc/HouseofHealing @@ -10,8 +10,9 @@ enter_x 10 enter_y 33 msg Created: 1999-04-02 -Modified: 2019-04-04 DraugTheWhopper +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end @@ -1889,6 +1890,10 @@ arch woodfloor x 7 y 25 end +arch light4 +x 7 +y 25 +end arch woodfloor x 7 y 26 @@ -1905,6 +1910,10 @@ arch woodfloor x 7 y 29 end +arch light4 +x 7 +y 29 +end arch woodfloor x 7 y 30 @@ -1921,6 +1930,10 @@ arch woodfloor x 7 y 33 end +arch light4 +x 7 +y 33 +end arch woodfloor x 7 y 34 @@ -2312,6 +2325,10 @@ identified 1 arch spell_heal end end +arch light4 +x 9 +y 8 +end arch shop_empty x 9 y 9 @@ -2344,6 +2361,10 @@ y 11 unpaid 1 identified 1 end +arch light4 +x 9 +y 11 +end arch shop_empty x 9 y 12 @@ -2384,6 +2405,10 @@ y 14 unpaid 1 identified 1 end +arch light4 +x 9 +y 14 +end arch shop_empty x 9 y 15 @@ -2417,6 +2442,10 @@ unpaid 1 identified 1 artifact cure vision end +arch light4 +x 9 +y 17 +end arch shop_empty x 9 y 18 @@ -3124,6 +3153,10 @@ arch shop_mat x 11 y 21 end +arch light4 +x 11 +y 21 +end arch woodfloor x 11 y 22 @@ -3201,6 +3234,10 @@ title Python slaying /python/maps/scorn/HouseofHealing.py end end +arch light4 +x 11 +y 29 +end arch dungeon_magic x 11 y 30 @@ -3235,6 +3272,10 @@ arch woodfloor x 11 y 33 end +arch light4 +x 11 +y 33 +end arch woodfloor x 11 y 34 @@ -3681,6 +3722,10 @@ identified 1 arch spell_heal end end +arch light4 +x 13 +y 8 +end arch shop_empty x 13 y 9 @@ -3713,6 +3758,10 @@ y 11 unpaid 1 identified 1 end +arch light4 +x 13 +y 11 +end arch shop_empty x 13 y 12 @@ -3753,6 +3802,10 @@ y 14 unpaid 1 identified 1 end +arch light4 +x 13 +y 14 +end arch shop_empty x 13 y 15 @@ -3786,6 +3839,10 @@ unpaid 1 identified 1 artifact cure vision end +arch light4 +x 13 +y 17 +end arch shop_empty x 13 y 18 @@ -4642,6 +4699,10 @@ arch woodfloor x 16 y 25 end +arch light4 +x 16 +y 25 +end arch woodfloor x 16 y 26 @@ -4658,6 +4719,10 @@ arch woodfloor x 16 y 29 end +arch light4 +x 16 +y 29 +end arch woodfloor x 16 y 30 @@ -4674,6 +4739,10 @@ arch woodfloor x 16 y 33 end +arch light4 +x 16 +y 33 +end arch woodfloor x 16 y 34 diff --git a/scorn/misc/animal_quarantine b/scorn/misc/animal_quarantine index 9effe251c..8005d6e46 100644 --- a/scorn/misc/animal_quarantine +++ b/scorn/misc/animal_quarantine @@ -8,8 +8,9 @@ enter_x 19 enter_y 36 msg Created: 1993-10-15 -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/misc/drywell b/scorn/misc/drywell index 4d6f90fde..08ebb807c 100644 --- a/scorn/misc/drywell +++ b/scorn/misc/drywell @@ -3,12 +3,13 @@ name Dry Well reset_timeout 7200 difficulty 6 region scorn +darkness 3 width 24 height 22 enter_x 1 enter_y 1 msg -Modified: 2021-07-27 Saiapatsu +Modified: 2022-01-05 Kevin Zheng endmsg end arch dungeon_floor diff --git a/scorn/misc/map.esben.2 b/scorn/misc/map.esben.2 index 6489954c9..81be1cac4 100644 --- a/scorn/misc/map.esben.2 +++ b/scorn/misc/map.esben.2 @@ -3,13 +3,14 @@ name Old Basement reset_timeout 7200 difficulty 4 region scorn +darkness 2 width 24 height 24 enter_x 22 enter_y 22 msg Created: 2001-09-14 -Modified: 2008-11-30 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg end arch cobblestones diff --git a/scorn/misc/mercenaries b/scorn/misc/mercenaries index 86eaa4ccf..da12be2ce 100644 --- a/scorn/misc/mercenaries +++ b/scorn/misc/mercenaries @@ -8,8 +8,9 @@ enter_x 8 enter_y 16 msg Created: 1997-04-16 -Modified: 2021-07-25 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass_only end diff --git a/scorn/misc/port_arena b/scorn/misc/port_arena index 1703dd964..7c110af5f 100644 --- a/scorn/misc/port_arena +++ b/scorn/misc/port_arena @@ -8,8 +8,9 @@ enter_x 38 enter_y 6 msg Created: 1993-10-07 skud the great (tvangod@ecst.csuchico.edu) -Modified: 2012-01-13 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch dungeon_floor end diff --git a/scorn/misc/puddings.place b/scorn/misc/puddings.place index f372632b6..1a38a30cd 100644 --- a/scorn/misc/puddings.place +++ b/scorn/misc/puddings.place @@ -9,8 +9,9 @@ enter_x 24 enter_y 24 msg Created: 1994-05-01 -Modified: 2012-07-01 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/misc/zoo b/scorn/misc/zoo index 873aa141f..01932b6d2 100644 --- a/scorn/misc/zoo +++ b/scorn/misc/zoo @@ -8,8 +8,9 @@ enter_x 11 enter_y 15 msg Created: 1993-10-15 -Modified: 2013-03-18 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch large_stones end diff --git a/scorn/shops/coffeeshop b/scorn/shops/coffeeshop index 7f3a35b80..e1c8395e2 100644 --- a/scorn/shops/coffeeshop +++ b/scorn/shops/coffeeshop @@ -8,8 +8,9 @@ enter_x 9 enter_y 10 msg Created: 2003-04-27 Avion -Modified: 2021-10-02 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/shops/oleds_cafe b/scorn/shops/oleds_cafe index db3a9e5b2..60ed678ca 100644 --- a/scorn/shops/oleds_cafe +++ b/scorn/shops/oleds_cafe @@ -8,8 +8,9 @@ enter_x 9 enter_y 10 msg Created: 2003-04-27 -Modified: 2021-07-24 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch cobblestones2 end diff --git a/scorn/temples/devourers b/scorn/temples/devourers index bf2c59449..663d879b8 100644 --- a/scorn/temples/devourers +++ b/scorn/temples/devourers @@ -7,8 +7,9 @@ height 16 enter_x 13 msg Created: 1997-04-16 David Sundqvist (azzie@tellutec.se) -Modified: 2011-08-01 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/temples/gaea b/scorn/temples/gaea index a5ce266a6..d5551cce4 100644 --- a/scorn/temples/gaea +++ b/scorn/temples/gaea @@ -8,8 +8,9 @@ enter_x 12 enter_y 17 msg Created: 1999-01-24 Raphaël Quinet (raphael@gimp.org) -Modified: 2011-11-05 Andreas Kirschbaum +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass_only end diff --git a/scorn/temples/gorokh b/scorn/temples/gorokh index 01a934813..ec27a80e6 100644 --- a/scorn/temples/gorokh +++ b/scorn/temples/gorokh @@ -8,8 +8,9 @@ enter_x 6 enter_y 15 msg Created: 1999-01-22 Raphaël Quinet (raphael@gimp.org) -Modified: 2012-01-22 Nicolas Weeger +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/temples/lythander b/scorn/temples/lythander index 83c3341f4..a4ad521bb 100644 --- a/scorn/temples/lythander +++ b/scorn/temples/lythander @@ -8,8 +8,9 @@ enter_x 7 enter_y 18 msg Created: 1997-04-16 -Modified: 2014-04-19 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/temples/mostrai b/scorn/temples/mostrai index 6894c7272..86eeb13fe 100644 --- a/scorn/temples/mostrai +++ b/scorn/temples/mostrai @@ -8,8 +8,9 @@ enter_x 13 enter_y 16 msg Created: 1999-01-22 Raphaël Quinet (raphael@gimp.org) -Modified: 2021-10-03 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch brush end diff --git a/scorn/temples/mostrai2 b/scorn/temples/mostrai2 index e9841a3fd..ed6b89c71 100644 --- a/scorn/temples/mostrai2 +++ b/scorn/temples/mostrai2 @@ -9,7 +9,7 @@ enter_x 13 enter_y 2 msg Created: 1999-01-22 Raphaël Quinet (raphael@gimp.org) -Modified: 2012-01-17 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg end arch cave_15 @@ -464,6 +464,7 @@ dungeon_level 1 dungeon_depth 50 difficulty 0 difficulty_increase 0.5 +darkness 2 orientation 1 symmetry 1 treasureoptions 1 diff --git a/scorn/temples/ruggilli1 b/scorn/temples/ruggilli1 index 4d6155566..ade9eea6f 100644 --- a/scorn/temples/ruggilli1 +++ b/scorn/temples/ruggilli1 @@ -9,8 +9,9 @@ enter_x 3 enter_y 14 msg Created: 2001-01-03 dnh (dnh@hawthorn.csse.monash.edu.au) -Modified: 2021-10-03 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch small_stones end diff --git a/scorn/temples/sorig b/scorn/temples/sorig index 1e549f826..76c285151 100644 --- a/scorn/temples/sorig +++ b/scorn/temples/sorig @@ -8,8 +8,9 @@ enter_x 8 enter_y 15 msg Created: 1999-01-24 Raphaël Quinet (raphael@gimp.org) -Modified: 2017-07-09 Jason Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass_only end diff --git a/scorn/temples/valriel b/scorn/temples/valriel index 336da2f7d..bb21dfc54 100644 --- a/scorn/temples/valriel +++ b/scorn/temples/valriel @@ -8,8 +8,9 @@ enter_x 9 enter_y 28 msg Created: 1999-01-18 Raphaël Quinet (raphael@gimp.org) -Modified: 2008-09-29 Rick Tanner +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/towers/lighthouse.0 b/scorn/towers/lighthouse.0 index eba9dd6a9..3ce6c821b 100644 --- a/scorn/towers/lighthouse.0 +++ b/scorn/towers/lighthouse.0 @@ -8,8 +8,9 @@ enter_x 7 enter_y 13 msg Created: 1993-10-15 -Modified: 2010-06-06 Nicolas Weeger +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end diff --git a/scorn/towers/tower.mad0 b/scorn/towers/tower.mad0 index aebe632e9..80a7b1710 100644 --- a/scorn/towers/tower.mad0 +++ b/scorn/towers/tower.mad0 @@ -5,8 +5,9 @@ width 16 height 16 msg Created: 2010-06-06 Nicolas Weeger -Modified: 2013-08-12 Kevin Zheng +Modified: 2022-01-05 Kevin Zheng endmsg +outdoor 1 end arch grass end