From 744c880e52c8415388bf37666b7ee0019c4920c4 Mon Sep 17 00:00:00 2001 From: uthuluc <58225812+uthuluc@users.noreply.github.com> Date: Wed, 9 Dec 2020 00:06:45 -0500 Subject: [PATCH 1/3] Update Comprehensive Cartography.ash adds questionable routing advice for the map noncoms --- .../Comprehensive Cartography.ash | 87 ++++++++++++++++--- 1 file changed, 74 insertions(+), 13 deletions(-) diff --git a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash index 92a7a1fb..e51b29bc 100644 --- a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash +++ b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash @@ -1,18 +1,79 @@ -RegisterTaskGenerationFunction("IOTMComprehensiveCartographyGenerateTasks"); -void IOTMComprehensiveCartographyGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) +//experimental cartography code +RegisterResourceGenerationFunction("IOTMCartographyMapsGenerateResource"); +void IOTMCartographyMapsGenerateResource(ChecklistEntry [int] resource_entries) { - if (!lookupSkill("Map the Monsters").have_skill()) return; - if (get_property_boolean("mappingMonsters")) { - task_entries.listAppend(ChecklistEntryMake("__skill Map the Monsters", "", ChecklistSubentryMake("Mapping the Monsters now!", "", "Fight a chosen monster in the next zone."), -11).ChecklistEntrySetIDTag("Cartography skill map now")); - } + int maps_left = clampi(3 - get_property_int("_monstersMapped"), 0, 3); + string [int] description; + description.listAppend("Map the monsters you want to fight!"); + description.listAppend("This IotM also gives you a special noncom in the following zones:"); + string [int] options; + if (!__quest_state["cc_spookyravennecklace"].finished) + { + options.listAppend("The Haunted Billiards Room"); + } + if (!__quest_state["cc_friars"].finished) + { + options.listAppend("The Dark Neck of the Woods"); + } + if (get_property_int("cyrptNookEvilness") > 25) + { + options.listAppend("The Defiled Nook"); + } + if (get_property_int("twinPeakProgress") != 15) + { + options.listAppend(HTMLGenerateSpanOfClass("First adv", "r_bold") + " A-Boo Peak: gives Twin Peak noncom"); + } + if (!__quest_state["cc_castletop"].finished) + { + options.listAppend("Castle Top Floor"); + } + if (!__quest_state["warProgress"].started) + { + options.listAppend("The Hippy Camp (Verge of War)"); + } + string [int] monsterMaps; + if (!__quest_state["Level 11 Ron"].finished) + { + monsterMaps.listAppend("Red Butler, 30% free kill item and 15% fun drop item. Combine with Olfaction/Use the Force?"); + } + if (get_property_int("twinPeakProgress") < 15 && $item[rusty hedge trimmers].available_amount() < 4) + { + monsterMaps.listAppend("hedge beast, 15% quest progress item. Possibly Spit."); + } + if (__quest_state["Level 9"].state_int["a-boo peak hauntedness"] > 0) + { + monsterMaps.listAppend("Whatsian Commander Ghost, 15% free runaway item. Possibly Spit."); + } + if ($item[star chart].available_amount() < 1 || $item[richard's star key].available_amount() < 1) + { + monsterMaps.listAppend("Astronomer"); + } + if (!__quest_state["Level 12"].state_boolean["Lighthouse Finished"] && $item[barrel of gunpowder].available_amount() < 5) + { + monsterMaps.listAppend("Lobsterfrogman, probably a weak option. Combine with Use the Force?"); + } + if ($location[The Battlefield (Frat Uniform)].turns_spent > 20) + { + monsterMaps.listAppend("Green Ops Soldier. Combine with Olfaction/Use the Force and Spit and Explodinal pills."); + } + + if (options.count() > 0) + description.listAppend("Noncoms of interest:|*-" + options.listJoinComponents("|*-")); + if (monsterMaps.count() > 0) + description.listAppend("Monsters to map:|*-" + monsterMaps.listJoinComponents("|*-")); + + resource_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "", ChecklistSubentryMake(pluralise(maps_left, "Cartography skill use", "Cartography skill uses"), "", description), 5).ChecklistEntrySetIDTag("Cartography skills resource")); } -RegisterResourceGenerationFunction("IOTMComprehensiveCartographyGenerateResource"); -void IOTMComprehensiveCartographyGenerateResource(ChecklistEntry [int] resource_entries) +RegisterTaskGenerationFunction("IOTMCartographyMapsGenerateTasks"); +void IOTMCartographyMapsGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) { - if (!lookupSkill("Map the Monsters").have_skill()) return; - int casts_remaining = 3 - get_property_int("_monstersMapped"); - if (casts_remaining > 0) { - resource_entries.listAppend(ChecklistEntryMake("__skill Map the Monsters", "skillz.php", ChecklistSubentryMake(casts_remaining.pluralise(" monster mapping", " monster mappings") + " remaining", "", "Cast Map the Monsters, for anything on the olfaction list.")).ChecklistEntrySetIDTag("Cartography skill map resource")); - } + { + string [int] description; + string title = "Your mapping senses are activated!"; + description.listAppend(HTMLGenerateSpanFont("Pick your monster!", "blue")); + if (!get_property_boolean("mappingMonsters") == false) { + task_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "url", ChecklistSubentryMake(title, description), -11)); + } + } } From 845c3d061bf7c69807061e36918997423abb7885 Mon Sep 17 00:00:00 2001 From: uthuluc <58225812+uthuluc@users.noreply.github.com> Date: Wed, 9 Dec 2020 11:24:43 -0500 Subject: [PATCH 2/3] Update Comprehensive Cartography.ash --- .../Comprehensive Cartography.ash | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash index e51b29bc..54b0a3bb 100644 --- a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash +++ b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash @@ -5,8 +5,10 @@ void IOTMCartographyMapsGenerateResource(ChecklistEntry [int] resource_entries) int maps_left = clampi(3 - get_property_int("_monstersMapped"), 0, 3); string [int] description; description.listAppend("Map the monsters you want to fight!"); - description.listAppend("This IotM also gives you a special noncom in the following zones:"); string [int] options; + if (__misc_state["in run"] && my_path_id() != PATH_COMMUNITY_SERVICE) + { + description.listAppend("This IotM also gives you a special noncom in the following zones:"); if (!__quest_state["cc_spookyravennecklace"].finished) { options.listAppend("The Haunted Billiards Room"); @@ -24,13 +26,13 @@ void IOTMCartographyMapsGenerateResource(ChecklistEntry [int] resource_entries) options.listAppend(HTMLGenerateSpanOfClass("First adv", "r_bold") + " A-Boo Peak: gives Twin Peak noncom"); } if (!__quest_state["cc_castletop"].finished) - { - options.listAppend("Castle Top Floor"); - } + { + options.listAppend("Castle Top Floor"); + } if (!__quest_state["warProgress"].started) - { - options.listAppend("The Hippy Camp (Verge of War)"); - } + { + options.listAppend("The Hippy Camp (Verge of War)"); + } string [int] monsterMaps; if (!__quest_state["Level 11 Ron"].finished) { @@ -61,19 +63,6 @@ void IOTMCartographyMapsGenerateResource(ChecklistEntry [int] resource_entries) description.listAppend("Noncoms of interest:|*-" + options.listJoinComponents("|*-")); if (monsterMaps.count() > 0) description.listAppend("Monsters to map:|*-" + monsterMaps.listJoinComponents("|*-")); - + } resource_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "", ChecklistSubentryMake(pluralise(maps_left, "Cartography skill use", "Cartography skill uses"), "", description), 5).ChecklistEntrySetIDTag("Cartography skills resource")); } - -RegisterTaskGenerationFunction("IOTMCartographyMapsGenerateTasks"); -void IOTMCartographyMapsGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) -{ - { - string [int] description; - string title = "Your mapping senses are activated!"; - description.listAppend(HTMLGenerateSpanFont("Pick your monster!", "blue")); - if (!get_property_boolean("mappingMonsters") == false) { - task_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "url", ChecklistSubentryMake(title, description), -11)); - } - } -} From 545c36543aeb82a45d956e8be4fd485df2727391 Mon Sep 17 00:00:00 2001 From: uthuluc <58225812+uthuluc@users.noreply.github.com> Date: Wed, 9 Dec 2020 11:25:10 -0500 Subject: [PATCH 3/3] Update Comprehensive Cartography.ash --- .../Comprehensive Cartography.ash | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash index 54b0a3bb..e9ae8657 100644 --- a/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash +++ b/Source/relay/TourGuide/Items of the Month/Comprehensive Cartography.ash @@ -66,3 +66,16 @@ void IOTMCartographyMapsGenerateResource(ChecklistEntry [int] resource_entries) } resource_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "", ChecklistSubentryMake(pluralise(maps_left, "Cartography skill use", "Cartography skill uses"), "", description), 5).ChecklistEntrySetIDTag("Cartography skills resource")); } + +RegisterTaskGenerationFunction("IOTMCartographyMapsGenerateTasks"); +void IOTMCartographyMapsGenerateTasks(ChecklistEntry [int] task_entries, ChecklistEntry [int] optional_task_entries, ChecklistEntry [int] future_task_entries) +{ + { + string [int] description; + string title = "Your mapping senses are activated!"; + description.listAppend(HTMLGenerateSpanFont("Pick your monster!", "blue")); + if (!get_property_boolean("mappingMonsters") == false) { + task_entries.listAppend(ChecklistEntryMake("__item Comprehensive Cartographic Compendium", "url", ChecklistSubentryMake(title, description), -11)); + } + } +}