From 2a334bd42d1961f9677f87498fd945183e57fae1 Mon Sep 17 00:00:00 2001 From: jarryd229 <15334102+jarryd229@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:46:32 +1100 Subject: [PATCH 1/5] xmas examines --- .../event/christmas/christmas.npc-spawns.toml | 31 -- .../event/christmas/christmas.npcs.toml | 68 ----- .../event/christmas/christmas.teles.toml | 43 +-- .../gublinch_cave.npc-spawns.toml | 17 -- .../gublinch_cave/gublinch_cave.npcs.toml | 54 ---- .../xmas_2005/xmas_2005.npc-spawns.toml | 9 + .../christmas/xmas_2005/xmas_2005.npcs.toml | 27 ++ .../christmas/xmas_2005/xmas_2005.objs.toml | 160 ++++++++++ .../xmas_2006/xmas_2006.npc-spawns.toml | 17 ++ .../christmas/xmas_2006/xmas_2006.npcs.toml | 89 ++++++ .../christmas/xmas_2006/xmas_2006.objs.toml | 72 +++++ .../xmas_2007/xmas_2007.npc-spawns.toml | 37 +++ .../christmas/xmas_2007/xmas_2007.npcs.toml | 46 +++ .../christmas/xmas_2007/xmas_2007.objs.toml | 155 ++++++++++ .../christmas/xmas_2008/xmas_2008.npcs.toml | 43 +++ .../christmas/xmas_2008/xmas_2008.objs.toml | 123 ++++++++ .../xmas_2009/xmas_2009.npc-spawns.toml | 87 ++---- .../christmas/xmas_2009/xmas_2009.npcs.toml | 242 +++++++++------ .../christmas/xmas_2009/xmas_2009.objs.toml | 279 ++++++++++++++++++ .../xmas_2010/xmas_2010.npc-spawns.toml | 47 ++- .../christmas/xmas_2010/xmas_2010.npcs.toml | 43 +++ .../christmas/xmas_2010/xmas_2010.objs.toml | 91 ++++++ .../event/halloween/halloween.teles.toml | 26 +- .../musa_point/musa_point.npc-spawns.toml | 6 +- data/entity/obj/crates.objs.toml | 16 - .../myths_of_the_white_lands.objs.toml | 7 + 26 files changed, 1440 insertions(+), 395 deletions(-) delete mode 100644 data/activity/event/christmas/christmas.npc-spawns.toml delete mode 100644 data/activity/event/christmas/christmas.npcs.toml delete mode 100644 data/activity/event/christmas/gublinch_cave/gublinch_cave.npc-spawns.toml delete mode 100644 data/activity/event/christmas/gublinch_cave/gublinch_cave.npcs.toml create mode 100644 data/activity/event/christmas/xmas_2005/xmas_2005.npc-spawns.toml create mode 100644 data/activity/event/christmas/xmas_2005/xmas_2005.npcs.toml create mode 100644 data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml create mode 100644 data/activity/event/christmas/xmas_2006/xmas_2006.npc-spawns.toml create mode 100644 data/activity/event/christmas/xmas_2006/xmas_2006.npcs.toml create mode 100644 data/activity/event/christmas/xmas_2006/xmas_2006.objs.toml create mode 100644 data/activity/event/christmas/xmas_2007/xmas_2007.npc-spawns.toml create mode 100644 data/activity/event/christmas/xmas_2007/xmas_2007.npcs.toml create mode 100644 data/activity/event/christmas/xmas_2007/xmas_2007.objs.toml create mode 100644 data/activity/event/christmas/xmas_2008/xmas_2008.npcs.toml create mode 100644 data/activity/event/christmas/xmas_2008/xmas_2008.objs.toml create mode 100644 data/activity/event/christmas/xmas_2009/xmas_2009.objs.toml create mode 100644 data/activity/event/christmas/xmas_2010/xmas_2010.objs.toml create mode 100644 data/quest/free/myths_of_the_white_lands/myths_of_the_white_lands.objs.toml diff --git a/data/activity/event/christmas/christmas.npc-spawns.toml b/data/activity/event/christmas/christmas.npc-spawns.toml deleted file mode 100644 index 58c355d9f6..0000000000 --- a/data/activity/event/christmas/christmas.npc-spawns.toml +++ /dev/null @@ -1,31 +0,0 @@ -spawns = [ -# 11097 - { id = "seal_6", x = 2807, y = 5714 }, - { id = "seal_6", x = 2780, y = 5706 }, - { id = "seal_5", x = 2807, y = 5739 }, - { id = "seal_5", x = 2779, y = 5707 }, - { id = "seal_4", x = 2808, y = 5713 }, - { id = "seal_4", x = 2778, y = 5706 }, - { id = "seal_3", x = 2773, y = 5749 }, - { id = "seal_2", x = 2771, y = 5748 }, - { id = "seal_2", x = 2807, y = 5737 }, - { id = "seal", x = 2769, y = 5749 }, - { id = "seal", x = 2807, y = 5711 }, - { id = "sir_amik_varze_christmas", x = 2707, y = 5729 }, - { id = "general_wartface_christmas", x = 2726, y = 5727 }, - { id = "general_bentnoze_christmas", x = 2725, y = 5727 }, - { id = "thok_master_of_dungeoneering_christmas", x = 2716, y = 5725 }, - { id = "rewards_trader_christmas", x = 2717, y = 5727 }, - { id = "manni_the_reveller_christmas", x = 2720, y = 5742 }, - { id = "brundt_the_chieftain_christmas", x = 2736, y = 5725 }, - { id = "thorvald_the_warrior_christmas", x = 2737, y = 5727 }, - { id = "swensen_the_navigator_christmas", x = 2735, y = 5727 }, - { id = "olaf_the_bard_christmas", x = 2719, y = 5741 }, - { id = "rosie_christmas", x = 2014, y = 4433, level = 1 }, - { id = "sorcha_christmas", x = 2000, y = 4448, level = 1 }, - { id = "cait_christmas", x = 2029, y = 4441, level = 1 }, - { id = "cormac_christmas", x = 2019, y = 4449 }, - { id = "fionn_christmas", x = 2012, y = 4441 }, - { id = "donnacha_christmas", x = 2003, y = 4445, level = 1 }, - { id = "ronan_christmas", x = 2010, y = 4451 }, -] \ No newline at end of file diff --git a/data/activity/event/christmas/christmas.npcs.toml b/data/activity/event/christmas/christmas.npcs.toml deleted file mode 100644 index b490429089..0000000000 --- a/data/activity/event/christmas/christmas.npcs.toml +++ /dev/null @@ -1,68 +0,0 @@ -[sir_amik_varze_christmas] -id = 13277 -examine = "The leader of the White Knights looks a little merry today." - -[general_wartface_christmas] -id = 13278 -examine = "An ugly, yet festive, green creature." - -[general_bentnoze_christmas] -id = 13279 -examine = "An ugly, yet festive, green creature." - -[thok_master_of_dungeoneering_christmas] -id = 13280 -examine = "The self-proclaimed master of festivities." - -[rewards_trader_christmas] -id = 13281 -examine = "He is trembling, covered in cuts and scrapes, and wearing a festive hat." - -[manni_the_reveller_christmas] -id = 13283 -examine = "Every innkeeper's best friend - if they serve eggnog!" - -[brundt_the_chieftain_christmas] -id = 13284 -examine = "Brundt, the red-nosed chieftain, has a very shiny nose." - -[thorvald_the_warrior_christmas] -id = 13285 -examine = "A festive Fremennik hero." - -[swensen_the_navigator_christmas] -id = 13286 -examine = "A Fremennik navigator of sleighs." - -[olaf_the_bard_christmas] -id = 13287 -examine = "A Fremennik carol singer." - -[rosie_christmas] -id = 3082 -examine = "An effervescent elfin." - -[sorcha_christmas] -id = 3083 -examine = "Seriously sprightly even for a sprite." - -[cait_christmas] -id = 3084 -examine = "A frenzied fey." - -[cormac_christmas] -id = 3085 -examine = "Too volatile for his own good." - -[fionn_christmas] -id = 3086 -examine = "One of Diango's itinerant pixies." - -[donnacha_christmas] -id = 3087 -examine = "One of Diango's itinerant pixies." - -[ronan_christmas] -id = 3088 -examine = "One of Diango's itinerant pixies." - diff --git a/data/activity/event/christmas/christmas.teles.toml b/data/activity/event/christmas/christmas.teles.toml index c541d44744..c9c38335fd 100644 --- a/data/activity/event/christmas/christmas.teles.toml +++ b/data/activity/event/christmas/christmas.teles.toml @@ -1,52 +1,29 @@ -# 6726 christmas -[27243] -option = "Climb-down" -tile = { x = 1636, y = 4835 } -to = { x = 1703, y = 4826 } - -[10708] -option = "Climb-down" -tile = { x = 1698, y = 4515, level = 1 } -delta = { x = -2, level = -1 } - -[10707] -option = "Climb-up" -tile = { x = 1698, y = 4515 } -delta = { x = 2, level = 1 } - -[10708] -option = "Climb-down" -tile = { x = 1695, y = 4515, level = 1 } -delta = { x = 2, level = -1 } - -[10707] -option = "Climb-up" -tile = { x = 1695, y = 4515 } -delta = { x = -2, level = 1 } - -# 8005 christmas - -[10708] +[ladder_2_xmas_2005] option = "Climb-down" tile = { x = 2009, y = 4431, level = 1 } delta = { x = -2, level = -1 } -[10707] +[ladder_xmas_2005] option = "Climb-up" tile = { x = 2009, y = 4431 } delta = { x = 2, level = 1 } -[10708] +[ladder_2_xmas_2005] option = "Climb-down" tile = { x = 2006, y = 4431, level = 1 } delta = { x = 2, level = -1 } -[10707] +[ladder_xmas_2005] option = "Climb-up" tile = { x = 2006, y = 4431 } delta = { x = -2, level = 1 } -[10699] +[trapdoor_steps_xmas_2005] option = "Climb-up" tile = { x = 2004, y = 4426, level = 1 } to = { x = 3091, y = 3275 } + +[ladder_gublinch_lair] +option = "Climb-up" +tile = { x = 3168, y = 5319 } +to = { x = 2841, y = 3144 } \ No newline at end of file diff --git a/data/activity/event/christmas/gublinch_cave/gublinch_cave.npc-spawns.toml b/data/activity/event/christmas/gublinch_cave/gublinch_cave.npc-spawns.toml deleted file mode 100644 index 45e4798de2..0000000000 --- a/data/activity/event/christmas/gublinch_cave/gublinch_cave.npc-spawns.toml +++ /dev/null @@ -1,17 +0,0 @@ -spawns = [ - { id = "gublinch", x = 3184, y = 5340, members = true }, - { id = "gublinch_2", x = 3191, y = 5325, members = true }, - { id = "gublinch_3", x = 3147, y = 5328, members = true }, - { id = "gublinch_4", x = 3153, y = 5341, members = true }, - { id = "gublinch_5", x = 3164, y = 5341, members = true }, - { id = "gublinch_6", x = 3147, y = 5355, members = true }, - { id = "gublinch_7", x = 3161, y = 5359, members = true }, - { id = "gublinch_8", x = 3171, y = 5353, members = true }, - { id = "gublinch_9", x = 3187, y = 5353, members = true }, - { id = "gublinch_10", x = 3189, y = 5366, members = true }, - { id = "gublinch_11", x = 3177, y = 5365, members = true }, - { id = "gublinch_12", x = 3191, y = 5334, members = true }, - { id = "gublinch_13", x = 3148, y = 5321, members = true }, - { id = "gublinch_14", x = 3149, y = 5366, members = true }, - { id = "gublinch_15", x = 3171, y = 5338, members = true }, -] diff --git a/data/activity/event/christmas/gublinch_cave/gublinch_cave.npcs.toml b/data/activity/event/christmas/gublinch_cave/gublinch_cave.npcs.toml deleted file mode 100644 index 26c8dbbfe9..0000000000 --- a/data/activity/event/christmas/gublinch_cave/gublinch_cave.npcs.toml +++ /dev/null @@ -1,54 +0,0 @@ -[gublinch] -id = 5003 - -[gublinch_2] -id = 5004 - -[gublinch_3] -id = 5005 - -[gublinch_4] -id = 5006 - -[gublinch_5] -id = 5007 - -[gublinch_6] -id = 5008 - -[gublinch_7] -id = 5009 - -[gublinch_8] -id = 5010 - -[gublinch_9] -id = 5011 - -[gublinch_10] -id = 5012 - -[gublinch_11] -id = 5013 - -[gublinch_12] -id = 5014 - -[gublinch_13] -id = 5015 - -[gublinch_14] -id = 5016 - -[gublinch_15] -id = 829 - -[gublinch_15_2] -id = 5017 - -[gublinch_15_3] -id = 5018 - -[gublinch_15_4] -id = 5019 - diff --git a/data/activity/event/christmas/xmas_2005/xmas_2005.npc-spawns.toml b/data/activity/event/christmas/xmas_2005/xmas_2005.npc-spawns.toml new file mode 100644 index 0000000000..46848851dc --- /dev/null +++ b/data/activity/event/christmas/xmas_2005/xmas_2005.npc-spawns.toml @@ -0,0 +1,9 @@ +spawns = [ + { id = "rosie_xmas_2005", x = 2007, y = 4427, level = 1 }, + { id = "sorcha_xmas_2005", x = 1993, y = 4442, level = 1 }, + { id = "cait_xmas_2005", x = 2022, y = 4435, level = 1 }, + { id = "cormac_xmas_2005", x = 2011, y = 4443 }, + { id = "fionn_xmas_2005", x = 2005, y = 4435 }, + { id = "donnacha_xmas_2005", x = 1996, y = 4439, level = 1 }, + { id = "ronan_xmas_2005", x = 2003, y = 4445 }, +] \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2005/xmas_2005.npcs.toml b/data/activity/event/christmas/xmas_2005/xmas_2005.npcs.toml new file mode 100644 index 0000000000..ab7436b64b --- /dev/null +++ b/data/activity/event/christmas/xmas_2005/xmas_2005.npcs.toml @@ -0,0 +1,27 @@ +[rosie_xmas_2005] +id = 3082 +examine = "An effervescent elfin." + +[sorcha_xmas_2005] +id = 3083 +examine = "Seriously sprightly even for a sprite." + +[cait_xmas_2005] +id = 3084 +examine = "A frenzied fey." + +[cormac_xmas_2005] +id = 3085 +examine = "Too volatile for his own good." + +[fionn_xmas_2005] +id = 3086 +examine = "One of Diango's itinerant pixies." + +[donnacha_xmas_2005] +id = 3087 +examine = "One of Diango's itinerant pixies." + +[ronan_xmas_2005] +id = 3088 +examine = "One of Diango's itinerant pixies." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml b/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml new file mode 100644 index 0000000000..7b1d380967 --- /dev/null +++ b/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml @@ -0,0 +1,160 @@ +[paintcans_xmas_2005] +id = 10673 +examine = "Equipment for colouring items." + +[paintcans_2_xmas_2005] +id = 10674 +examine = "Equipment for colouring items." + +[paintcans_3_xmas_2005] +id = 10675 +examine = "Equipment for colouring items." + +[workbench_xmas_2005] +id = 10676 +examine = "A puppet is being constructed here." + +[workbench_2_xmas_2005] +id = 10677 +examine = "A puppet is being constructed here." + +[workbench_3_xmas_2005] +id = 10678 +examine = "A puppet is being constructed here." + +[decorations_box_xmas_2005] +id = 10679 +examine = "A box containing unpainted decorations." + +[decorations_box_2_xmas_2005] +id = 10680 +examine = "A box containing unpainted decorations." + +[decorations_box_3_xmas_2005] +id = 10681 +examine = "A box containing unpainted decorations." + +[decorations_box_4_xmas_2005] +id = 10682 +examine = "A box containing unpainted decorations." + +[decorations_box_5_xmas_2005] +id = 10683 +examine = "A box containing unpainted decorations." + +[decorations_box_6_xmas_2005] +id = 10684 +examine = "A box containing unpainted decorations." + +[decorations_box_7_xmas_2005] +id = 10685 +examine = "A box containing unpainted decorations." + +[puppet_heads_blue_xmas_2005] +id = 10686 +examine = "Box containing blue puppet heads." + +[puppet_torsos_blue_xmas_2005] +id = 10687 +examine = "Box containing blue puppet torsos." + +[puppet_arms_blue_xmas_2005] +id = 10688 +examine = "Box containing blue puppet arms." + +[puppet_legs_blue_xmas_2005] +id = 10689 +examine = "Box containing blue puppet legs." + +[puppet_heads_red_xmas_2005] +id = 10690 +examine = "Box containing red puppet heads." + +[puppet_torsos_red_xmas_2005] +id = 10691 +examine = "Box containing red puppet torsos." + +[puppet_arms_red_xmas_2005] +id = 10692 +examine = "Box containing red puppet arms." + +[puppet_legs_red_xmas_2005] +id = 10693 +examine = "Box containing red puppet legs." + +[puppet_heads_green_xmas_2005] +id = 10694 +examine = "Box containing green puppet heads." + +[puppet_torsos_green_xmas_2005] +id = 10695 +examine = "Box containing green puppet torsos." + +[puppet_arms_green_xmas_2005] +id = 10696 +examine = "Box containing green puppet arms." + +[puppet_legs_green_xmas_2005] +id = 10697 +examine = "Box containing green puppet legs." + +[crate_blue_xmas_2005] +id = 10701 +examine = "A blue crate. Probably containing puppets." + +[crate_green_xmas_2005] +id = 10702 +examine = "A green crate. Probably containing puppets." + +[crate_red_xmas_2005] +id = 10703 +examine = "A red crate. Probably containing puppets." + +[crate_xmas_2005] +id = 10704 +examine = "A large crate. More puppets?" + +[crates_xmas_2005] +id = 10705 +examine = "Some large wooden crates." + +[large_box_xmas_2005] +id = 10706 +examine = "A large box full of wood chippings." + +[paint_pots_xmas_2005] +id = 10710 +examine = "Pots full of paint." + + + + + + + + + + + + + + + + + + + + + + +[trapdoor_steps_xmas_2005] +id = 10699 +examine = "You can climb up these." + +[ladder_xmas_2005] +id = 10707 +examine = "A wooden ladder." + +[ladder_2_xmas_2005] +id = 10708 +examine = "A wooden ladder." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2006/xmas_2006.npc-spawns.toml b/data/activity/event/christmas/xmas_2006/xmas_2006.npc-spawns.toml new file mode 100644 index 0000000000..1bf41b6bed --- /dev/null +++ b/data/activity/event/christmas/xmas_2006/xmas_2006.npc-spawns.toml @@ -0,0 +1,17 @@ +spawns = [ + { id = "gublinch_1_spawn_1", x = 3184, y = 5340 }, + { id = "gublinch_1_spawn_2", x = 3191, y = 5325 }, + { id = "gublinch_1_spawn_3", x = 3147, y = 5328 }, + { id = "gublinch_1_spawn_4", x = 3153, y = 5341 }, + { id = "gublinch_1_spawn_5", x = 3164, y = 5341 }, + { id = "gublinch_1_spawn_6", x = 3147, y = 5355 }, + { id = "gublinch_1_spawn_7", x = 3161, y = 5359 }, + { id = "gublinch_1_spawn_8", x = 3171, y = 5353 }, + { id = "gublinch_1_spawn_9", x = 3187, y = 5353 }, + { id = "gublinch_1_spawn_10", x = 3189, y = 5366 }, + { id = "gublinch_1_spawn_11", x = 3177, y = 5365 }, + { id = "gublinch_1_spawn_12", x = 3191, y = 5334 }, + { id = "gublinch_1_spawn_13", x = 3148, y = 5321 }, + { id = "gublinch_1_spawn_14", x = 3149, y = 5366 }, + { id = "gublinch_1_spawn_15", x = 3171, y = 5338 }, +] \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2006/xmas_2006.npcs.toml b/data/activity/event/christmas/xmas_2006/xmas_2006.npcs.toml new file mode 100644 index 0000000000..a02e8d4dd1 --- /dev/null +++ b/data/activity/event/christmas/xmas_2006/xmas_2006.npcs.toml @@ -0,0 +1,89 @@ +[shanty_claws] +id = 828 +wander_radius = 4 +large_head = true +examine = "A sea shanty-singing werewolf wearing a Santa Claus robe." + +[gublinch_1_spawn_1] +id = 829 + +[gublinch_1_spawn_2] +id = 5003 + +[gublinch_1_spawn_3] +id = 5004 + +[gublinch_1_spawn_4] +id = 5005 + +[gublinch_1_spawn_5] +id = 5006 + +[gublinch_1_spawn_6] +id = 5007 + +[gublinch_1_spawn_7] +id = 5008 + +[gublinch_1_spawn_8] +id = 5009 + +[gublinch_1_spawn_9] +id = 5010 + +[gublinch_1_spawn_10] +id = 5011 + +[gublinch_1_spawn_11] +id = 5012 + +[gublinch_1_spawn_12] +id = 5013 + +[gublinch_1_spawn_13] +id = 5014 + +[gublinch_1_spawn_14] +id = 5015 + +[gublinch_1_spawn_15] +id = 5016 + +[gublinch_1] +id = 5017 +wander_radius = 4 +examine = "A sweaty gublinch." + +[gublinch_2] +id = 5018 +wander_radius = 4 +examine = "A chilled, smelly gublinch." + +[gublinch_3] +id = 5019 +wander_radius = 4 +examine = "A freezing cold gublinch." + +[gub_musa_multi_child_1] +id = 5020 + +[gub_musa_multi_child_2] +id = 5021 + +[gub_musa_multi_child_3] +id = 5022 + +[gub_musa_child_1] +id = 5023 +wander_radius = 2 +examine = "A happy child, now that he has been freed." + +[gub_musa_child_2] +id = 5024 +wander_radius = 2 +examine = "A happy child, now that he has been freed." + +[gub_musa_child_3] +id = 5025 +wander_radius = 2 +examine = "A happy child, now that he has been freed." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2006/xmas_2006.objs.toml b/data/activity/event/christmas/xmas_2006/xmas_2006.objs.toml new file mode 100644 index 0000000000..34346b6776 --- /dev/null +++ b/data/activity/event/christmas/xmas_2006/xmas_2006.objs.toml @@ -0,0 +1,72 @@ +[gublinch_snow_1] +id = 19030 +examine = "A large pile of snow." + +[gublinch_snow_2] +id = 19031 +examine = "A large pile of snow." + +[gublinch_snow_3] +id = 19033 +examine = "A large pile of snow." + +[gublinch_snow_4] +id = 19034 +examine = "A large pile of snow." + +[gublinch_snow_5] +id = 19035 +examine = "A large pile of snow." + +[cage_without_gublinch] +id = 19036 +examine = "A strong metal cage." + +[cage_with_gublinch] +id = 19037 +examine = "A strong cage; it has a gublinch in it." + +[gub_wintumber_tree_standard] +id = 19038 +examine = "A pretty wintumber tree." + +[cave_entrance_gublinch_lair] +id = 19039 + +[ladder_gublinch_lair] +id = 19040 +examine = "It leads back up to the surface." + +[childerkin_slaves] +id = 20100 +examine = "These childerkins have been childernapped by the gublinch." + +[gublinch_cage] +id = 20119 + +[gublinch_cage_2] +id = 20120 + +[gublinch_cage_3] +id = 20121 + +[gublinch_cage_4] +id = 20122 + +[gublinch_cage_5] +id = 20123 + +[gublinch_cage_6] +id = 20124 + +[gublinch_cage_7] +id = 20125 + +[gublinch_cage_8] +id = 20126 + +[gublinch_cage_9] +id = 20127 + +[gublinch_cage_10] +id = 20128 \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2007/xmas_2007.npc-spawns.toml b/data/activity/event/christmas/xmas_2007/xmas_2007.npc-spawns.toml new file mode 100644 index 0000000000..f5890ceafa --- /dev/null +++ b/data/activity/event/christmas/xmas_2007/xmas_2007.npc-spawns.toml @@ -0,0 +1,37 @@ +spawns = [ + { id = "queen_of_snow_xmas_2007", x = 2655, y = 5614 }, + { id = "snow_imp_xmas_2007", x = 2640, y = 5599 }, + { id = "snow_imp_xmas_2007", x = 2641, y = 5592 }, + { id = "snow_imp_xmas_2007", x = 2642, y = 5605 }, + { id = "snow_imp_xmas_2007", x = 2642, y = 5615 }, + { id = "snow_imp_xmas_2007", x = 2647, y = 5599 }, + { id = "snow_imp_xmas_2007", x = 2648, y = 5584 }, + { id = "snow_imp_xmas_2007", x = 2654, y = 5592 }, + { id = "snow_imp_xmas_2007", x = 2655, y = 5602 }, + { id = "snow_imp_xmas_2007", x = 2657, y = 5585 }, + { id = "snow_imp_xmas_2007", x = 2664, y = 5600 }, + { id = "snow_imp_xmas_2007", x = 2665, y = 5583 }, + { id = "snow_imp_xmas_2007", x = 2669, y = 5589 }, + { id = "snow_imp_xmas_2007", x = 2670, y = 5598 }, + { id = "snow_imp_xmas_2007", x = 2670, y = 5614 }, + { id = "snow_xmas_2007", x = 2640, y = 5602 }, + { id = "snow_xmas_2007", x = 2640, y = 5609 }, + { id = "snow_xmas_2007", x = 2643, y = 5587 }, + { id = "snow_xmas_2007", x = 2643, y = 5596 }, + { id = "snow_xmas_2007", x = 2645, y = 5607 }, + { id = "snow_xmas_2007", x = 2648, y = 5602 }, + { id = "snow_xmas_2007", x = 2649, y = 5595 }, + { id = "snow_xmas_2007", x = 2655, y = 5583 }, + { id = "snow_xmas_2007", x = 2655, y = 5598 }, + { id = "snow_xmas_2007", x = 2656, y = 5590 }, + { id = "snow_xmas_2007", x = 2661, y = 5595 }, + { id = "snow_xmas_2007", x = 2662, y = 5603 }, + { id = "snow_xmas_2007", x = 2664, y = 5586 }, + { id = "snow_xmas_2007", x = 2666, y = 5597 }, + { id = "snow_xmas_2007", x = 2667, y = 5607 }, + { id = "snow_xmas_2007", x = 2668, y = 5583 }, + { id = "snow_xmas_2007", x = 2669, y = 5591 }, + { id = "snow_xmas_2007", x = 2671, y = 5602 }, + { id = "snow_2_xmas_2007", x = 2650, y = 5589 }, + { id = "snow_2_xmas_2007", x = 2667, y = 5613 }, +] diff --git a/data/activity/event/christmas/xmas_2007/xmas_2007.npcs.toml b/data/activity/event/christmas/xmas_2007/xmas_2007.npcs.toml new file mode 100644 index 0000000000..a8588038bc --- /dev/null +++ b/data/activity/event/christmas/xmas_2007/xmas_2007.npcs.toml @@ -0,0 +1,46 @@ +[queen_of_snow_xmas_2007] +id = 6731 +examine = "Her lack of body heat is unsettling." + +[snow_imp_xmas_2007] +id = 6739 +examine = "It looks right at home here." + +[snow_xmas_2007] +id = 6740 +examine = "Snowflakes swirling in the wind." + +[snow_2_xmas_2007] +id = 6741 + +[barbarian_snowman_xmas_2007] +id = 6742 +examine = "A helmetted, barbarian snowman." + +[dragon_snowman_xmas_2007] +id = 6743 +examine = "A snowman in fake dragon armour." + +[dwarf_snowman_xmas_2007] +id = 6744 +examine = "A snow dwarf." + +[pirate_snowman_xmas_2007] +id = 6745 +examine = "Arr!" + +[snowman_xmas_2007] +id = 6746 +examine = "A traditional snowman." + +[snow_ranger_xmas_2007] +id = 6747 +examine = "A snowman armed with a holly bow." + +[snow_warrior_xmas_2007] +id = 6748 +examine = "A snowman armed with an ice sword." + +[snow_mage_xmas_2007] +id = 6749 +examine = "A snowman armed with a winter staff." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2007/xmas_2007.objs.toml b/data/activity/event/christmas/xmas_2007/xmas_2007.objs.toml new file mode 100644 index 0000000000..f598874a0b --- /dev/null +++ b/data/activity/event/christmas/xmas_2007/xmas_2007.objs.toml @@ -0,0 +1,155 @@ +[table_xmas_2007] +id = 28262 +examine = "If the Queen of Snow had use for a table, this is the table she'd use." + +[snowman_xmas_2007] +id = 28266 +examine = "Add more snow to make him grow!" + +[snowman_2_xmas_2007] +id = 28267 +examine = "Add more snow to make him grow!" + +[snowman_3_xmas_2007] +id = 28268 +examine = "Add more snow to make him grow!" + +[snowman_4_xmas_2007] +id = 28269 +examine = "Add more snow to make him grow!" + +[snowman_5_xmas_2007] +id = 28270 +examine = "Add more snow to make him grow!" + +[snowman_6_xmas_2007] +id = 28271 +examine = "Add more snow to make him grow!" + +[snowman_7_xmas_2007] +id = 28272 +examine = "Add more snow to make him grow!" + +[snowman_8_xmas_2007] +id = 28273 +examine = "Add more snow to make him grow!" + +[snowman_9_xmas_2007] +id = 28274 +examine = "Add more snow to make him grow!" + +[snowman_10_xmas_2007] +id = 28275 +examine = "Add more snow to make him grow!" + +[snowman_11_xmas_2007] +id = 28276 +examine = "Add more snow to make him grow!" + +[snowman_12_xmas_2007] +id = 28277 +examine = "Add more snow to make him grow!" + +[snowman_13_xmas_2007] +id = 28278 +examine = "Add more snow to make him grow!" + +[snowman_14_xmas_2007] +id = 28279 +examine = "Add more snow to make him grow!" + +[snowman_15_xmas_2007] +id = 28280 +examine = "Add more snow to make him grow!" + +[snowman_16_xmas_2007] +id = 28281 +examine = "Add more snow to make him grow!" + +[snowman_17_xmas_2007] +id = 28282 +examine = "Add more snow to make him grow!" + +[snowman_18_xmas_2007] +id = 28283 +examine = "Add more snow to make him grow!" + +[snowman_19_xmas_2007] +id = 28284 +examine = "Add more snow to make him grow!" + +[snowman_20_xmas_2007] +id = 28285 +examine = "Add more snow to make him grow!" + +[snowman_21_xmas_2007] +id = 28286 +examine = "Add more snow to make him grow!" + +[snowman_22_xmas_2007] +id = 28287 +examine = "Add more snow to make him grow!" + +[snowman_23_xmas_2007] +id = 28288 +examine = "Add more snow to make him grow!" + +[snowman_24_xmas_2007] +id = 28289 +examine = "Add more snow to make him grow!" + +[snowman_25_xmas_2007] +id = 28290 +examine = "Add more snow to make him grow!" + +[snowman_26_xmas_2007] +id = 28291 +examine = "Add more snow to make him grow!" + +[snowman_27_xmas_2007] +id = 28292 +examine = "Add more snow to make him grow!" + +[snowman_28_xmas_2007] +id = 28293 +examine = "Add more snow to make him grow!" + +[snowman_29_xmas_2007] +id = 28294 +examine = "Add more snow to make him grow!" + +[snowman_30_xmas_2007] +id = 28295 +examine = "The snowman is almost finished! Just add a hat to complete it." + +[snow_xmas_2007] +id = 28296 +examine = "A pile of snow." + +[snow_2_xmas_2007] +id = 28297 +examine = "A pile of snow." + +[sleigh_xmas_2007] +id = 28298 +examine = "This belongs to the Queen of Snow." + +[sleigh_2_xmas_2007] +id = 28299 +examine = "This belongs to the Queen of Snow." + +[throne_xmas_2007] +id = 28316 +examine = "The Queen of Snow presumably sits on this when she's tired of standing up." + +[food_trough_xmas_2007] +id = 28317 +examine = "The stags have already eaten all the food." + +[stags_xmas_2007] +id = 28318 +examine = "These magnificent animals draw the Queen of Snow's sleigh." + +[stags_2_xmas_2007] +id = 28319 +examine = "These magnificent animals draw the Queen of Snow's sleigh." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2008/xmas_2008.npcs.toml b/data/activity/event/christmas/xmas_2008/xmas_2008.npcs.toml new file mode 100644 index 0000000000..27a483b497 --- /dev/null +++ b/data/activity/event/christmas/xmas_2008/xmas_2008.npcs.toml @@ -0,0 +1,43 @@ +[jack_frost_xmas_2008] +id = 8517 +examine = "The rebellious teenage son of the Queen of Snow. Interesting outfit!" + +[jack_frost_2_xmas_2008] +id = 8518 +examine = "The rebellious teenage son of the Queen of Snow. Interesting outfit!" + +[jack_frost_3_xmas_2008] +id = 8519 +examine = "The rebellious teenage son of the Queen of Snow. Interesting outfit!" + +[snow_imp_xmas_2008] +id = 8536 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[snow_imp_2_xmas_2008] +id = 8537 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[snow_imp_3_xmas_2008] +id = 8538 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[queen_of_snow_xmas_2008] +id = 8539 +examine = "Her lack of body heat is unsettling." + +[santa_claus_xmas_2008] +id = 8540 +examine = "He knows if you've been naughty or nice." + +[head_snow_imp_xmas_2008] +id = 8541 +examine = "A festive emissary of the Land of Snow." + +[head_snow_imp_2_xmas_2008] +id = 8542 +examine = "A festive emissary of the Land of Snow." + +[head_snow_imp_3_xmas_2008] +id = 8543 +examine = "A festive emissary of the Land of Snow." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2008/xmas_2008.objs.toml b/data/activity/event/christmas/xmas_2008/xmas_2008.objs.toml new file mode 100644 index 0000000000..f7276d14eb --- /dev/null +++ b/data/activity/event/christmas/xmas_2008/xmas_2008.objs.toml @@ -0,0 +1,123 @@ +[iced_rocks_xmas_2008] +id = 41704 +examine = "Permafrost has set in." + +[iced_rocks_2_xmas_2008] +id = 41705 +examine = "Permafrost has set in." + +[iced_rocks_3_xmas_2008] +id = 41706 +examine = "Permafrost has set in." + +[iced_rocks_4_xmas_2008] +id = 41707 +examine = "Permafrost has set in." + +[ice_sculpture_xmas_2008] +id = 41717 +examine = "Santa's legendary reindeer, encased in ice." + +[ice_sculpture_2_xmas_2008] +id = 41718 +examine = "Santa's legendary reindeer, encased in ice." + +[ice_sculpture_3_xmas_2008] +id = 41719 +examine = "What a splendid and detailed sculpture. They look almost real!" + +[ice_sculpture_4_xmas_2008] +id = 41720 +examine = "What a splendid and detailed sculpture. They look almost real!" + +[reindeer_xmas_2008] +id = 41723 +examine = "These magnificent animals draw Santa's sleigh." + +[reindeer_2_xmas_2008] +id = 41724 +examine = "These magnificent animals draw Santa's sleigh." + +[reindeer_3_xmas_2008] +id = 41725 +examine = "Santa's legendary reindeer." + +[reindeer_4_xmas_2008] +id = 41726 +examine = "Santa's legendary reindeer." + +[reindeer_5_xmas_2008] +id = 41727 +examine = "Santa's legendary reindeer." + +[reindeer_6_xmas_2008] +id = 41728 +examine = "Santa's legendary reindeer." + +[reindeer_7_xmas_2008] +id = 41729 +examine = "Santa's legendary reindeer." + +[reindeer_8_xmas_2008] +id = 41730 +examine = "Santa's legendary reindeer." + +[reindeer_9_xmas_2008] +id = 41731 +examine = "Santa's legendary reindeer." + +[reindeer_10_xmas_2008] +id = 41732 +examine = "Santa's legendary reindeer." + +[ice_sculpture_5_xmas_2008] +id = 41733 +examine = "What a splendid and detailed sculpture. They look almost real!" + +[sleigh_xmas_2008] +id = 41734 +examine = "Santa's famous sleigh, complete with Santa, presents and, unfortunately, ice." + +[sleigh_2_xmas_2008] +id = 41735 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_3_xmas_2008] +id = 41736 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_4_xmas_2008] +id = 41737 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_5_xmas_2008] +id = 41738 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_6_xmas_2008] +id = 41739 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_7_xmas_2008] +id = 41740 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_8_xmas_2008] +id = 41741 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_9_xmas_2008] +id = 41742 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_10_xmas_2008] +id = 41743 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_11_xmas_2008] +id = 41744 +examine = "Santa's famous sleigh, complete with Santa and presents." + +[sleigh_12_xmas_2008] +id = 41745 +examine = "It is filled with presents." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2009/xmas_2009.npc-spawns.toml b/data/activity/event/christmas/xmas_2009/xmas_2009.npc-spawns.toml index c0e6f8734c..d48968f028 100644 --- a/data/activity/event/christmas/xmas_2009/xmas_2009.npc-spawns.toml +++ b/data/activity/event/christmas/xmas_2009/xmas_2009.npc-spawns.toml @@ -1,63 +1,28 @@ spawns = [ - { id = "queen_of_snow_xmas_2009", x = 2655, y = 5614 }, - { id = "snow_imp_xmas_2009", x = 2640, y = 5599 }, - { id = "snow_imp_xmas_2009", x = 2641, y = 5592 }, - { id = "snow_imp_xmas_2009", x = 2642, y = 5605 }, - { id = "snow_imp_xmas_2009", x = 2642, y = 5615 }, - { id = "snow_imp_xmas_2009", x = 2647, y = 5599 }, - { id = "snow_imp_xmas_2009", x = 2648, y = 5584 }, - { id = "snow_imp_xmas_2009", x = 2654, y = 5592 }, - { id = "snow_imp_xmas_2009", x = 2655, y = 5602 }, - { id = "snow_imp_xmas_2009", x = 2657, y = 5585 }, - { id = "snow_imp_xmas_2009", x = 2664, y = 5600 }, - { id = "snow_imp_xmas_2009", x = 2665, y = 5583 }, - { id = "snow_imp_xmas_2009", x = 2669, y = 5589 }, - { id = "snow_imp_xmas_2009", x = 2670, y = 5598 }, - { id = "snow_imp_xmas_2009", x = 2670, y = 5614 }, - { id = "snow_xmas_2009", x = 2640, y = 5602 }, - { id = "snow_xmas_2009", x = 2640, y = 5609 }, - { id = "snow_xmas_2009", x = 2643, y = 5587 }, - { id = "snow_xmas_2009", x = 2643, y = 5596 }, - { id = "snow_xmas_2009", x = 2645, y = 5607 }, - { id = "snow_xmas_2009", x = 2648, y = 5602 }, - { id = "snow_xmas_2009", x = 2649, y = 5595 }, - { id = "snow_xmas_2009", x = 2655, y = 5583 }, - { id = "snow_xmas_2009", x = 2655, y = 5598 }, - { id = "snow_xmas_2009", x = 2656, y = 5590 }, - { id = "snow_xmas_2009", x = 2661, y = 5595 }, - { id = "snow_xmas_2009", x = 2662, y = 5603 }, - { id = "snow_xmas_2009", x = 2664, y = 5586 }, - { id = "snow_xmas_2009", x = 2666, y = 5597 }, - { id = "snow_xmas_2009", x = 2667, y = 5607 }, - { id = "snow_xmas_2009", x = 2668, y = 5583 }, - { id = "snow_xmas_2009", x = 2669, y = 5591 }, - { id = "snow_xmas_2009", x = 2671, y = 5602 }, - { id = "snow_xmas_2009_2", x = 2650, y = 5589, members = true }, - { id = "snow_xmas_2009_2", x = 2667, y = 5613, members = true }, - { id = "ebenezer_scourge_xmas_2009", x = 2584, y = 5594, members = true }, - { id = "ebenezer_scourge_xmas_2009_2", x = 2646, y = 5664, members = true }, - { id = "snow_imp_xmas_2009_2", x = 2666, y = 5671, members = true }, - { id = "snow_imp_xmas_2009_3", x = 2646, y = 5655, members = true }, - { id = "snow_imp_xmas_2009_4", x = 2657, y = 5679, members = true }, - { id = "snow_imp_xmas_2009_5", x = 2653, y = 5652, members = true }, - { id = "partygoer_xmas_2009", x = 2658, y = 5665, members = true }, - { id = "partygoer_xmas_2009_2", x = 2646, y = 5660, members = true }, - { id = "partygoer_xmas_2009_3", x = 2655, y = 5659, members = true }, - { id = "partygoer_xmas_2009_4", x = 2663, y = 5659, members = true }, + { id = "ebenezer_scourge_xmas_2009", x = 2584, y = 5594 }, + { id = "ebenezer_scourge_2_xmas_2009", x = 2646, y = 5664 }, + { id = "snow_imp_2_xmas_2009", x = 2666, y = 5671 }, + { id = "snow_imp_3_xmas_2009", x = 2646, y = 5655 }, + { id = "snow_imp_4_xmas_2009", x = 2657, y = 5679 }, + { id = "snow_imp_5_xmas_2009", x = 2653, y = 5652 }, + { id = "partygoer_4_xmas_2009", x = 2658, y = 5665 }, + { id = "partygoer_7_xmas_2009", x = 2646, y = 5660 }, + { id = "partygoer_10_xmas_2009", x = 2655, y = 5659 }, + { id = "partygoer_13_xmas_2009", x = 2663, y = 5659 }, { id = "betty_xmas_2009", x = 2662, y = 5664 }, - { id = "sir_amik_varze_xmas_2009", x = 2649, y = 5659, members = true }, - { id = "queen_of_snow_xmas_2009_2", x = 2655, y = 5678, members = true }, - { id = "santa_claus_xmas_2009", x = 2654, y = 5664, members = true }, - { id = "tiny_thom_xmas_2009", x = 2651, y = 5653, members = true }, - { id = "jack_frost_xmas_2009", x = 2668, y = 5671 }, - { id = "cook_xmas_2009", x = 2649, y = 5665, members = true }, - { id = "louis_the_camel_xmas_2009", x = 2663, y = 5652 }, - { id = "general_wartface_xmas_2009", x = 2658, y = 5652, members = true }, - { id = "general_bentnoze_xmas_2009", x = 2657, y = 5652, members = true }, - { id = "general_bentnoze_xmas_2009_2", x = 2656, y = 5657, members = true }, - { id = "general_wartface_xmas_2009_2", x = 2654, y = 5657, members = true }, - { id = "sir_amik_varze_xmas_2009_2", x = 2650, y = 5658, members = true }, - { id = "cook_xmas_2009_2", x = 2650, y = 5661, members = true }, - { id = "partygoer_xmas_2009_5", x = 2660, y = 5658, members = true }, - { id = "tiny_thom_xmas_2009_2", x = 2656, y = 5661, members = true }, -] + { id = "sir_amik_varze_xmas_2009", x = 2649, y = 5659 }, + { id = "queen_of_snow_xmas_2009", x = 2655, y = 5678 }, + { id = "santa_claus_xmas_2009", x = 2654, y = 5664 }, + { id = "tiny_thom_2_xmas_2009", x = 2651, y = 5653 }, + { id = "jack_frost_2_xmas_2009", x = 2668, y = 5671 }, + { id = "cook_2_xmas_2009", x = 2649, y = 5665 }, + { id = "louis_the_camel_2_xmas_2009", x = 2663, y = 5652 }, + { id = "general_wartface_xmas_2009", x = 2658, y = 5652 }, + { id = "general_bentnoze_xmas_2009", x = 2657, y = 5652 }, + { id = "general_bentnoze_3_xmas_2009", x = 2656, y = 5657 }, + { id = "general_wartface_3_xmas_2009", x = 2654, y = 5657 }, + { id = "sir_amik_varze_3_xmas_2009", x = 2650, y = 5658 }, + { id = "cook_4_xmas_2009", x = 2650, y = 5661 }, + { id = "partygoer_16_xmas_2009", x = 2660, y = 5658 }, + { id = "tiny_thom_4_xmas_2009", x = 2656, y = 5661 }, +] \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2009/xmas_2009.npcs.toml b/data/activity/event/christmas/xmas_2009/xmas_2009.npcs.toml index 588071e84c..dfd0018af2 100644 --- a/data/activity/event/christmas/xmas_2009/xmas_2009.npcs.toml +++ b/data/activity/event/christmas/xmas_2009/xmas_2009.npcs.toml @@ -1,48 +1,115 @@ -[queen_of_snow_xmas_2009] -id = 6731 -examine = "Her lack of body heat is unsettling." - [snow_imp_xmas_2009] -id = 6739 -examine = "It looks right at home here." +id = 9364 + +[jack_frost_xmas_2009] +id = 9365 + +[tiny_thom_xmas_2009] +id = 9366 +examine = "Not the tallest." -[snow_xmas_2009] -id = 6740 -examine = "Snowflakes swirling in the wind." +[cook_xmas_2009] +id = 9367 +examine = "Lumbridge Castle's head cook." -[snow_xmas_2009_2] -id = 6741 +[louis_the_camel_xmas_2009] +id = 9368 +examine = "A camel who likes to complain." [ebenezer_scourge_xmas_2009] id = 9369 -[ebenezer_scourge_xmas_2009_2] +[ebenezer_scourge_2_xmas_2009] id = 9370 -[snow_imp_xmas_2009_2] +[ebenezer_scourge_3_xmas_2009] +id = 9371 +examine = "Bah, humbug!" + +[snow_imp_2_xmas_2009] id = 9372 -[snow_imp_xmas_2009_3] +[snow_imp_3_xmas_2009] id = 9373 -[snow_imp_xmas_2009_4] +[snow_imp_4_xmas_2009] id = 9374 -[snow_imp_xmas_2009_5] +[snow_imp_5_xmas_2009] id = 9375 +[snow_imp_6_xmas_2009] +id = 9376 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[snow_imp_7_xmas_2009] +id = 9377 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[snow_imp_8_xmas_2009] +id = 9378 +examine = "Small, blue and mischievous - it's a snow imp all right." + +[snow_imp_9_xmas_2009] +id = 9379 +examine = "Small, blue and mischievous - it's a snow imp all right." + [partygoer_xmas_2009] +id = 9380 +examine = "This kind woman is full of goodwill." + +[partygoer_2_xmas_2009] +id = 9381 +examine = "He's really got caught up in the Christmas spirit." + +[partygoer_3_xmas_2009] +id = 9382 +examine = "This kind woman is full of goodwill." + +[partygoer_4_xmas_2009] id = 9383 -[partygoer_xmas_2009_2] +[partygoer_5_xmas_2009] +id = 9384 +examine = "He's really got caught up in the Christmas spirit." + +[partygoer_6_xmas_2009] +id = 9385 +examine = "He's really got caught up in the Christmas spirit." + +[partygoer_7_xmas_2009] id = 9386 -[partygoer_xmas_2009_3] +[partygoer_8_xmas_2009] +id = 9387 +examine = "He's really got caught up in the Christmas spirit." + +[partygoer_9_xmas_2009] +id = 9388 +examine = "He's really got caught up in the Christmas spirit." + +[partygoer_10_xmas_2009] id = 9389 -[partygoer_xmas_2009_4] +[partygoer_11_xmas_2009] +id = 9390 +examine = "This kind woman is full of goodwill." + +[partygoer_12_xmas_2009] +id = 9391 +examine = "This kind woman is full of goodwill." + +[partygoer_13_xmas_2009] id = 9392 +[partygoer_14_xmas_2009] +id = 9393 +examine = "This kind woman is full of goodwill." + +[partygoer_15_xmas_2009] +id = 9394 +examine = "This kind woman is full of goodwill." + [betty_xmas_2009] id = 9395 examine = "She seems like a nice person." @@ -50,116 +117,95 @@ examine = "She seems like a nice person." [sir_amik_varze_xmas_2009] id = 9396 -[queen_of_snow_xmas_2009_2] +[sir_amik_varze_2_xmas_2009] +id = 9397 +examine = "The leader of the White Knights looks a little merry today." + +[queen_of_snow_xmas_2009] id = 9398 +examine = "Her lack of body heat is unsettling." [santa_claus_xmas_2009] id = 9399 -[tiny_thom_xmas_2009] +[santa_claus_2_xmas_2009] +id = 9400 +examine = "A jolly distributor of presents." + +[tiny_thom_2_xmas_2009] id = 9401 -[jack_frost_xmas_2009] +[tiny_thom_3_xmas_2009] +id = 9402 +examine = "Not the tallest." + +[jack_frost_2_xmas_2009] id = 9403 examine = "The Queen of Snow's rebellious teenage son." -[cook_xmas_2009] +[cook_2_xmas_2009] id = 9404 -[louis_the_camel_xmas_2009] +[cook_3_xmas_2009] +id = 9405 +examine = "Lumbridge Castle's head cook." + +[louis_the_camel_2_xmas_2009] id = 9406 examine = "A camel who likes to complain." [general_wartface_xmas_2009] id = 9407 +[general_wartface_2_xmas_2009] +id = 9408 +examine = "An ugly, yet festive, green creature." + [general_bentnoze_xmas_2009] id = 9409 -[general_bentnoze_xmas_2009_2] -id = 9411 - -[general_wartface_xmas_2009_2] -id = 9413 - -[sir_amik_varze_xmas_2009_2] -id = 9415 - -[cook_xmas_2009_2] -id = 9417 - -[partygoer_xmas_2009_5] -id = 9419 - -[tiny_thom_xmas_2009_2] -id = 9421 - -[ebenezer_scourge_xmas_2009_3] -id = 9371 - -[snow_imp_xmas_2009_2_2] -id = 9376 - -[snow_imp_xmas_2009_2_3] -id = 9377 - -[partygoer_xmas_2009_6] -id = 9384 - -[partygoer_xmas_2009_7] -id = 9385 - -[partygoer_xmas_2009_2_2] -id = 9387 - -[partygoer_xmas_2009_2_3] -id = 9388 - -[partygoer_xmas_2009_3_2] -id = 9390 - -[partygoer_xmas_2009_3_3] -id = 9391 - -[partygoer_xmas_2009_4_2] -id = 9393 - -[partygoer_xmas_2009_4_3] -id = 9394 - -[sir_amik_varze_xmas_2009_3] -id = 9397 - -[santa_claus_xmas_2009_2] -id = 9400 - -[tiny_thom_xmas_2009_3] -id = 9402 - -[cook_xmas_2009_3] -id = 9405 - -[general_wartface_xmas_2009_3] -id = 9408 - -[general_bentnoze_xmas_2009_3] +[general_bentnoze_2_xmas_2009] id = 9410 +examine = "An ugly, yet festive, green creature." -[general_bentnoze_xmas_2009_2_2] +[general_bentnoze_3_xmas_2009] +id = 9411 + +[general_bentnoze_4_xmas_2009] id = 9412 +examine = "An ugly, yet festive, green creature." + +[general_wartface_3_xmas_2009] +id = 9413 -[general_wartface_xmas_2009_2_2] +[general_wartface_4_xmas_2009] id = 9414 +examine = "An ugly, yet festive, green creature." -[sir_amik_varze_xmas_2009_2_2] +[sir_amik_varze_3_xmas_2009] +id = 9415 + +[sir_amik_varze_4_xmas_2009] id = 9416 +examine = "The leader of the White Knights looks a little merry today." -[cook_xmas_2009_2_2] +[cook_4_xmas_2009] +id = 9417 + +[cook_5_xmas_2009] id = 9418 +examine = "Lumbridge Castle's head cook." + +[partygoer_16_xmas_2009] +id = 9419 -[partygoer_xmas_2009_5_2] +[partygoer_17_xmas_2009] id = 9420 +examine = "He's really got caught up in the Christmas spirit." -[tiny_thom_xmas_2009_2_2] -id = 9422 +[tiny_thom_4_xmas_2009] +id = 9421 +[tiny_thom_5_xmas_2009] +id = 9422 +examine = "Not the tallest." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2009/xmas_2009.objs.toml b/data/activity/event/christmas/xmas_2009/xmas_2009.objs.toml new file mode 100644 index 0000000000..7f565ad291 --- /dev/null +++ b/data/activity/event/christmas/xmas_2009/xmas_2009.objs.toml @@ -0,0 +1,279 @@ +[empty_table_xmas_2009] +id = 47733 +examine = "The table is bare." + +[table_xmas_2009] +id = 47736 +examine = "The table is covered with roast turkey and sausages." + +[table_2_xmas_2009] +id = 47737 +examine = "The table is covered with sauces and crunchy roast potatoes." + +[unicorn_sculpture_xmas_2009] +id = 47744 +examine = "A beautiful ice sculpture of a unicorn." + +[minotaur_sculpture_xmas_2009] +id = 47745 +examine = "A fierce ice sculpture of a minotaur." + +[dragon_sculpture_xmas_2009] +id = 47746 +examine = "A dazzling ice sculpture of a dragon." + +[fountain_xmas_2009] +id = 47747 +examine = "The water looks VERY cold!" + +[christmas_tree_xmas_2009] +id = 47748 +examine = "It has been beautifully decorated." + +[tree_xmas_2009] +id = 47755 +examine = "An ornamental Christmas tree." + +[present_xmas_2009] +id = 47758 +examine = "This one looks bigger than the rest." + +[presents_xmas_2009] +id = 47760 +examine = "I wonder what's inside." + +[presents_2_xmas_2009] +id = 47762 +examine = "I wonder what's inside." + +[christmas_cupboard_xmas_2009] +id = 47763 +examine = "Could this be a portal to another world or is it just a cupboard?" + +[christmas_cupboard_2_xmas_2009] +id = 47764 +examine = "Could this be a portal to another world or is it just a cupboard?" + +[christmas_cupboard_3_xmas_2009] +id = 47765 +examine = "Could this be a portal to another world or is it just a cupboard?" + +[christmas_cupboard_4_xmas_2009] +id = 47766 +examine = "Could this be a portal to another world or is it just a cupboard?" + +[cupboard_xmas_2009] +id = 47767 +examine = "This cupboard is thick with dust." + +[cupboard_2_xmas_2009] +id = 47768 +examine = "This cupboard is thick with dust." + +[barrel_xmas_2009] +id = 47773 +examine = "An old wooden barrel." + +[gates_xmas_2009] +id = 47774 +examine = "I think someone doesn't want guests." + +[gates_2_xmas_2009] +id = 47775 +examine = "Rusty old gates." + +[stairs_xmas_2009] +id = 47776 +examine = "Stairs leading up." + +[scourges_grave_xmas_2009] +id = 47785 +examine = "It's Scourge's grave! Spooky!" + +[barrel_2_xmas_2009] +id = 47787 +examine = "An old wooden barrel." + +[barrel_3_xmas_2009] +id = 47788 +examine = "An old wooden barrel." + +[general_wartface_xmas_2009] +id = 47790 +examine = "He's imprisoned in fire!" + +[general_wartface_2_xmas_2009] +id = 47791 +examine = "He's imprisoned in fire!" + +[general_bentnoze_xmas_2009] +id = 47793 +examine = "He's trapped in fire!" + +[general_bentnoze_2_xmas_2009] +id = 47794 +examine = "He's trapped in fire!" + +[sir_amik_varze_xmas_2009] +id = 47796 +examine = "Sir Amik is caught in flames!" + +[sir_amik_varze_2_xmas_2009] +id = 47797 +examine = "Sir Amik is caught in flames!" + +[cook_xmas_2009] +id = 47799 +examine = "Cook is caught in fire!" + +[cook_2_xmas_2009] +id = 47800 +examine = "Cook is caught in fire!" + +[partygoer_xmas_2009] +id = 47802 +examine = "This partygoer is trapped in fire!" + +[partygoer_2_xmas_2009] +id = 47803 +examine = "This partygoer is trapped in fire!" + +[tiny_thom_xmas_2009] +id = 47805 +examine = "Tiny Thom is trapped in fire!" + +[tiny_thom_2_xmas_2009] +id = 47806 +examine = "Tiny Thom is trapped in fire!" + +[scourges_bed_xmas_2009] +id = 47856 +examine = "Scourge's bed actually looks pretty comfy." + +[santa_xmas_2009] +id = 47857 +examine = "The cage is locked up tight." + +[cage_xmas_2009] +id = 47858 +examine = "The cage is empty now." + +[staircase_xmas_2009] +id = 47859 +examine = "These stairs go down." + +[staircase_2_xmas_2009] +id = 47862 +examine = "These stairs look spooky." + +[candlestand_xmas_2009] +id = 47872 +examine = "The flickering light casts a dim, miserly glow." + +[table_3_xmas_2009] +id = 47873 +examine = "A round table with uneven legs." + +[table_4_xmas_2009] +id = 47876 +examine = "A round table with uneven legs." + +[table_5_xmas_2009] +id = 47877 +examine = "A grand old banquet table." + +[table_6_xmas_2009] +id = 47878 +examine = "A grand old banquet table." + +[table_7_xmas_2009] +id = 47879 +examine = "A grand old banquet table." + +[table_8_xmas_2009] +id = 47881 +examine = "An old kitchen table." + +[table_9_xmas_2009] +id = 47882 +examine = "An old kitchen table." + +[stool_xmas_2009] +id = 47886 +examine = "An oak stool with one leg slightly shorter than the others." + +[wardrobe_xmas_2009] +id = 47887 +examine = "An old, decaying wardrobe." + +[cupboard_3_xmas_2009] +id = 47888 +examine = "A rickety old cupboard." + +[shelves_xmas_2009] +id = 47889 +examine = "Warped shelves." + +[shelves_2_xmas_2009] +id = 47890 +examine = "Old shelves." + +[shelves_3_xmas_2009] +id = 47891 +examine = "Old and dusty shelves." + +[shelves_4_xmas_2009] +id = 47892 +examine = "Sturdy shelves." + +[shelves_5_xmas_2009] +id = 47893 +examine = "There's a mouse living in one of those pans." + +[shelves_6_xmas_2009] +id = 47894 +examine = "Lots of dusty pots and pans are stored here." + +[shelves_7_xmas_2009] +id = 47895 +examine = "Some severe-looking cooking instruments hang here." + +[bookcase_xmas_2009] +id = 47896 +examine = "Crammed with books on every topic." + +[bookcase_2_xmas_2009] +id = 47897 +examine = "Filled with books on magic." + +[bookcase_3_xmas_2009] +id = 47898 +examine = "Crammed with books on spells and incantations." + +[bookcase_4_xmas_2009] +id = 47899 +examine = "Crammed with books on dark magic." + +[grandfather_clock_xmas_2009] +id = 47900 +examine = "Tick-tock, it's a clock." + +[larder_xmas_2009] +id = 47901 +examine = "A nicely carved larder that's seen better days." + +[crate_xmas_2009] +id = 47902 +examine = "This crate is riddled with holes." + +[crates_xmas_2009] +id = 47903 +examine = "These crates store junk from a past era." + +[barrel_4_xmas_2009] +id = 47904 +examine = "An old wooden barrel." + +[barrels_xmas_2009] +id = 47905 +examine = "Old wooden barrels." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2010/xmas_2010.npc-spawns.toml b/data/activity/event/christmas/xmas_2010/xmas_2010.npc-spawns.toml index 82cafd5d35..a144e305b6 100644 --- a/data/activity/event/christmas/xmas_2010/xmas_2010.npc-spawns.toml +++ b/data/activity/event/christmas/xmas_2010/xmas_2010.npc-spawns.toml @@ -1,15 +1,36 @@ spawns = [ - { id = "snow_angel_statue_xmas_2010", x = 2847, y = 5808, members = true }, - { id = "fishing_spot_xmas_2010", x = 2915, y = 5810, members = true }, - { id = "fishing_spot_xmas_2010_2", x = 2915, y = 5807, members = true }, - { id = "fishing_spot_xmas_2010_3", x = 2915, y = 5804, members = true }, - { id = "fishing_spot_xmas_2010_4", x = 2912, y = 5810, members = true }, - { id = "fishing_spot_xmas_2010_5", x = 2912, y = 5807, members = true }, - { id = "fishing_spot_xmas_2010_6", x = 2912, y = 5804, members = true }, - { id = "fishing_spot_xmas_2010_7", x = 2909, y = 5810, members = true }, - { id = "fishing_spot_xmas_2010_8", x = 2909, y = 5807, members = true }, - { id = "fishing_spot_xmas_2010_9", x = 2909, y = 5804, members = true }, - { id = "fishing_spot_xmas_2010_10", x = 2906, y = 5810, members = true }, - { id = "fishing_spot_xmas_2010_11", x = 2906, y = 5807, members = true }, - { id = "fishing_spot_xmas_2010_12", x = 2906, y = 5804, members = true }, + { id = "snow_angel_statue_xmas_2010", x = 2847, y = 5808 }, + { id = "fishing_spot_xmas_2010", x = 2915, y = 5810 }, + { id = "fishing_spot_xmas_2010_2", x = 2915, y = 5807 }, + { id = "fishing_spot_xmas_2010_3", x = 2915, y = 5804 }, + { id = "fishing_spot_xmas_2010_4", x = 2912, y = 5810 }, + { id = "fishing_spot_xmas_2010_5", x = 2912, y = 5807 }, + { id = "fishing_spot_xmas_2010_6", x = 2912, y = 5804 }, + { id = "fishing_spot_xmas_2010_7", x = 2909, y = 5810 }, + { id = "fishing_spot_xmas_2010_8", x = 2909, y = 5807 }, + { id = "fishing_spot_xmas_2010_9", x = 2909, y = 5804 }, + { id = "fishing_spot_xmas_2010_10", x = 2906, y = 5810 }, + { id = "fishing_spot_xmas_2010_11", x = 2906, y = 5807 }, + { id = "fishing_spot_xmas_2010_12", x = 2906, y = 5804 }, + { id = "seal_6", x = 2807, y = 5714 }, + { id = "seal_6", x = 2780, y = 5706 }, + { id = "seal_5", x = 2807, y = 5739 }, + { id = "seal_5", x = 2779, y = 5707 }, + { id = "seal_4", x = 2808, y = 5713 }, + { id = "seal_4", x = 2778, y = 5706 }, + { id = "seal_3", x = 2773, y = 5749 }, + { id = "seal_2", x = 2771, y = 5748 }, + { id = "seal_2", x = 2807, y = 5737 }, + { id = "seal", x = 2769, y = 5749 }, + { id = "seal", x = 2807, y = 5711 }, + { id = "sir_amik_varze_christmas", x = 2707, y = 5729 }, + { id = "general_wartface_christmas", x = 2726, y = 5727 }, + { id = "general_bentnoze_christmas", x = 2725, y = 5727 }, + { id = "thok_master_of_dungeoneering_christmas", x = 2716, y = 5725 }, + { id = "rewards_trader_christmas", x = 2717, y = 5727 }, + { id = "manni_the_reveller_christmas", x = 2720, y = 5742 }, + { id = "brundt_the_chieftain_christmas", x = 2736, y = 5725 }, + { id = "thorvald_the_warrior_christmas", x = 2737, y = 5727 }, + { id = "swensen_the_navigator_christmas", x = 2735, y = 5727 }, + { id = "olaf_the_bard_christmas", x = 2719, y = 5741 }, ] diff --git a/data/activity/event/christmas/xmas_2010/xmas_2010.npcs.toml b/data/activity/event/christmas/xmas_2010/xmas_2010.npcs.toml index 3feb6bd520..7cef84c12d 100644 --- a/data/activity/event/christmas/xmas_2010/xmas_2010.npcs.toml +++ b/data/activity/event/christmas/xmas_2010/xmas_2010.npcs.toml @@ -1,5 +1,6 @@ [snow_angel_statue_xmas_2010] id = 13254 +examine = "She is carved from ice." [fishing_spot_xmas_2010] id = 13261 @@ -39,10 +40,52 @@ id = 13272 [fishing_spot_xmas_2010_13] id = 13275 +examine = "Is that crab wearing Thorvar's hat?" [fishing_spot_xmas_2010_14] id = 13274 +examine = "There's a crab here." [fishing_spot_xmas_2010_15] id = 13276 +examine = "The crab is hiding." +[sir_amik_varze_christmas] +id = 13277 +examine = "The leader of the White Knights looks a little merry today." + +[general_wartface_christmas] +id = 13278 +examine = "An ugly, yet festive, green creature." + +[general_bentnoze_christmas] +id = 13279 +examine = "An ugly, yet festive, green creature." + +[thok_master_of_dungeoneering_christmas] +id = 13280 +examine = "The self-proclaimed master of festivities." + +[rewards_trader_christmas] +id = 13281 +examine = "He is trembling, covered in cuts and scrapes, and wearing a festive hat." + +[manni_the_reveller_christmas] +id = 13283 +examine = "Every innkeeper's best friend - if they serve eggnog!" + +[brundt_the_chieftain_christmas] +id = 13284 +examine = "Brundt, the red-nosed chieftain, has a very shiny nose." + +[thorvald_the_warrior_christmas] +id = 13285 +examine = "A festive Fremennik hero." + +[swensen_the_navigator_christmas] +id = 13286 +examine = "A Fremennik navigator of sleighs." + +[olaf_the_bard_christmas] +id = 13287 +examine = "A Fremennik carol singer." \ No newline at end of file diff --git a/data/activity/event/christmas/xmas_2010/xmas_2010.objs.toml b/data/activity/event/christmas/xmas_2010/xmas_2010.objs.toml new file mode 100644 index 0000000000..f98e043cb1 --- /dev/null +++ b/data/activity/event/christmas/xmas_2010/xmas_2010.objs.toml @@ -0,0 +1,91 @@ +[christmas-cupboard_xmas_2010] +id = 12258 +examine = "A portal to another world, or just a cupboard?" + +[snowman_accessories_xmas_2010] +id = 15651 +examine = "It almost looks like a snowman melted here." + +[trinket_of_sealification_xmas_2010] +id = 29000 +examine = "Arf arf!" + +[snowmaker_xmas_2010] +id = 29014 +examine = "This will definitely fit in Thorvar's bag." + +[ice_skates_xmas_2010] +id = 29039 +examine = "These look far too small for Thorvar." + +[pile_of_snow_xmas_2010] +id = 29047 +examine = "This looks cold." + +[icicle_xmas_2010] +id = 29049 +examine = "It mite be a stalagmite." + +[switch_xmas_2010] +id = 29051 +examine = "It's a switch." + +[icy_ground_xmas_2010] +id = 56893 +examine = "This looks slippery." + +[sign_xmas_2010] +id = 56896 +examine = "'No Humans'." + +[portal_xmas_2010] +id = 56898 +examine = "This looks like a sensible thing to step into." + +[door_xmas_2010] +id = 56900 +examine = "The door is now clear of ice." + +[door_2_xmas_2010] +id = 56901 +examine = "It's blocked by a single icicle." + +[door_3_xmas_2010] +id = 56902 +examine = "It's blocked by two icicles." + +[door_4_xmas_2010] +id = 56903 +examine = "It's blocked by three icicles." + +[portal_2_xmas_2010] +id = 56904 +examine = "This looks like a sensible thing to step into." + +[icicle_2_xmas_2010] +id = 56905 +examine = "A tiny icicle. Ticicle." + +[icicle_3_xmas_2010] +id = 56906 +examine = "A tiny icicle. Ticicle." + +[christmas_tree_xmas_2010] +id = 56933 +examine = "O Christmas tree, O Christmas tree..." + +[snowmaker_2_xmas_2010] +id = 56934 +examine = "You never know when you might need snow." + +[gates_xmas_2010] +id = 56935 +examine = "They lead to the seal sliding event." + +[gates_2_xmas_2010] +id = 56936 +examine = "They lead back to the main competition grounds." + +[portal_3_xmas_2010] +id = 56960 +examine = "A portal from this mystical place." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween.teles.toml b/data/activity/event/halloween/halloween.teles.toml index 17cfec01b2..ff83f2cef3 100644 --- a/data/activity/event/halloween/halloween.teles.toml +++ b/data/activity/event/halloween/halloween.teles.toml @@ -1,6 +1,6 @@ # 6475 halloween # 6731 halloween -[10699] +[trapdoor_steps_xmas_2005] option = "Climb-up" tile = { x = 1693, y = 4510, level = 1 } to = { x = 3091, y = 3275 } @@ -72,3 +72,27 @@ option = "Climb-up" tile = { x = 4319, y = 5474 } delta = { x = -5, level = 1 } +[27243] +option = "Climb-down" +tile = { x = 1636, y = 4835 } +to = { x = 1703, y = 4826 } + +[ladder_2_xmas_2005] +option = "Climb-down" +tile = { x = 1698, y = 4515, level = 1 } +delta = { x = -2, level = -1 } + +[ladder_xmas_2005] +option = "Climb-up" +tile = { x = 1698, y = 4515 } +delta = { x = 2, level = 1 } + +[ladder_2_xmas_2005] +option = "Climb-down" +tile = { x = 1695, y = 4515, level = 1 } +delta = { x = 2, level = -1 } + +[ladder_xmas_2005] +option = "Climb-up" +tile = { x = 1695, y = 4515 } +delta = { x = -2, level = 1 } \ No newline at end of file diff --git a/data/area/karamja/musa_point/musa_point.npc-spawns.toml b/data/area/karamja/musa_point/musa_point.npc-spawns.toml index 9c9c761089..e7d56a2e66 100644 --- a/data/area/karamja/musa_point/musa_point.npc-spawns.toml +++ b/data/area/karamja/musa_point/musa_point.npc-spawns.toml @@ -19,8 +19,8 @@ spawns = [ { id = "luthas_musa_point", x = 2939, y = 3154 }, { id = "swarm_musa_point", x = 2883, y = 3155 }, { id = "swarm_musa_point", x = 2883, y = 3160 }, - { id = "jack_musa_point", x = 2904, y = 3178, members = true }, - { id = "jill_musa_point", x = 2907, y = 3174, members = true }, - { id = "jeff_musa_point", x = 2906, y = 3172, members = true }, + { id = "gub_musa_multi_child_1", x = 2904, y = 3178, members = true }, + { id = "gub_musa_multi_child_2", x = 2907, y = 3174, members = true }, + { id = "gub_musa_multi_child_3", x = 2906, y = 3172, members = true }, { id = "jessika_mudskipper_point", x = 2944, y = 3147, members = true }, ] \ No newline at end of file diff --git a/data/entity/obj/crates.objs.toml b/data/entity/obj/crates.objs.toml index a585d81191..10703fed11 100644 --- a/data/entity/obj/crates.objs.toml +++ b/data/entity/obj/crates.objs.toml @@ -329,22 +329,6 @@ examine = "Only sawdust..." id = 10672 examine = "Reclaim your lost puppets!" -[crate_84] -id = 10701 -examine = "A blue crate. Probably containing puppets." - -[crate_85] -id = 10702 -examine = "A green crate. Probably containing puppets." - -[crate_86] -id = 10703 -examine = "A red crate. Probably containing puppets." - -[crate_87] -id = 10704 -examine = "A large crate. More puppets?" - [crate_88] id = 11228 examine = "Useful for transportation of valuable items." diff --git a/data/quest/free/myths_of_the_white_lands/myths_of_the_white_lands.objs.toml b/data/quest/free/myths_of_the_white_lands/myths_of_the_white_lands.objs.toml new file mode 100644 index 0000000000..7ca7eaf9f8 --- /dev/null +++ b/data/quest/free/myths_of_the_white_lands/myths_of_the_white_lands.objs.toml @@ -0,0 +1,7 @@ +[iced_plant_myths_of_the_white_lands] +id = 41709 +examine = "Permafrost has set in." + +[iced_plant_2_myths_of_the_white_lands] +id = 41710 +examine = "Permafrost has set in." \ No newline at end of file From 8b2fa4d0355a1fa10e94bc958307fafef432efbb Mon Sep 17 00:00:00 2001 From: jarryd229 <15334102+jarryd229@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:47:16 +1100 Subject: [PATCH 2/5] Update xmas_2005.objs.toml --- .../christmas/xmas_2005/xmas_2005.objs.toml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml b/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml index 7b1d380967..9227850545 100644 --- a/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml +++ b/data/activity/event/christmas/xmas_2005/xmas_2005.objs.toml @@ -126,27 +126,6 @@ examine = "A large box full of wood chippings." id = 10710 examine = "Pots full of paint." - - - - - - - - - - - - - - - - - - - - - [trapdoor_steps_xmas_2005] id = 10699 examine = "You can climb up these." From 42ea56025fa4a2fd4805d17b99a9a1aae6c89dc2 Mon Sep 17 00:00:00 2001 From: jarryd229 <15334102+jarryd229@users.noreply.github.com> Date: Thu, 22 Jan 2026 19:14:47 +1100 Subject: [PATCH 3/5] halloween obj examine --- .../deaths_office.npc-spawns.toml | 3 + .../deaths_office/deaths_office.npcs.toml | 6 + .../deaths_office/deaths_office.objs.toml | 39 + .../event/halloween/halloween.npc-spawns.toml | 59 -- .../event/halloween/halloween.npcs.toml | 188 ----- .../event/halloween/halloween.teles.toml | 9 +- .../halloween_2006/halloween_2006.objs.toml | 111 +++ .../halloween_2007.npc-spawns.toml | 4 + .../halloween_2007/halloween_2007.npcs.toml | 7 + .../halloween_2007/halloween_2007.objs.toml | 142 ++++ .../halloween_2009.anims.toml} | 0 .../halloween_2009.gfx.toml} | 0 .../halloween_2009.npc-spawns.toml | 22 + .../halloween_2009/halloween_2009.npcs.toml | 59 ++ .../halloween_2009/halloween_2009.objs.toml | 703 ++++++++++++++++++ .../halloween_2010.npc-spawns.toml | 37 + .../halloween_2010/halloween_2010.npcs.toml | 135 ++++ .../halloween_2010/halloween_2010.objs.toml | 123 +++ .../harvest_hollow/harvest_hollow.npcs.toml | 3 - .../harvest_hollow.npc-spawns.toml | 48 -- .../area/misthalin/varrock/varrock.teles.toml | 5 - 21 files changed, 1398 insertions(+), 305 deletions(-) create mode 100644 data/activity/event/halloween/deaths_office/deaths_office.npc-spawns.toml create mode 100644 data/activity/event/halloween/deaths_office/deaths_office.npcs.toml create mode 100644 data/activity/event/halloween/deaths_office/deaths_office.objs.toml delete mode 100644 data/activity/event/halloween/halloween.npc-spawns.toml delete mode 100644 data/activity/event/halloween/halloween.npcs.toml create mode 100644 data/activity/event/halloween/halloween_2006/halloween_2006.objs.toml create mode 100644 data/activity/event/halloween/halloween_2007/halloween_2007.npc-spawns.toml create mode 100644 data/activity/event/halloween/halloween_2007/halloween_2007.npcs.toml create mode 100644 data/activity/event/halloween/halloween_2007/halloween_2007.objs.toml rename data/activity/event/halloween/{halloween.anims.toml => halloween_2009/halloween_2009.anims.toml} (100%) rename data/activity/event/halloween/{halloween.gfx.toml => halloween_2009/halloween_2009.gfx.toml} (100%) create mode 100644 data/activity/event/halloween/halloween_2009/halloween_2009.npc-spawns.toml create mode 100644 data/activity/event/halloween/halloween_2009/halloween_2009.npcs.toml create mode 100644 data/activity/event/halloween/halloween_2009/halloween_2009.objs.toml create mode 100644 data/activity/event/halloween/halloween_2010/halloween_2010.npc-spawns.toml create mode 100644 data/activity/event/halloween/halloween_2010/halloween_2010.npcs.toml create mode 100644 data/activity/event/halloween/halloween_2010/halloween_2010.objs.toml delete mode 100644 data/activity/event/halloween/harvest_hollow/harvest_hollow.npcs.toml rename data/activity/{event/halloween/harvest_hollow => }/harvest_hollow.npc-spawns.toml (75%) diff --git a/data/activity/event/halloween/deaths_office/deaths_office.npc-spawns.toml b/data/activity/event/halloween/deaths_office/deaths_office.npc-spawns.toml new file mode 100644 index 0000000000..09388def89 --- /dev/null +++ b/data/activity/event/halloween/deaths_office/deaths_office.npc-spawns.toml @@ -0,0 +1,3 @@ +spawns = [ + { id = "muncher_deaths_office", x = 1976, y = 5307, direction = "NORTH_WEST" }, +] diff --git a/data/activity/event/halloween/deaths_office/deaths_office.npcs.toml b/data/activity/event/halloween/deaths_office/deaths_office.npcs.toml new file mode 100644 index 0000000000..2e71c20bdd --- /dev/null +++ b/data/activity/event/halloween/deaths_office/deaths_office.npcs.toml @@ -0,0 +1,6 @@ +[muncher_deaths_office] +id = 8868 +examine = "Only the Grim Reaper would have a pet like this." + +[grim_reaper_deaths_office] +id = 8870 \ No newline at end of file diff --git a/data/activity/event/halloween/deaths_office/deaths_office.objs.toml b/data/activity/event/halloween/deaths_office/deaths_office.objs.toml new file mode 100644 index 0000000000..bde24e24f7 --- /dev/null +++ b/data/activity/event/halloween/deaths_office/deaths_office.objs.toml @@ -0,0 +1,39 @@ +[grim_reaper_deaths_office] +id = 45802 +examine = "I wish I could tell where he was looking." + +[exit_portal_deaths_office] +id = 45803 +examine = "A portal for those who wish to leave." + +[noticeboard_deaths_office] +id = 45814 +examine = "Nothing interesting is written here." + +[books_deaths_office] +id = 45820 +examine = "They've been discarded." + +[books_2_deaths_office] +id = 45821 +examine = "They've been discarded." + +[scrolls_deaths_office] +id = 45822 +examine = "These scrolls have been strewn all over the place." + +[books_3_deaths_office] +id = 45823 +examine = "These books are stacked very neatly." + +[books_4_deaths_office] +id = 45824 +examine = "These books have been strewn all over the place." + +[drawers_deaths_office] +id = 45825 +examine = "Someone probably thinks all this stuff is important." + +[drawers_2_deaths_office] +id = 45826 +examine = "There are books on top." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween.npc-spawns.toml b/data/activity/event/halloween/halloween.npc-spawns.toml deleted file mode 100644 index dec8373f85..0000000000 --- a/data/activity/event/halloween/halloween.npc-spawns.toml +++ /dev/null @@ -1,59 +0,0 @@ -spawns = [ - { id = "zabeth_corvid_halloween", x = 4331, y = 5462 }, - { id = "zabeth_corvid_halloween_2", x = 4320, y = 5341 }, - { id = "pumpkin_pete_halloween", x = 4318, y = 5455 }, - { id = "pumpkin_pete_halloween_2", x = 4318, y = 5327, members = true }, - { id = "grim_reaper_halloween", x = 4331, y = 5342, level = 1 }, - { id = "grim_reaper_halloween", x = 4331, y = 5470, level = 1 }, - { id = "edgar_halloween", x = 4320, y = 5328, level = 1 }, - { id = "edgar_halloween", x = 4320, y = 5456, level = 1 }, - { id = "allan_halloween", x = 4315, y = 5342 }, - { id = "allan_halloween", x = 4315, y = 5470 }, - { id = "greta_halloween", x = 4320, y = 5470, members = true }, - { id = "greta_halloween_2", x = 4320, y = 5342 }, - { id = "helga_halloween", x = 4319, y = 5470, members = true }, - { id = "helga_halloween_2", x = 4319, y = 5342 }, - { id = "moira_halloween", x = 4321, y = 5470, members = true }, - { id = "moira_halloween_2", x = 4321, y = 5342 }, - { id = "minstrel_web_halloween", x = 4316, y = 5341 }, - { id = "minstrel_web_halloween", x = 4316, y = 5469 }, - { id = "dancer_halloween", x = 4318, y = 5339 }, - { id = "dancer_halloween_2", x = 4321, y = 5339 }, - { id = "dancer_halloween_3", x = 4318, y = 5333 }, - { id = "dancer_halloween_4", x = 4317, y = 5336 }, - { id = "dancer_halloween_5", x = 4322, y = 5336 }, - { id = "party_pete_halloween", x = 4319, y = 5336 }, - { id = "purple_spider_halloween", x = 4322, y = 5464, members = true }, - { id = "blue_spider_halloween", x = 4318, y = 5466, members = true }, - { id = "red_spider_halloween", x = 4320, y = 5462, members = true }, - { id = "green_spider_halloween", x = 4318, y = 5461, members = true }, - { id = "orange_spider_halloween", x = 4317, y = 5464, members = true }, - { id = "turquoise_spider_halloween", x = 4320, y = 5467, members = true }, - { id = "pink_spider_halloween", x = 4321, y = 5461, members = true }, - { id = "beige_spider_halloween", x = 4319, y = 5464, members = true }, - { id = "orange_spider_halloween_2", x = 4333, y = 5466, members = true }, - { id = "muncher_halloween", x = 1702, y = 4821 }, - { id = "grim_reaper_halloween_2", x = 1707, y = 4814 }, - { id = "knight_of_the_eight_fold_seal_halloween", x = 3740, y = 5280 }, - { id = "grand_chamberlain_of_the_web_halloween", x = 3747, y = 5281 }, - { id = "marshall_of_the_teeming_horde_halloween", x = 3742, y = 5279 }, - { id = "master_web_spinner_halloween", x = 3746, y = 5284 }, - { id = "spider_courtier_halloween", x = 3739, y = 5280 }, - { id = "spider_courtier_halloween", x = 3740, y = 5282 }, - { id = "spider_courtier_halloween", x = 3742, y = 5277 }, - { id = "spider_courtier_halloween", x = 3743, y = 5285 }, - { id = "spider_courtier_halloween", x = 3744, y = 5283 }, - { id = "spider_courtier_halloween", x = 3747, y = 5277 }, - { id = "spider_courtier_halloween", x = 3747, y = 5285 }, - { id = "spider_courtier_halloween", x = 3748, y = 5279 }, - { id = "spider_courtier_halloween", x = 3750, y = 5282 }, - { id = "royal_fly_catcher_halloween", x = 3746, y = 5278 }, - { id = "keeper_of_the_royal_eggs_halloween", x = 3742, y = 5284 }, - { id = "spider_queen", x = 3807, y = 5281 }, - { id = "spider_herald_halloween", x = 3743, y = 5280 }, - { id = "grim_reaper_halloween_3", x = 3807, y = 5150 }, - { id = "spider_halloween", x = 3811, y = 5156, level = 1, members = true }, - { id = "muncher_halloween_2", x = 3818, y = 5140, members = true }, - { id = "muncher_halloween_2", x = 4330, y = 5332, members = true }, - { id = "muncher_halloween_2", x = 4330, y = 5460, members = true }, -] diff --git a/data/activity/event/halloween/halloween.npcs.toml b/data/activity/event/halloween/halloween.npcs.toml deleted file mode 100644 index 29dac234db..0000000000 --- a/data/activity/event/halloween/halloween.npcs.toml +++ /dev/null @@ -1,188 +0,0 @@ -[zabeth_corvid_halloween] -id = 12375 -examine = "He is in high spirits." - -[zabeth_corvid_halloween_2] -id = 12376 -examine = "He is in high spirits." - -[pumpkin_pete_halloween] -id = 12377 -examine = "He seems to enjoy Hallowe'en a little too much." - -[pumpkin_pete_halloween_2] -id = 12378 - -[grim_reaper_halloween] -id = 12379 -examine = "What could be beneath that hood?" - -[edgar_halloween] -id = 12380 -examine = "He'll Poe-n you." - -[allan_halloween] -id = 12381 -examine = "He'll Poe-n you." - -[greta_halloween] -id = 12383 - -[greta_halloween_2] -id = 12385 -examine = "A lycanthropic backing singer." - -[helga_halloween] -id = 12387 - -[helga_halloween_2] -id = 12389 -examine = "A lycanthropic backing singer." - -[moira_halloween] -id = 12391 - -[moira_halloween_2] -id = 12393 -examine = "A lycanthropic backing singer." - -[minstrel_web_halloween] -id = 12394 -examine = "She looks familiar." - -[dancer_halloween] -id = 12396 -examine = "He seems to be enjoying the party." - -[dancer_halloween_2] -id = 12397 -examine = "He seems to be enjoying the party." - -[dancer_halloween_3] -id = 12398 -examine = "She seems to be enjoying the party." - -[dancer_halloween_4] -id = 12399 -examine = "He seems to be enjoying the party." - -[dancer_halloween_5] -id = 12400 -examine = "She seems to be enjoying the party." - -[party_pete_halloween] -id = 12401 -examine = "He likes to paaaarty!" - -[purple_spider_halloween] -id = 12410 - -[blue_spider_halloween] -id = 12411 - -[red_spider_halloween] -id = 12412 - -[green_spider_halloween] -id = 12413 - -[orange_spider_halloween] -id = 12414 - -[turquoise_spider_halloween] -id = 12415 - -[pink_spider_halloween] -id = 12416 - -[beige_spider_halloween] -id = 12417 - -[orange_spider_halloween_2] -id = 12419 - -[muncher_halloween] -id = 2329 -examine = "Only the Grim Reaper would have a pet like this." - -[grim_reaper_halloween_2] -id = 6390 -examine = "I wish I could tell where he was looking." - -[knight_of_the_eight_fold_seal_halloween] -id = 6507 -examine = "A very noble spider and attendant to the Queen." - -[grand_chamberlain_of_the_web_halloween] -id = 6508 -examine = "The highest ranking of the Spider Queen's servants." - -[marshall_of_the_teeming_horde_halloween] -id = 6509 -examine = "The head of the Spider Queen's army." - -[master_web_spinner_halloween] -id = 6536 -examine = "Chief architect of the Spider Realm." - -[spider_courtier_halloween] -id = 8972 -examine = "A member of the Spider Queen's court." - -[royal_fly_catcher_halloween] -id = 8973 -examine = "The head of the Queen's dining chamber." - -[keeper_of_the_royal_eggs_halloween] -id = 8974 -examine = "A personal servant of the Spider Queen." - -[spider_herald_halloween] -id = 8976 -examine = "A large, flamboyant subject of the Spider Queen." - -[grim_reaper_halloween_3] -id = 8977 -examine = "What could be beneath that hood?" - -[muncher_halloween_2] -id = 8983 - -[spider_queen] -id = 8975 -examine = "Would scare anyone off their tuffet." - -[spider_halloween] -id = 8978 - -[spider_halloween_2] -id = 8979 -examine = "This spider is not budging from the bathtub." - -[spider_halloween_3] -id = 8982 - -[purple_spider_halloween_2] -id = 12423 - -[blue_spider_halloween_2] -id = 12424 - -[red_spider_halloween_2] -id = 12425 - -[green_spider_halloween_2] -id = 12426 - -[orange_spider_halloween_3] -id = 12427 - -[turquoise_spider_halloween_2] -id = 12428 - -[pink_spider_halloween_2] -id = 12429 - -[beige_spider_halloween_2] -id = 12430 - diff --git a/data/activity/event/halloween/halloween.teles.toml b/data/activity/event/halloween/halloween.teles.toml index ff83f2cef3..3b903e86ed 100644 --- a/data/activity/event/halloween/halloween.teles.toml +++ b/data/activity/event/halloween/halloween.teles.toml @@ -40,7 +40,7 @@ tile = { x = 3865, y = 5524 } to = { x = 3972, y = 5565 } # 15699 halloween -[46731] +[web_ladder_halloween_2009] option = "Climb" tile = { x = 3936, y = 5151, level = 2 } delta = { y = 165 } @@ -72,7 +72,12 @@ option = "Climb-up" tile = { x = 4319, y = 5474 } delta = { x = -5, level = 1 } -[27243] +[staircase_halloween_2007] +option = "Climb-up" +tile = { x = 1700, y = 4824 } +to = { x = 1639, y = 4835 } + +[staircase_2_halloween_2007] option = "Climb-down" tile = { x = 1636, y = 4835 } to = { x = 1703, y = 4826 } diff --git a/data/activity/event/halloween/halloween_2006/halloween_2006.objs.toml b/data/activity/event/halloween/halloween_2006/halloween_2006.objs.toml new file mode 100644 index 0000000000..f8f487cf54 --- /dev/null +++ b/data/activity/event/halloween/halloween_2006/halloween_2006.objs.toml @@ -0,0 +1,111 @@ +[large_root_halloween_2006] +id = 19032 +examine = "A large root from that evil tree." + +[paint_cans_halloween_2006] +id = 19064 +examine = "Equipment for colouring items." + +[large_box_halloween_2006] +id = 19065 +examine = "A large box full of wood chippings." + +[puppet_arms_halloween_2006] +id = 19066 +examine = "Box containing blue puppet arms." + +[puppet_arms_2_halloween_2006] +id = 19067 +examine = "Box containing red puppet arms." + +[puppet_heads_halloween_2006] +id = 19068 +examine = "Box containing green puppet heads." + +[puppet_heads_2_halloween_2006] +id = 19069 +examine = "Box containing blue puppet heads." + +[crates_halloween_2006] +id = 19071 +examine = "Some large wooden crates." + +[decorations_box_halloween_2006] +id = 19085 +examine = "A box containing unpainted decorations." + +[decorations_box_2_halloween_2006] +id = 19086 +examine = "A box containing unpainted decorations." + +[decorations_box_3_halloween_2006] +id = 19095 +examine = "A box containing unpainted decorations." + +[decorations_box_4_halloween_2006] +id = 19096 +examine = "A box containing unpainted decorations." + +[decorations_box_5_halloween_2006] +id = 19097 +examine = "A box containing unpainted decorations." + +[decorations_box_6_halloween_2006] +id = 19098 +examine = "A box containing unpainted decorations." + +[paint_cans_2_halloween_2006] +id = 19099 +examine = "Equipment for colouring items." + +[paint_cans_3_halloween_2006] +id = 19100 +examine = "Equipment for colouring items." + +[paint_cans_4_halloween_2006] +id = 19101 +examine = "Equipment for colouring items." + +[puppet_torsos_halloween_2006] +id = 19102 +examine = "Box containing blue puppet torsos." + +[puppet_legs_halloween_2006] +id = 19103 +examine = "Box containing blue puppet legs." + +[puppet_heads_3_halloween_2006] +id = 19104 +examine = "Box containing red puppet heads." + +[puppet_torsos_2_halloween_2006] +id = 19105 +examine = "Box containing red puppet torsos." + +[puppet_torsos_3_halloween_2006] +id = 19107 +examine = "Box containing green puppet torsos." + +[puppet_arms_3_halloween_2006] +id = 19108 +examine = "Box containing green puppet arms." + +[puppet_legs_2_halloween_2006] +id = 19109 +examine = "Box containing green puppet legs." + +[roots_halloween_2006] +id = 19110 +examine = "A bunch of tangled roots; maybe I can climb out with these." + +[roots_2_halloween_2006] +id = 19112 +examine = "A bunch of tangled roots; maybe I can climb out with these." + +[hanging_roots_halloween_2006] +id = 37321 +examine = "The roots of that evil tree." + +[hanging_roots_2_halloween_2006] +id = 37322 +examine = "The roots of that evil tree." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween_2007/halloween_2007.npc-spawns.toml b/data/activity/event/halloween/halloween_2007/halloween_2007.npc-spawns.toml new file mode 100644 index 0000000000..bca4aa0f59 --- /dev/null +++ b/data/activity/event/halloween/halloween_2007/halloween_2007.npc-spawns.toml @@ -0,0 +1,4 @@ +spawns = [ + { id = "grim_reaper_halloween_2007", x = 1707, y = 4814}, + { id = "muncher_halloween_2007", x = 1702, y = 4821 }, +] diff --git a/data/activity/event/halloween/halloween_2007/halloween_2007.npcs.toml b/data/activity/event/halloween/halloween_2007/halloween_2007.npcs.toml new file mode 100644 index 0000000000..b0eeb4c16d --- /dev/null +++ b/data/activity/event/halloween/halloween_2007/halloween_2007.npcs.toml @@ -0,0 +1,7 @@ +[muncher_halloween_2007] +id = 2329 +examine = "Only the Grim Reaper would have a pet like this." + +[grim_reaper_halloween_2007] +id = 6390 +examine = "I wish I could tell where he was looking." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween_2007/halloween_2007.objs.toml b/data/activity/event/halloween/halloween_2007/halloween_2007.objs.toml new file mode 100644 index 0000000000..cf855942e5 --- /dev/null +++ b/data/activity/event/halloween/halloween_2007/halloween_2007.objs.toml @@ -0,0 +1,142 @@ +[ramp_halloween_2007] +id = 27211 +examine = "A ramp leading into some strange goo." + +[ramp_2_halloween_2007] +id = 27212 +examine = "The way into the...gooey...stuff." + +[slide_halloween_2007] +id = 27218 +examine = "Oh so much fun. Wheeeeeee!" + +[pitfall_halloween_2007] +id = 27240 +examine = "I'm guessing stepping on that would be a bad idea." + +[torch_halloween_2007] +id = 27241 +examine = "They seem to extinguish when people walk near." + +[staircase_halloween_2007] +id = 27242 +examine = "Going up?" + +[staircase_2_halloween_2007] +id = 27243 +examine = "Going down?" + +[table_halloween_2007] +id = 27245 +examine = "I wonder if Grim ever uses this to dine on?" + +[cabinets_halloween_2007] +id = 27246 +examine = "The perfect place to store...stuff." + +[cabinets_2_halloween_2007] +id = 27247 +examine = "The perfect place to store...stuff." + +[bookcases_halloween_2007] +id = 27248 +examine = "Strange contraptions that houses paper things." + +[bookcases_2_halloween_2007] +id = 27249 +examine = "Strange contraptions that houses paper things." + +[bookcases_3_halloween_2007] +id = 27250 +examine = "Strange contraptions that houses paper things." + +[fireplace_halloween_2007] +id = 27251 +examine = "What's the deal with all the blue fire in this house?" + +[sofa_halloween_2007] +id = 27252 +examine = "Looks surprisingly comfy." + +[fishtank_halloween_2007] +id = 27253 +examine = "Here, fishy, fishy, fishy!" + +[dark_portal_halloween_2007] +id = 27254 +examine = "Do I really want to go through there?" + +[grim_chest_halloween_2007] +id = 27255 +examine = "I wonder what the Reaper would hide away." + +[grim_chest_2_halloween_2007] +id = 27256 +examine = "I wonder what the Reaper would hide away." + +[skull_halloween_2007] +id = 27257 +examine = "This must be the Grim Reaper's previous servant's skull." + +[skeleton_portrait_halloween_2007] +id = 27258 +examine = "Maybe that's his mum?" + +[zombie_portrait_halloween_2007] +id = 27259 +examine = "One of death's buddies, perhaps? Or maybe his Mrs Reaper? Oh dear." + +[shelves_halloween_2007] +id = 27260 +examine = "Keeps things off the floor. Surprise, surprise." + +[shelves_2_halloween_2007] +id = 27261 +examine = "Keeps things off the floor. Surprise, surprise." + +[sullen_tree_halloween_2007] +id = 27262 +examine = "In dire need of a tree surgeon." + +[bleak_tree_halloween_2007] +id = 27263 +examine = "Seems choked by all those webs." + +[foul_tree_halloween_2007] +id = 27264 +examine = "An undead tree? Surely not." + +[wretched_tree_halloween_2007] +id = 27265 +examine = "I wouldn't expect anything less from Grim's garden." + +[spider_web_halloween_2007] +id = 27266 +examine = "Now, it's no common house spider that spun that." + +[gargoyle_halloween_2007] +id = 27274 +examine = "Looks like a cheeky chappy." + +[gargoyle_2_halloween_2007] +id = 27275 +examine = "Did he just move?" + +[doorway_halloween_2007] +id = 27276 +examine = "I hope I can pass through alive." + +[gargoyle_attack_halloween_2007] +id = 27277 + +[springboard_halloween_2007] +id = 27278 +examine = "Looks like the only way across that strange abyss." + +[worm_halloween_2007] +id = 27280 +examine = "It must have been wriggling around in the skull." + +[doorway_2_halloween_2007] +id = 27282 +examine = "A doorway flanked by stone gargoyles." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween.anims.toml b/data/activity/event/halloween/halloween_2009/halloween_2009.anims.toml similarity index 100% rename from data/activity/event/halloween/halloween.anims.toml rename to data/activity/event/halloween/halloween_2009/halloween_2009.anims.toml diff --git a/data/activity/event/halloween/halloween.gfx.toml b/data/activity/event/halloween/halloween_2009/halloween_2009.gfx.toml similarity index 100% rename from data/activity/event/halloween/halloween.gfx.toml rename to data/activity/event/halloween/halloween_2009/halloween_2009.gfx.toml diff --git a/data/activity/event/halloween/halloween_2009/halloween_2009.npc-spawns.toml b/data/activity/event/halloween/halloween_2009/halloween_2009.npc-spawns.toml new file mode 100644 index 0000000000..9e68fc797c --- /dev/null +++ b/data/activity/event/halloween/halloween_2009/halloween_2009.npc-spawns.toml @@ -0,0 +1,22 @@ +spawns = [ + { id = "knight_of_the_eight_fold_seal_halloween_2009", x = 3740, y = 5280 }, + { id = "grand_chamberlain_of_the_web_halloween_2009", x = 3747, y = 5281 }, + { id = "marshall_of_the_teeming_horde_halloween_2009", x = 3742, y = 5279 }, + { id = "master_web_spinner_halloween_2009", x = 3746, y = 5284 }, + { id = "spider_courtier_halloween_2009", x = 3739, y = 5280 }, + { id = "spider_courtier_halloween_2009", x = 3740, y = 5282 }, + { id = "spider_courtier_halloween_2009", x = 3742, y = 5277 }, + { id = "spider_courtier_halloween_2009", x = 3743, y = 5285 }, + { id = "spider_courtier_halloween_2009", x = 3744, y = 5283 }, + { id = "spider_courtier_halloween_2009", x = 3747, y = 5277 }, + { id = "spider_courtier_halloween_2009", x = 3747, y = 5285 }, + { id = "spider_courtier_halloween_2009", x = 3748, y = 5279 }, + { id = "spider_courtier_halloween_2009", x = 3750, y = 5282 }, + { id = "royal_fly_catcher_halloween_2009", x = 3746, y = 5278 }, + { id = "keeper_of_the_royal_eggs_halloween_2009", x = 3742, y = 5284 }, + { id = "spider_queen_halloween_2009", x = 3807, y = 5281 }, + { id = "spider_herald_halloween_2009", x = 3743, y = 5280 }, + { id = "grim_reaper_halloween_2009", x = 3807, y = 5150, direction = "SOUTH" }, + { id = "spider_halloween_2009", x = 3811, y = 5156, level = 1 }, + { id = "muncher_halloween_2009", x = 3818, y = 5140 }, +] diff --git a/data/activity/event/halloween/halloween_2009/halloween_2009.npcs.toml b/data/activity/event/halloween/halloween_2009/halloween_2009.npcs.toml new file mode 100644 index 0000000000..fe7ab6c467 --- /dev/null +++ b/data/activity/event/halloween/halloween_2009/halloween_2009.npcs.toml @@ -0,0 +1,59 @@ +[eek_the_spider_halloween_2009] +id = 6506 + +[knight_of_the_eight_fold_seal_halloween_2009] +id = 6507 +examine = "A very noble spider and attendant to the Queen." + +[grand_chamberlain_of_the_web_halloween_2009] +id = 6508 +examine = "The highest ranking of the Spider Queen's servants." + +[marshall_of_the_teeming_horde_halloween_2009] +id = 6509 +examine = "The head of the Spider Queen's army." + +[master_web_spinner_halloween_2009] +id = 6536 +examine = "Chief architect of the Spider Realm." + +[spider_courtier_halloween_2009] +id = 8972 +examine = "A member of the Spider Queen's court." + +[royal_fly_catcher_halloween_2009] +id = 8973 +examine = "The head of the Queen's dining chamber." + +[keeper_of_the_royal_eggs_halloween_2009] +id = 8974 +examine = "A personal servant of the Spider Queen." + +[spider_queen_halloween_2009] +id = 8975 +examine = "Would scare anyone off their tuffet." + +[spider_herald_halloween_2009] +id = 8976 +examine = "A large, flamboyant subject of the Spider Queen." + +[grim_reaper_halloween_2009] +id = 8977 +examine = "What could be beneath that hood?" + +[spider_halloween_2009] +id = 8978 + +[spider_2_halloween_2009] +id = 8979 +examine = "This spider is not budging from the bathtub." + +[bathtub_halloween_2009] +id = 8982 + +[muncher_halloween_2009] +id = 8983 + +[eek_the_spider_2_halloween_2009] +id = 8985 +examine = "Eek, a spider!" \ No newline at end of file diff --git a/data/activity/event/halloween/halloween_2009/halloween_2009.objs.toml b/data/activity/event/halloween/halloween_2009/halloween_2009.objs.toml new file mode 100644 index 0000000000..88feb78630 --- /dev/null +++ b/data/activity/event/halloween/halloween_2009/halloween_2009.objs.toml @@ -0,0 +1,703 @@ +[large_door_halloween_2009] +id = 3129 +examine = "A large double door." + +[large_door_2_halloween_2009] +id = 3131 +examine = "A large double door." + +[staircase_halloween_2009] +id = 27866 +examine = "Dare I go up?" + +[stairs_halloween_2009] +id = 27869 +examine = "Dare I go up?" + +[staircase_2_halloween_2009] +id = 27870 +examine = "These stairs look spooky!" + +[table_halloween_2009] +id = 27885 +examine = "Death himself uses this table to put things on." + +[bed_halloween_2009] +id = 27889 +examine = "A bed for sleeping the sleep of death." + +[table_2_halloween_2009] +id = 27892 +examine = "Death himself uses this table to put things on." + +[table_3_halloween_2009] +id = 27893 +examine = "Death himself uses this table to put things on." + +[table_4_halloween_2009] +id = 27894 +examine = "Death himself uses this table to put things on." + +[death_clock_halloween_2009] +id = 27896 +examine = "Every swing of the pendulum brings you closer to the moment of your death." + +[bookcase_halloween_2009] +id = 28095 +examine = "Volume after volume of obituaries." + +[bookcase_2_halloween_2009] +id = 46548 +examine = "Autobiographies - posthumous autobiographies." + +[cabinet_halloween_2009] +id = 46549 +examine = "A locked cabinet." + +[cabinet_2_halloween_2009] +id = 46550 +examine = "A locked cabinet." + +[candlestand_halloween_2009] +id = 46551 +examine = "The flickering light casts shadows that seem darker than black." + +[towels_halloween_2009] +id = 46553 +examine = "These could make you as dry as a bone." + +[table_5_halloween_2009] +id = 46554 +examine = "Dead souls could feast around this table." + +[table_6_halloween_2009] +id = 46555 +examine = "Dead souls could feast around this table." + +[table_7_halloween_2009] +id = 46556 +examine = "Dead souls could feast around this table." + +[table_8_halloween_2009] +id = 46557 +examine = "Dead souls could feast around this table." + +[bookcase_3_halloween_2009] +id = 46558 +examine = "Death seems to like gothic novels." + +[bookcase_4_halloween_2009] +id = 46559 +examine = "The titles are in long-dead languages." + +[footlocker_halloween_2009] +id = 46562 +examine = "Are actual feet locked in here?" + +[table_9_halloween_2009] +id = 46563 +examine = "Death himself uses this table to put things on." + +[table_10_halloween_2009] +id = 46564 +examine = "Death himself uses this table to put things on." + +[stool_halloween_2009] +id = 46565 +examine = "The Grim Reaper might rest his weary bones for a moment here." + +[wardrobe_halloween_2009] +id = 46566 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_2_halloween_2009] +id = 46567 +examine = "How many spare robes does one Grim Reaper need?" + +[dresser_halloween_2009] +id = 46568 +examine = "Death might shine his skull at this dresser." + +[towels_2_halloween_2009] +id = 46570 +examine = "These could make you as dry as a bone." + +[mirror_halloween_2009] +id = 46571 +examine = "A place to reflect on your mortality." + +[web_halloween_2009] +id = 46602 +examine = "You could swing across using this." + +[web_2_halloween_2009] +id = 46603 +examine = "You could swing across using this." + +[web_3_halloween_2009] +id = 46604 +examine = "You could swing across using this." + +[web_4_halloween_2009] +id = 46605 +examine = "You could swing across using this." + +[web_5_halloween_2009] +id = 46606 +examine = "You could swing across using this." + +[web_6_halloween_2009] +id = 46607 +examine = "You could swing across using this." + +[web_7_halloween_2009] +id = 46608 +examine = "A web platform." + +[spider-monkey_bars_halloween_2009] +id = 46609 +examine = "You could swing on this." + +[web_wall_halloween_2009] +id = 46618 +examine = "The web here looks strong enough to run against." + +[web_strand_halloween_2009] +id = 46619 +examine = "You could balance across here." + +[web_strand_2_halloween_2009] +id = 46620 +examine = "You could balance across here." + +[web_strand_3_halloween_2009] +id = 46621 +examine = "You could balance across here." + +[web_strand_4_halloween_2009] +id = 46622 +examine = "You could balance across here." + +[web_strand_5_halloween_2009] +id = 46623 +examine = "You could balance across here." + +[web_strand_6_halloween_2009] +id = 46624 +examine = "You could balance across here." + +[web_strand_7_halloween_2009] +id = 46625 +examine = "You could balance across here." + +[web_strand_8_halloween_2009] +id = 46626 +examine = "You could balance across here." + +[web_strand_9_halloween_2009] +id = 46627 +examine = "You could balance across here." + +[web_strand_10_halloween_2009] +id = 46628 +examine = "You could balance across here." + +[web_strand_11_halloween_2009] +id = 46629 +examine = "You could balance across here." + +[web_strand_12_halloween_2009] +id = 46630 +examine = "You could balance across here." + +[web_strand_13_halloween_2009] +id = 46631 +examine = "You could balance across here." + +[web_strand_14_halloween_2009] +id = 46632 +examine = "You could balance across here." + +[web_strand_15_halloween_2009] +id = 46633 +examine = "You could balance across here." + +[web_strand_16_halloween_2009] +id = 46634 +examine = "You could balance across here." + +[web_strand_17_halloween_2009] +id = 46635 +examine = "You could balance across here." + +[web_strand_18_halloween_2009] +id = 46636 +examine = "You could balance across here." + +[web_strand_19_halloween_2009] +id = 46637 +examine = "You could balance across here." + +[web_strand_20_halloween_2009] +id = 46638 +examine = "You could balance across here." + +[web_strand_21_halloween_2009] +id = 46639 +examine = "You could balance across here." + +[web_strand_22_halloween_2009] +id = 46640 +examine = "You could balance across here." + +[pillars_halloween_2009] +id = 46641 +examine = "You could hop across these." + +[web_ledge_halloween_2009] +id = 46642 +examine = "This web looks strong enough to walk on." + +[web_wall_2_halloween_2009] +id = 46643 +examine = "You could climb along this wall." + +[web_8_halloween_2009] +id = 46652 +examine = "A hanging web." + +[web-swing_halloween_2009] +id = 46653 +examine = "You could swing across using this." + +[web_9_halloween_2009] +id = 46688 +examine = "The spider that made this must have been enormous." + +[web_10_halloween_2009] +id = 46689 +examine = "The spider that made this must have been enormous." + +[web_11_halloween_2009] +id = 46690 +examine = "The spider that made this must have been enormous." + +[web_12_halloween_2009] +id = 46691 +examine = "The spider that made this must have been enormous." + +[web_13_halloween_2009] +id = 46692 +examine = "The spider that made this must have been enormous." + +[web_14_halloween_2009] +id = 46693 +examine = "The spider that made this must have been enormous." + +[web_15_halloween_2009] +id = 46694 +examine = "The spider that made this must have been enormous." + +[web_16_halloween_2009] +id = 46695 +examine = "The spider that made this must have been enormous." + +[web_17_halloween_2009] +id = 46696 +examine = "The spider that made this must have been enormous." + +[web_18_halloween_2009] +id = 46697 +examine = "The spider that made this must have been enormous." + +[web_19_halloween_2009] +id = 46698 +examine = "The spider that made this must have been enormous." + +[web_20_halloween_2009] +id = 46699 +examine = "The spider that made this must have been enormous." + +[web_21_halloween_2009] +id = 46700 +examine = "The spider that made this must have been enormous." + +[web_22_halloween_2009] +id = 46701 +examine = "The spider that made this must have been enormous." + +[web_23_halloween_2009] +id = 46702 +examine = "The spider that made this must have been enormous." + +[web_24_halloween_2009] +id = 46703 +examine = "The spider that made this must have been enormous." + +[web_25_halloween_2009] +id = 46704 +examine = "The spider that made this must have been enormous." + +[web_26_halloween_2009] +id = 46705 +examine = "The spider that made this must have been enormous." + +[web_27_halloween_2009] +id = 46706 +examine = "The spider that made this must have been enormous." + +[web_28_halloween_2009] +id = 46707 +examine = "The spider that made this must have been enormous." + +[web_29_halloween_2009] +id = 46708 +examine = "The spider that made this must have been enormous." + +[web_30_halloween_2009] +id = 46709 +examine = "The spider that made this must have been enormous." + +[web_31_halloween_2009] +id = 46710 +examine = "The spider that made this must have been enormous." + +[web_32_halloween_2009] +id = 46711 +examine = "The spider that made this must have been enormous." + +[web_33_halloween_2009] +id = 46712 +examine = "The spider that made this must have been enormous." + +[web_34_halloween_2009] +id = 46713 +examine = "The spider that made this must have been enormous." + +[web_35_halloween_2009] +id = 46714 +examine = "The spider that made this must have been enormous." + +[web_36_halloween_2009] +id = 46715 +examine = "The spider that made this must have been enormous." + +[web_37_halloween_2009] +id = 46716 +examine = "The spider that made this must have been enormous." + +[web_38_halloween_2009] +id = 46717 +examine = "The spider that made this must have been enormous." + +[web_39_halloween_2009] +id = 46718 +examine = "The spider that made this must have been enormous." + +[web_40_halloween_2009] +id = 46719 +examine = "The spider that made this must have been enormous." + +[web_ladder_halloween_2009] +id = 46731 +examine = "This looks like it could support your weight." + +[death_clock_2_halloween_2009] +id = 46774 +examine = "Every swing of the pendulum brings you closer to the moment of your death." + +[death_clock_3_halloween_2009] +id = 46775 +examine = "Every swing of the pendulum brings you closer to the moment of your death." + +[death_clock_4_halloween_2009] +id = 46776 +examine = "Every swing of the pendulum brings you closer to the moment of your death." + +[larder_halloween_2009] +id = 46777 +examine = "A nicely carved larder to keep food cool." + +[larder_2_halloween_2009] +id = 46778 +examine = "A nicely carved larder to keep food cool." + +[larder_3_halloween_2009] +id = 46779 +examine = "A nicely carved larder to keep food cool." + +[bookcase_5_halloween_2009] +id = 46780 +examine = "These books are full of the names of the dead." + +[bookcase_6_halloween_2009] +id = 46781 +examine = "These books are full of the names of the dead." + +[bookcase_7_halloween_2009] +id = 46782 +examine = "These books are full of the names of the dead." + +[bookcase_8_halloween_2009] +id = 46783 +examine = "Books of gothic poetry." + +[bookcase_9_halloween_2009] +id = 46784 +examine = "Books of gothic poetry." + +[bookcase_10_halloween_2009] +id = 46785 +examine = "Books of gothic poetry." + +[bookcase_11_halloween_2009] +id = 46786 +examine = "Ghost stories, written from experience." + +[bookcase_12_halloween_2009] +id = 46787 +examine = "Ghost stories, written from experience." + +[bookcase_13_halloween_2009] +id = 46788 +examine = "Ghost stories, written from experience." + +[cabinet_3_halloween_2009] +id = 46789 +examine = "A locked cabinet." + +[cabinet_4_halloween_2009] +id = 46790 +examine = "A locked cabinet." + +[cabinet_5_halloween_2009] +id = 46791 +examine = "A locked cabinet." + +[cabinet_6_halloween_2009] +id = 46792 +examine = "A locked cabinet." + +[cabinet_7_halloween_2009] +id = 46793 +examine = "A locked cabinet." + +[cabinet_8_halloween_2009] +id = 46794 +examine = "A locked cabinet." + +[fireplace_halloween_2009] +id = 46801 +examine = "This fire seems to radiate cold." + +[fireplace_2_halloween_2009] +id = 46802 +examine = "This fire seems to radiate cold." + +[fireplace_3_halloween_2009] +id = 46803 +examine = "This fire seems to radiate cold." + +[candlestand_2_halloween_2009] +id = 46807 +examine = "The flickering light casts shadows that seem darker than black." + +[candlestand_3_halloween_2009] +id = 46808 +examine = "The flickering light casts shadows that seem darker than black." + +[candlestand_4_halloween_2009] +id = 46809 +examine = "The flickering light casts shadows that seem darker than black." + +[table_11_halloween_2009] +id = 46813 +examine = "Death himself uses this table to put things on." + +[table_12_halloween_2009] +id = 46814 +examine = "Death himself uses this table to put things on." + +[table_13_halloween_2009] +id = 46815 +examine = "Death himself uses this table to put things on." + +[table_14_halloween_2009] +id = 46816 +examine = "Death himself uses this table to put things on." + +[table_15_halloween_2009] +id = 46817 +examine = "Death himself uses this table to put things on." + +[table_16_halloween_2009] +id = 46818 +examine = "Death himself uses this table to put things on." + +[table_17_halloween_2009] +id = 46819 +examine = "Death himself uses this table to put things on." + +[table_18_halloween_2009] +id = 46820 +examine = "Death himself uses this table to put things on." + +[table_19_halloween_2009] +id = 46821 +examine = "Death himself uses this table to put things on." + +[table_20_halloween_2009] +id = 46825 +examine = "Death himself uses this table to put things on." + +[table_21_halloween_2009] +id = 46826 +examine = "Death himself uses this table to put things on." + +[table_22_halloween_2009] +id = 46827 +examine = "Death himself uses this table to put things on." + +[candlestand_5_halloween_2009] +id = 46831 +examine = "No light shines here." + +[candlestand_6_halloween_2009] +id = 46832 +examine = "No light shines here." + +[candlestand_7_halloween_2009] +id = 46833 +examine = "No light shines here." + +[bookcase_14_halloween_2009] +id = 46834 +examine = "Volume after volume of Death's diary, going back to the dawn of time." + +[bookcase_15_halloween_2009] +id = 46835 +examine = "Volume after volume of Death's diary, going back to the dawn of time." + +[bookcase_16_halloween_2009] +id = 46836 +examine = "Volume after volume of Death's diary, going back to the dawn of time." + +[bookcase_17_halloween_2009] +id = 46837 +examine = "Volumes filled with descriptions of the way people have died." + +[bookcase_18_halloween_2009] +id = 46838 +examine = "Volumes filled with descriptions of the way people have died." + +[bookcase_19_halloween_2009] +id = 46839 +examine = "Volumes filled with descriptions of the way people have died." + +[bookcase_20_halloween_2009] +id = 46840 +examine = "Volumes full of names and dates." + +[bookcase_21_halloween_2009] +id = 46841 +examine = "Volumes full of names and dates." + +[bookcase_22_halloween_2009] +id = 46842 +examine = "Volumes full of names and dates." + +[bookcase_23_halloween_2009] +id = 46843 +examine = "Rules of every kind of game, in case Death is challenged." + +[bookcase_24_halloween_2009] +id = 46844 +examine = "Rules of every kind of game, in case Death is challenged." + +[bookcase_25_halloween_2009] +id = 46845 +examine = "Rules of every kind of game, in case Death is challenged." + +[footlocker_2_halloween_2009] +id = 46846 +examine = "Are actual feet locked in here?" + +[footlocker_3_halloween_2009] +id = 46847 +examine = "Are actual feet locked in here?" + +[footlocker_4_halloween_2009] +id = 46848 +examine = "Are actual feet locked in here?" + +[bed_2_halloween_2009] +id = 46849 +examine = "A bed for sleeping the sleep of death." + +[bed_3_halloween_2009] +id = 46850 +examine = "A bed for sleeping the sleep of death." + +[bed_4_halloween_2009] +id = 46851 +examine = "A bed for sleeping the sleep of death." + +[wardrobe_3_halloween_2009] +id = 46852 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_4_halloween_2009] +id = 46853 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_5_halloween_2009] +id = 46854 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_6_halloween_2009] +id = 46855 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_7_halloween_2009] +id = 46856 +examine = "How many spare robes does one Grim Reaper need?" + +[wardrobe_8_halloween_2009] +id = 46857 +examine = "How many spare robes does one Grim Reaper need?" + +[bed_5_halloween_2009] +id = 46858 +examine = "A bed for sleeping the sleep of death." + +[bed_6_halloween_2009] +id = 46859 +examine = "A bed for sleeping the sleep of death." + +[bed_7_halloween_2009] +id = 46860 +examine = "A bed for sleeping the sleep of death." + +[portal_halloween_2009] +id = 46933 +examine = "It makes your skin crawl." + +[portal_2_halloween_2009] +id = 46934 +examine = "The portal back to the Grim Reaper's house." + +[dark_portal_halloween_2009] +id = 46935 +examine = "The portal back to the world of mortals." + +[web_ladder_2_halloween_2009] +id = 46936 +examine = "A ladder made from web." + +[web_ladder_3_halloween_2009] +id = 46938 +examine = "A ladder made from web." + +[ladder_halloween_2009] +id = 46939 +examine = "A ladder made from web." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween_2010/halloween_2010.npc-spawns.toml b/data/activity/event/halloween/halloween_2010/halloween_2010.npc-spawns.toml new file mode 100644 index 0000000000..571b7b6f2e --- /dev/null +++ b/data/activity/event/halloween/halloween_2010/halloween_2010.npc-spawns.toml @@ -0,0 +1,37 @@ +spawns = [ + { id = "zabeth_corvid_halloween_2010", x = 4331, y = 5462 }, + { id = "zabeth_corvid_2_halloween_2010", x = 4320, y = 5341 }, + { id = "pumpkin_pete_halloween_2010", x = 4318, y = 5455 }, + { id = "pumpkin_pete_2_halloween_2010", x = 4318, y = 5327}, + { id = "grim_reaper_halloween_2010", x = 4331, y = 5342, level = 1, direction = "SOUTH" }, + { id = "grim_reaper_halloween_2010", x = 4331, y = 5470, level = 1, direction = "SOUTH" }, + { id = "edgar_halloween_2010", x = 4320, y = 5328, level = 1, direction = "NORTH" }, + { id = "edgar_halloween_2010", x = 4320, y = 5456, level = 1, direction = "NORTH" }, + { id = "allan_halloween_2010", x = 4315, y = 5342 }, + { id = "allan_halloween_2010", x = 4315, y = 5470 }, + { id = "greta_halloween_2010", x = 4320, y = 5470 }, + { id = "greta_2_halloween_2010", x = 4320, y = 5342 }, + { id = "helga_halloween_2010", x = 4319, y = 5470 }, + { id = "helga_2_halloween_2010", x = 4319, y = 5342 }, + { id = "moira_halloween_2010", x = 4321, y = 5470 }, + { id = "moira_2_halloween_2010", x = 4321, y = 5342 }, + { id = "minstrel_web_halloween_2010", x = 4316, y = 5341 }, + { id = "minstrel_web_halloween_2010", x = 4316, y = 5469 }, + { id = "dancer_halloween_2010", x = 4318, y = 5339 }, + { id = "dancer_2_halloween_2010", x = 4321, y = 5339 }, + { id = "dancer_3_halloween_2010", x = 4318, y = 5333 }, + { id = "dancer_4_halloween_2010", x = 4317, y = 5336 }, + { id = "dancer_5_halloween_2010", x = 4322, y = 5336 }, + { id = "party_pete_halloween_2010", x = 4319, y = 5336 }, + { id = "purple_spider_halloween_2010", x = 4322, y = 5464 }, + { id = "blue_spider_halloween_2010", x = 4318, y = 5466 }, + { id = "red_spider_halloween_2010", x = 4320, y = 5462 }, + { id = "green_spider_halloween_2010", x = 4318, y = 5461 }, + { id = "orange_spider_halloween_2010", x = 4317, y = 5464 }, + { id = "turquoise_spider_halloween_2010", x = 4320, y = 5467 }, + { id = "pink_spider_halloween_2010", x = 4321, y = 5461 }, + { id = "beige_spider_halloween_2010", x = 4319, y = 5464 }, + { id = "orange_spider_2_halloween_2010", x = 4333, y = 5466 }, + { id = "muncher_halloween_2009", x = 4330, y = 5332 }, + { id = "muncher_halloween_2009", x = 4330, y = 5460 }, +] diff --git a/data/activity/event/halloween/halloween_2010/halloween_2010.npcs.toml b/data/activity/event/halloween/halloween_2010/halloween_2010.npcs.toml new file mode 100644 index 0000000000..624c7fee8b --- /dev/null +++ b/data/activity/event/halloween/halloween_2010/halloween_2010.npcs.toml @@ -0,0 +1,135 @@ +[zabeth_corvid_halloween_2010] +id = 12375 +examine = "He is in high spirits." + +[zabeth_corvid_2_halloween_2010] +id = 12376 +examine = "He is in high spirits." + +[pumpkin_pete_halloween_2010] +id = 12377 +examine = "He seems to enjoy Hallowe'en a little too much." + +[pumpkin_pete_2_halloween_2010] +id = 12378 +examine = "He seems to enjoy Hallowe'en a little too much." + +[grim_reaper_halloween_2010] +id = 12379 +examine = "What could be beneath that hood?" + +[edgar_halloween_2010] +id = 12380 +examine = "He'll Poe-n you." + +[allan_halloween_2010] +id = 12381 +examine = "He'll Poe-n you." + +[greta_halloween_2010] +id = 12383 + +[greta_2_halloween_2010] +id = 12385 +examine = "A lycanthropic backing singer." + +[helga_halloween_2010] +id = 12387 + +[helga_2_halloween_2010] +id = 12389 +examine = "A lycanthropic backing singer." + +[moira_halloween_2010] +id = 12391 + +[moira_2_halloween_2010] +id = 12393 +examine = "A lycanthropic backing singer." + +[minstrel_web_halloween_2010] +id = 12394 +examine = "She looks familiar." + +[dancer_halloween_2010] +id = 12396 +examine = "He seems to be enjoying the party." + +[dancer_2_halloween_2010] +id = 12397 +examine = "He seems to be enjoying the party." + +[dancer_3_halloween_2010] +id = 12398 +examine = "She seems to be enjoying the party." + +[dancer_4_halloween_2010] +id = 12399 +examine = "He seems to be enjoying the party." + +[dancer_5_halloween_2010] +id = 12400 +examine = "She seems to be enjoying the party." + +[party_pete_halloween_2010] +id = 12401 +examine = "He likes to paaaarty!" + +[purple_spider_halloween_2010] +id = 12410 + +[blue_spider_halloween_2010] +id = 12411 + +[red_spider_halloween_2010] +id = 12412 + +[green_spider_halloween_2010] +id = 12413 + +[orange_spider_halloween_2010] +id = 12414 + +[turquoise_spider_halloween_2010] +id = 12415 + +[pink_spider_halloween_2010] +id = 12416 + +[beige_spider_halloween_2010] +id = 12417 + +[orange_spider_2_halloween_2010] +id = 12419 + +[purple_spider_halloween_2009] +id = 12423 +examine = "A spider with purple markings." + +[blue_spider_halloween_2009] +id = 12424 +examine = "A spider with blue markings." + +[red_spider_halloween_2009] +id = 12425 +examine = "A spider with red markings." + +[green_spider_halloween_2009] +id = 12426 +examine = "A spider with green markings." + +[orange_spider_halloween_2009] +id = 12427 +examine = "A spider with orange markings." + +[turquoise_spider_halloween_2009] +id = 12428 +examine = "A spider with turquoise markings." + +[pink_spider_halloween_2009] +id = 12429 +examine = "A spider with pink markings." + +[beige_spider_halloween_2009] +id = 12430 +examine = "A spider with beige markings." \ No newline at end of file diff --git a/data/activity/event/halloween/halloween_2010/halloween_2010.objs.toml b/data/activity/event/halloween/halloween_2010/halloween_2010.objs.toml new file mode 100644 index 0000000000..87bcd1acc2 --- /dev/null +++ b/data/activity/event/halloween/halloween_2010/halloween_2010.objs.toml @@ -0,0 +1,123 @@ +[death_clock_halloween_2010] +id = 31818 +examine = "Every swing of the pendulum brings you closer to the moment of your death." + +[towels_halloween_2010] +id = 31819 +examine = "These could make you dry as a bone." + +[bed_halloween_2010] +id = 31842 +examine = "A bed for sleeping the sleep of death." + +[dark_portal_halloween_2010] +id = 31845 +examine = "Do you really want to go through there?" + +[stage_halloween_2010] +id = 31860 +examine = "Made from the heaviest of metals and a pinch of rock." + +[stage_candle_halloween_2010] +id = 31861 +examine = "A bright candle." + +[stage_barrier_halloween_2010] +id = 31862 +examine = "A barrier." + +[web_halloween_2010] +id = 31886 +examine = "A spiders web." + +[table_halloween_2010] +id = 31915 +examine = "A table with food on it." + +[table_2_halloween_2010] +id = 31916 +examine = "A table with food on it." + +[table_3_halloween_2010] +id = 31961 +examine = "A table with food on it." + +[table_5_halloween_2010] +id = 31990 +examine = "A table with food on it." + +[table_6_halloween_2010] +id = 31998 +examine = "A table with food on it." + +[table_7_halloween_2010] +id = 32001 +examine = "A table with food on it." + +[table_8_halloween_2010] +id = 32002 +examine = "A table with food on it." + +[table_9_halloween_2010] +id = 32008 +examine = "A table with food on it." + +[table_10_halloween_2010] +id = 32012 +examine = "A table with food on it." + +[pumpkin_halloween_2010] +id = 32034 +examine = "A pumpkin lantern." + +[pumpkin_2_halloween_2010] +id = 32041 +examine = "A pumpkin lantern." + +[pumpkin_3_halloween_2010] +id = 32042 +examine = "A pumpkin lantern." + +[pumpkin_4_halloween_2010] +id = 32043 +examine = "A pumpkin lantern." + +[pumpkin_5_halloween_2010] +id = 32044 +examine = "A pumpkin lantern." + +[four-poster_bed_halloween_2010] +id = 32046 +examine = "A bed fit for a Grim." + +[purple_tile_halloween_2010] +id = 32064 +examine = "A purple floor tile." + +[blue_tile_halloween_2010] +id = 32076 +examine = "A blue floor tile." + +[red_tile_halloween_2010] +id = 32077 +examine = "A red floor tile." + +[green_tile_halloween_2010] +id = 32100 +examine = "A green floor tile." + +[orange_tile_halloween_2010] +id = 32101 +examine = "An orange floor tile." + +[turquoise_tile_halloween_2010] +id = 32102 +examine = "A turquoise floor tile." + +[pink_tile_halloween_2010] +id = 32103 +examine = "A pink floor tile." + +[white_tile_halloween_2010] +id = 32104 +examine = "A white floor tile." \ No newline at end of file diff --git a/data/activity/event/halloween/harvest_hollow/harvest_hollow.npcs.toml b/data/activity/event/halloween/harvest_hollow/harvest_hollow.npcs.toml deleted file mode 100644 index aa5ab0a04a..0000000000 --- a/data/activity/event/halloween/harvest_hollow/harvest_hollow.npcs.toml +++ /dev/null @@ -1,3 +0,0 @@ -[muncher] -id = 8868 -examine = "Only the Grim Reaper would have a pet like this." \ No newline at end of file diff --git a/data/activity/event/halloween/harvest_hollow/harvest_hollow.npc-spawns.toml b/data/activity/harvest_hollow.npc-spawns.toml similarity index 75% rename from data/activity/event/halloween/harvest_hollow/harvest_hollow.npc-spawns.toml rename to data/activity/harvest_hollow.npc-spawns.toml index 41e898e875..09057973c1 100644 --- a/data/activity/event/halloween/harvest_hollow/harvest_hollow.npc-spawns.toml +++ b/data/activity/harvest_hollow.npc-spawns.toml @@ -149,52 +149,4 @@ spawns = [ { id = "man_3", x = 6327, y = 6316 }, { id = "woman", x = 6274, y = 6275, level = 1 }, { id = "woman_3", x = 6275, y = 6273, level = 1 }, - - { id = "muncher", x = 6223, y = 6260 }, - { id = "muncher", x = 6223, y = 6269 }, - { id = "muncher", x = 6246, y = 6270 }, - { id = "muncher", x = 6249, y = 6265 }, - { id = "muncher", x = 6251, y = 6232 }, - { id = "muncher", x = 6260, y = 6241 }, - { id = "muncher", x = 6268, y = 6249 }, - { id = "muncher", x = 6219, y = 6305 }, - { id = "muncher", x = 6231, y = 6274 }, - { id = "muncher", x = 6232, y = 6291 }, - { id = "muncher", x = 6233, y = 6285 }, - { id = "muncher", x = 6237, y = 6304 }, - { id = "muncher", x = 6251, y = 6282 }, - { id = "muncher", x = 6261, y = 6278 }, - { id = "muncher", x = 6262, y = 6282 }, - { id = "muncher", x = 6265, y = 6307 }, - { id = "muncher", x = 6265, y = 6327 }, - { id = "muncher", x = 6278, y = 6261 }, - { id = "muncher", x = 6280, y = 6227 }, - { id = "muncher", x = 6281, y = 6219 }, - { id = "muncher", x = 6282, y = 6236 }, - { id = "muncher", x = 6284, y = 6250 }, - { id = "muncher", x = 6284, y = 6265 }, - { id = "muncher", x = 6292, y = 6236 }, - { id = "muncher", x = 6295, y = 6267 }, - { id = "muncher", x = 6298, y = 6244 }, - { id = "muncher", x = 6302, y = 6258 }, - { id = "muncher", x = 6303, y = 6226 }, - { id = "muncher", x = 6308, y = 6263 }, - { id = "muncher", x = 6314, y = 6244 }, - { id = "muncher", x = 6320, y = 6219 }, - { id = "muncher", x = 6320, y = 6255 }, - { id = "muncher", x = 6320, y = 6266 }, - { id = "muncher", x = 6321, y = 6235 }, - { id = "muncher", x = 6327, y = 6248 }, - { id = "muncher", x = 6275, y = 6282 }, - { id = "muncher", x = 6276, y = 6320 }, - { id = "muncher", x = 6283, y = 6277 }, - { id = "muncher", x = 6288, y = 6319 }, - { id = "muncher", x = 6292, y = 6288 }, - { id = "muncher", x = 6293, y = 6299 }, - { id = "muncher", x = 6296, y = 6311 }, - { id = "muncher", x = 6304, y = 6277 }, - { id = "muncher", x = 6306, y = 6309 }, - { id = "muncher", x = 6325, y = 6291 }, - { id = "muncher", x = 6325, y = 6301 }, - { id = "muncher", x = 6329, y = 6282 }, ] diff --git a/data/area/misthalin/varrock/varrock.teles.toml b/data/area/misthalin/varrock/varrock.teles.toml index 1777c5d521..583c460d43 100644 --- a/data/area/misthalin/varrock/varrock.teles.toml +++ b/data/area/misthalin/varrock/varrock.teles.toml @@ -1,9 +1,4 @@ # 6989 varrock -[27242] -option = "Climb-up" -tile = { x = 1700, y = 4824 } -to = { x = 1639, y = 4835 } - [24427] option = "Walk-up" tile = { x = 1758, y = 4959 } From 5efc47832240923022fe44b370897bb6d6fe594a Mon Sep 17 00:00:00 2001 From: jarryd229 <15334102+jarryd229@users.noreply.github.com> Date: Thu, 22 Jan 2026 22:00:18 +1100 Subject: [PATCH 4/5] fix ladder anims --- .../kotlin/content/area/asgarnia/falador/GiantMole.kt | 2 +- .../area/troll_country/god_wars_dungeon/SaradominRock.kt | 2 +- game/src/main/kotlin/content/entity/obj/Picking.kt | 2 +- game/src/main/kotlin/content/entity/obj/Stairs.kt | 2 +- .../content/minigame/sorceress_garden/SorceressGarden.kt | 2 +- .../main/kotlin/content/skill/agility/course/ApeAtoll.kt | 2 +- .../content/skill/agility/course/BarbarianOutpost.kt | 2 +- .../kotlin/content/skill/agility/course/GnomeAdvanced.kt | 2 +- .../content/skill/agility/course/GnomeStronghold.kt | 8 ++++---- .../src/main/kotlin/content/skill/smithing/Cannonballs.kt | 4 ++-- game/src/main/kotlin/content/skill/thieving/TrapChests.kt | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt b/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt index 5ac44dfbfb..57f0aad2d3 100644 --- a/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt +++ b/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt @@ -63,7 +63,7 @@ class GiantMole : Script { } objectOperate("Climb", "giant_mole_lair_escape_rope") { - anim("climb_up") + anim("human_reachforladder") tele(acceptedTiles.random()) } diff --git a/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt b/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt index 1eaa439ab6..e11d137938 100644 --- a/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt +++ b/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt @@ -37,7 +37,7 @@ class SaradominRock : Script { player.message("You aren't carrying a rope with you.") return } - player.anim("climb_up") + player.anim("human_reachforladder") player[id.replace("rock", "rope")] = true } } diff --git a/game/src/main/kotlin/content/entity/obj/Picking.kt b/game/src/main/kotlin/content/entity/obj/Picking.kt index c15de3705c..60ad0f81cc 100644 --- a/game/src/main/kotlin/content/entity/obj/Picking.kt +++ b/game/src/main/kotlin/content/entity/obj/Picking.kt @@ -23,7 +23,7 @@ class Picking : Script { val pickable: Pickable = target.pickable ?: return@objectOperate if (inventory.add(pickable.item)) { sound("pick") - anim("climb_down") + anim("human_pickupfloor") if (random.nextInt(pickable.chance) == 0) { target.remove(TimeUnit.SECONDS.toTicks(pickable.respawnDelay)) } diff --git a/game/src/main/kotlin/content/entity/obj/Stairs.kt b/game/src/main/kotlin/content/entity/obj/Stairs.kt index c30fb31d10..1efb0ad80e 100644 --- a/game/src/main/kotlin/content/entity/obj/Stairs.kt +++ b/game/src/main/kotlin/content/entity/obj/Stairs.kt @@ -29,7 +29,7 @@ class Stairs(val teleports: ObjectTeleports) : Script { if (remaining > 0) { return@objTeleportTakeOff remaining } else if (remaining < 0) { - anim(if (option == "Climb-down" || obj.stringId.endsWith("_down")) "climb_down" else "climb_up") + anim(if (option == "Climb-down" || obj.stringId.endsWith("_down")) "human_pickupfloor" else "human_reachforladder") start("teleport_delay", 2) return@objTeleportTakeOff 2 } diff --git a/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt b/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt index a884e37dcc..87e8c76079 100644 --- a/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt +++ b/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt @@ -123,7 +123,7 @@ class SorceressGarden(val dropTables: DropTables) : Script { } } sound("pick") - animDelay("climb_down") + animDelay("human_pickupfloor") experience.add(Skill.Farming, 25.0) leave() } diff --git a/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt b/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt index 9128fea6b4..cead3ab82a 100644 --- a/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt +++ b/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt @@ -95,7 +95,7 @@ class ApeAtoll : Script { else -> { val monkey = weapon == "small_ninja_monkey_greegree" message("You reach for the tree trunk and lose your footing...") - anim(if (monkey) "ninja_monkey_climb_tree_fail" else "climb_up") + anim(if (monkey) "ninja_monkey_climb_tree_fail" else "human_reachforladder") if (monkey) { sound("climbing_loop", repeat = 3) } else { diff --git a/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt b/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt index a7acf3ba96..970161420e 100644 --- a/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt +++ b/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt @@ -99,7 +99,7 @@ class BarbarianOutpost : Script { objectOperate("Climb-over", "barbarian_outpost_obstacle_net") { message("You climb the netting...", ChatType.Filter) - anim("climb_up") + anim("human_reachforladder") delay(2) agilityStage(3) tele(2537, tile.y.coerceIn(3545, 3546), 1) diff --git a/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt b/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt index bf84cd914e..d27aeac5a5 100644 --- a/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt +++ b/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt @@ -27,7 +27,7 @@ class GnomeAdvanced : Script { } NPCs.gnomeTrainer("Terrorbirds could climb faster than that!", Zone(9263413)) message("You climb the tree...", ChatType.Filter) - anim("climb_up") + anim("human_reachforladder") delay(2) message("... to an even higher platform.", ChatType.Filter) agilityStage(4) diff --git a/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt b/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt index 9cb3c1f673..4655bfc6d2 100644 --- a/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt +++ b/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt @@ -33,7 +33,7 @@ class GnomeStronghold : Script { agilityCourse("gnome") NPCs.gnomeTrainer("Move it, move it, move it!", listOf(Zone(8768252), Zone(876853))) message("You climb the netting...", ChatType.Filter) - anim("climb_up") + anim("human_reachforladder") delay(2) agilityStage(2) tele(tile.x.coerceIn(2471, 2476), 3424, 1) @@ -43,7 +43,7 @@ class GnomeStronghold : Script { objectOperate("Climb", "gnome_tree_branch_up") { NPCs.gnomeTrainer("That's it - straight up", listOf(Zone(5069109), Zone(5071157))) message("You climb the tree...", ChatType.Filter) - anim("climb_up") + anim("human_reachforladder") delay(2) message("... to the platform above.", ChatType.Filter) agilityStage(3) @@ -71,7 +71,7 @@ class GnomeStronghold : Script { objectOperate("Climb-down", "gnome_tree_branch_down") { message("You climb the tree...", ChatType.Filter) - anim("climb_down") + anim("human_pickupfloor") delay(2) agilityStage(5) tele(2486, 3420, 0) @@ -82,7 +82,7 @@ class GnomeStronghold : Script { agilityCourse("gnome") NPCs.gnomeTrainer("My Granny can move faster than you.", Zone(876854)) message("You climb the netting.", ChatType.Filter) - anim("climb_up") + anim("human_reachforladder") delay(2) agilityStage(6) val direction = target.tile.delta(tile).toDirection().vertical() diff --git a/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt b/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt index 13c78e03d4..6bc026981f 100644 --- a/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt +++ b/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt @@ -53,11 +53,11 @@ class Cannonballs : Script { player.message("You heat the steel bar into a liquid state.", ChatType.Filter) player.delay(3) player.message("You poor the molten metal into your cannonball mould.", ChatType.Filter) - player.anim("climb_down") + player.anim("human_pickupfloor") player.delay(1) player.message("The molten metal cools slowly to form 4 cannonballs.", ChatType.Filter) player.delay(3) - player.anim("climb_down") + player.anim("human_pickupfloor") player.message("You remove the cannonballs from the mould.", ChatType.Filter) player.inventory.transaction { remove("steel_bar") diff --git a/game/src/main/kotlin/content/skill/thieving/TrapChests.kt b/game/src/main/kotlin/content/skill/thieving/TrapChests.kt index 2bc1f99f3a..bd1878ce1b 100644 --- a/game/src/main/kotlin/content/skill/thieving/TrapChests.kt +++ b/game/src/main/kotlin/content/skill/thieving/TrapChests.kt @@ -84,7 +84,7 @@ class TrapChests(val tables: DropTables) : Script { else -> return@objectOperate } } - anim("climb_down") + anim("human_pickupfloor") anim("open_chest") delay(1) message("You find treasure inside!", ChatType.Filter) From 360c0b7617b40f683efca95c2e4630ef8fe499cf Mon Sep 17 00:00:00 2001 From: GregHib Date: Sun, 25 Jan 2026 21:44:50 +0000 Subject: [PATCH 5/5] Revert animation names --- data/entity/player/human.anims.toml | 2 +- .../kotlin/content/area/asgarnia/burthorpe/HeroesGuild.kt | 2 +- .../kotlin/content/area/asgarnia/falador/GiantMole.kt | 2 +- .../kotlin/content/area/kandarin/ardougne/Ardougne.kt | 2 +- .../kotlin/content/area/kandarin/ardougne/LegendsGuild.kt | 4 ++-- .../area/kandarin/ardougne/west_ardougne/WestArdougne.kt | 2 +- .../area/troll_country/god_wars_dungeon/SaradominRock.kt | 2 +- game/src/main/kotlin/content/entity/obj/Picking.kt | 2 +- game/src/main/kotlin/content/entity/obj/Stairs.kt | 2 +- .../content/minigame/sorceress_garden/SorceressGarden.kt | 2 +- .../main/kotlin/content/skill/agility/course/ApeAtoll.kt | 2 +- .../content/skill/agility/course/BarbarianOutpost.kt | 2 +- .../kotlin/content/skill/agility/course/GnomeAdvanced.kt | 2 +- .../content/skill/agility/course/GnomeStronghold.kt | 8 ++++---- .../main/kotlin/content/skill/prayer/bone/BoneBurying.kt | 2 +- .../kotlin/content/skill/runecrafting/MysteriousRuins.kt | 2 +- .../src/main/kotlin/content/skill/smithing/Cannonballs.kt | 4 ++-- game/src/main/kotlin/content/skill/thieving/TrapChests.kt | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/entity/player/human.anims.toml b/data/entity/player/human.anims.toml index 673d626503..f24a91b670 100644 --- a/data/entity/player/human.anims.toml +++ b/data/entity/player/human.anims.toml @@ -1,4 +1,4 @@ -[human_pickupfloor] +[climb_down] id = 827 [climb_up] diff --git a/game/src/main/kotlin/content/area/asgarnia/burthorpe/HeroesGuild.kt b/game/src/main/kotlin/content/area/asgarnia/burthorpe/HeroesGuild.kt index 593ef0a464..2006427d68 100644 --- a/game/src/main/kotlin/content/area/asgarnia/burthorpe/HeroesGuild.kt +++ b/game/src/main/kotlin/content/area/asgarnia/burthorpe/HeroesGuild.kt @@ -19,7 +19,7 @@ class HeroesGuild : Script { itemOnObjectOperate("amulet_of_glory", "fountain_of_heroes") { if (inventory.replace(it.slot, it.item.id, "amulet_of_glory_4")) { message("You dip the amulet in the fountain...") - anim("human_pickupfloor") + anim("climb_down") item("amulet_of_glory", 300, "You feel a power emanating from the fountain as it recharges your amulet. You can now rub the amulet to teleport and wear it to get more gems whilst mining.") } } diff --git a/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt b/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt index 57f0aad2d3..5ac44dfbfb 100644 --- a/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt +++ b/game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kt @@ -63,7 +63,7 @@ class GiantMole : Script { } objectOperate("Climb", "giant_mole_lair_escape_rope") { - anim("human_reachforladder") + anim("climb_up") tele(acceptedTiles.random()) } diff --git a/game/src/main/kotlin/content/area/kandarin/ardougne/Ardougne.kt b/game/src/main/kotlin/content/area/kandarin/ardougne/Ardougne.kt index afb1977a7a..27a7c744a2 100644 --- a/game/src/main/kotlin/content/area/kandarin/ardougne/Ardougne.kt +++ b/game/src/main/kotlin/content/area/kandarin/ardougne/Ardougne.kt @@ -75,7 +75,7 @@ class Ardougne : Script { objectOperate("Open", "alrenas_cupboard_shut") { (target) -> message("You open the cupboard.") - anim("human_pickupfloor") + anim("climb_down") sound("cupboard_open") target.replace("alrenas_cupboard_open", ticks = TimeUnit.MINUTES.toTicks(1)) } diff --git a/game/src/main/kotlin/content/area/kandarin/ardougne/LegendsGuild.kt b/game/src/main/kotlin/content/area/kandarin/ardougne/LegendsGuild.kt index acb67061e7..66e9459acf 100644 --- a/game/src/main/kotlin/content/area/kandarin/ardougne/LegendsGuild.kt +++ b/game/src/main/kotlin/content/area/kandarin/ardougne/LegendsGuild.kt @@ -37,13 +37,13 @@ class LegendsGuild : Script { suspend fun Player.combatBracelet() { message("You touch the jewellery against the totem pole...") - anim("human_pickupfloor") + anim("climb_down") item("combat_bracelet", 300, "You feel a power emanating from the totem pole as it recharges your bracelet. You can now rub the bracelet to teleport and wear it to get information while on a Slayer assignment.") } suspend fun Player.skillsNecklace() { message("You touch the jewellery against the totem pole...") - anim("human_pickupfloor") + anim("climb_down") item("skills_necklace", 200, "You feel a power emanating from the totem pole as it recharges your necklace. You can now rub the necklace to teleport and wear it to get more caskets while big net Fishing.") } } diff --git a/game/src/main/kotlin/content/area/kandarin/ardougne/west_ardougne/WestArdougne.kt b/game/src/main/kotlin/content/area/kandarin/ardougne/west_ardougne/WestArdougne.kt index 9293f59301..b93c9ed2d8 100644 --- a/game/src/main/kotlin/content/area/kandarin/ardougne/west_ardougne/WestArdougne.kt +++ b/game/src/main/kotlin/content/area/kandarin/ardougne/west_ardougne/WestArdougne.kt @@ -69,7 +69,7 @@ class WestArdougne : Script { } objectOperate("Climb-down", "plague_manhole_open") { - anim("human_pickupfloor") + anim("climb_down") statement("You climb down through the manhole.", clickToContinue = false) open("fade_out") delay(3) diff --git a/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt b/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt index e11d137938..1eaa439ab6 100644 --- a/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt +++ b/game/src/main/kotlin/content/area/troll_country/god_wars_dungeon/SaradominRock.kt @@ -37,7 +37,7 @@ class SaradominRock : Script { player.message("You aren't carrying a rope with you.") return } - player.anim("human_reachforladder") + player.anim("climb_up") player[id.replace("rock", "rope")] = true } } diff --git a/game/src/main/kotlin/content/entity/obj/Picking.kt b/game/src/main/kotlin/content/entity/obj/Picking.kt index 60ad0f81cc..c15de3705c 100644 --- a/game/src/main/kotlin/content/entity/obj/Picking.kt +++ b/game/src/main/kotlin/content/entity/obj/Picking.kt @@ -23,7 +23,7 @@ class Picking : Script { val pickable: Pickable = target.pickable ?: return@objectOperate if (inventory.add(pickable.item)) { sound("pick") - anim("human_pickupfloor") + anim("climb_down") if (random.nextInt(pickable.chance) == 0) { target.remove(TimeUnit.SECONDS.toTicks(pickable.respawnDelay)) } diff --git a/game/src/main/kotlin/content/entity/obj/Stairs.kt b/game/src/main/kotlin/content/entity/obj/Stairs.kt index 1efb0ad80e..c30fb31d10 100644 --- a/game/src/main/kotlin/content/entity/obj/Stairs.kt +++ b/game/src/main/kotlin/content/entity/obj/Stairs.kt @@ -29,7 +29,7 @@ class Stairs(val teleports: ObjectTeleports) : Script { if (remaining > 0) { return@objTeleportTakeOff remaining } else if (remaining < 0) { - anim(if (option == "Climb-down" || obj.stringId.endsWith("_down")) "human_pickupfloor" else "human_reachforladder") + anim(if (option == "Climb-down" || obj.stringId.endsWith("_down")) "climb_down" else "climb_up") start("teleport_delay", 2) return@objTeleportTakeOff 2 } diff --git a/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt b/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt index 87e8c76079..a884e37dcc 100644 --- a/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt +++ b/game/src/main/kotlin/content/minigame/sorceress_garden/SorceressGarden.kt @@ -123,7 +123,7 @@ class SorceressGarden(val dropTables: DropTables) : Script { } } sound("pick") - animDelay("human_pickupfloor") + animDelay("climb_down") experience.add(Skill.Farming, 25.0) leave() } diff --git a/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt b/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt index cead3ab82a..9128fea6b4 100644 --- a/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt +++ b/game/src/main/kotlin/content/skill/agility/course/ApeAtoll.kt @@ -95,7 +95,7 @@ class ApeAtoll : Script { else -> { val monkey = weapon == "small_ninja_monkey_greegree" message("You reach for the tree trunk and lose your footing...") - anim(if (monkey) "ninja_monkey_climb_tree_fail" else "human_reachforladder") + anim(if (monkey) "ninja_monkey_climb_tree_fail" else "climb_up") if (monkey) { sound("climbing_loop", repeat = 3) } else { diff --git a/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt b/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt index 970161420e..a7acf3ba96 100644 --- a/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt +++ b/game/src/main/kotlin/content/skill/agility/course/BarbarianOutpost.kt @@ -99,7 +99,7 @@ class BarbarianOutpost : Script { objectOperate("Climb-over", "barbarian_outpost_obstacle_net") { message("You climb the netting...", ChatType.Filter) - anim("human_reachforladder") + anim("climb_up") delay(2) agilityStage(3) tele(2537, tile.y.coerceIn(3545, 3546), 1) diff --git a/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt b/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt index d27aeac5a5..bf84cd914e 100644 --- a/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt +++ b/game/src/main/kotlin/content/skill/agility/course/GnomeAdvanced.kt @@ -27,7 +27,7 @@ class GnomeAdvanced : Script { } NPCs.gnomeTrainer("Terrorbirds could climb faster than that!", Zone(9263413)) message("You climb the tree...", ChatType.Filter) - anim("human_reachforladder") + anim("climb_up") delay(2) message("... to an even higher platform.", ChatType.Filter) agilityStage(4) diff --git a/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt b/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt index 4655bfc6d2..9cb3c1f673 100644 --- a/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt +++ b/game/src/main/kotlin/content/skill/agility/course/GnomeStronghold.kt @@ -33,7 +33,7 @@ class GnomeStronghold : Script { agilityCourse("gnome") NPCs.gnomeTrainer("Move it, move it, move it!", listOf(Zone(8768252), Zone(876853))) message("You climb the netting...", ChatType.Filter) - anim("human_reachforladder") + anim("climb_up") delay(2) agilityStage(2) tele(tile.x.coerceIn(2471, 2476), 3424, 1) @@ -43,7 +43,7 @@ class GnomeStronghold : Script { objectOperate("Climb", "gnome_tree_branch_up") { NPCs.gnomeTrainer("That's it - straight up", listOf(Zone(5069109), Zone(5071157))) message("You climb the tree...", ChatType.Filter) - anim("human_reachforladder") + anim("climb_up") delay(2) message("... to the platform above.", ChatType.Filter) agilityStage(3) @@ -71,7 +71,7 @@ class GnomeStronghold : Script { objectOperate("Climb-down", "gnome_tree_branch_down") { message("You climb the tree...", ChatType.Filter) - anim("human_pickupfloor") + anim("climb_down") delay(2) agilityStage(5) tele(2486, 3420, 0) @@ -82,7 +82,7 @@ class GnomeStronghold : Script { agilityCourse("gnome") NPCs.gnomeTrainer("My Granny can move faster than you.", Zone(876854)) message("You climb the netting.", ChatType.Filter) - anim("human_reachforladder") + anim("climb_up") delay(2) agilityStage(6) val direction = target.tile.delta(tile).toDirection().vertical() diff --git a/game/src/main/kotlin/content/skill/prayer/bone/BoneBurying.kt b/game/src/main/kotlin/content/skill/prayer/bone/BoneBurying.kt index d3b1eafe02..6d118aa064 100644 --- a/game/src/main/kotlin/content/skill/prayer/bone/BoneBurying.kt +++ b/game/src/main/kotlin/content/skill/prayer/bone/BoneBurying.kt @@ -35,7 +35,7 @@ class BoneBurying : Script { return@itemOption } start("bone_delay", 1) - anim("human_pickupfloor") + anim("climb_down") exp(Skill.Prayer, xp) sound("bury_bones") set("i_wonder_if_itll_sprout_task", true) diff --git a/game/src/main/kotlin/content/skill/runecrafting/MysteriousRuins.kt b/game/src/main/kotlin/content/skill/runecrafting/MysteriousRuins.kt index e007da1167..b3d021c961 100644 --- a/game/src/main/kotlin/content/skill/runecrafting/MysteriousRuins.kt +++ b/game/src/main/kotlin/content/skill/runecrafting/MysteriousRuins.kt @@ -49,7 +49,7 @@ class MysteriousRuins(val teleports: ObjectTeleports) : Script { return@itemOnObjectOperate } message("You hold the ${item.id.toSentenceCase()} towards the mysterious ruins.") - anim("human_pickupfloor") + anim("climb_down") delay(2) set("${item.id.removeSuffix("_talisman")}_altar_ruins", refresh = false, value = true) interactObject(target, "Enter", approachRange = -1) diff --git a/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt b/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt index 6bc026981f..13c78e03d4 100644 --- a/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt +++ b/game/src/main/kotlin/content/skill/smithing/Cannonballs.kt @@ -53,11 +53,11 @@ class Cannonballs : Script { player.message("You heat the steel bar into a liquid state.", ChatType.Filter) player.delay(3) player.message("You poor the molten metal into your cannonball mould.", ChatType.Filter) - player.anim("human_pickupfloor") + player.anim("climb_down") player.delay(1) player.message("The molten metal cools slowly to form 4 cannonballs.", ChatType.Filter) player.delay(3) - player.anim("human_pickupfloor") + player.anim("climb_down") player.message("You remove the cannonballs from the mould.", ChatType.Filter) player.inventory.transaction { remove("steel_bar") diff --git a/game/src/main/kotlin/content/skill/thieving/TrapChests.kt b/game/src/main/kotlin/content/skill/thieving/TrapChests.kt index bd1878ce1b..2bc1f99f3a 100644 --- a/game/src/main/kotlin/content/skill/thieving/TrapChests.kt +++ b/game/src/main/kotlin/content/skill/thieving/TrapChests.kt @@ -84,7 +84,7 @@ class TrapChests(val tables: DropTables) : Script { else -> return@objectOperate } } - anim("human_pickupfloor") + anim("climb_down") anim("open_chest") delay(1) message("You find treasure inside!", ChatType.Filter)