diff --git a/Source/relay/TourGuide/Items of the Month/2021/Short Order Cook.ash b/Source/relay/TourGuide/Items of the Month/2021/Short Order Cook.ash new file mode 100644 index 00000000..63f731ea --- /dev/null +++ b/Source/relay/TourGuide/Items of the Month/2021/Short Order Cook.ash @@ -0,0 +1,15 @@ +//Shortest-Order Cook +RegisterResourceGenerationFunction("IOTMShortCookGenerateResource"); +void IOTMShortCookGenerateResource(ChecklistEntry [int] resource_entries) +{ + if (!__misc_state["in run"]) return; + int shartCookCharge = get_property_int("_shortOrderCookCharge"); + string [int] description; + string url = "familiar.php"; + string subtitle = "also, use your cook to feed XP to another familiar"; + if (shartCookCharge < 11) + { + description.listAppend("Use the short cook to get a +10 famwt potion."); + resource_entries.listAppend(ChecklistEntryMake("__familiar shorter-order cook", url, ChecklistSubentryMake(shartCookCharge + "/11 Shorter-Order Cook charge", "", description), 8)); + } +} \ No newline at end of file diff --git a/Source/relay/TourGuide/Items of the Month/2023/August Scepter.ash b/Source/relay/TourGuide/Items of the Month/2023/August Scepter.ash index d4ecea29..004067bd 100644 --- a/Source/relay/TourGuide/Items of the Month/2023/August Scepter.ash +++ b/Source/relay/TourGuide/Items of the Month/2023/August Scepter.ash @@ -259,9 +259,18 @@ void IOTMAugustScepterGenerateResource(ChecklistEntry [int] resource_entries) allSkills.listAppend(listMake(HTMLGenerateSpanOfClass("Day", "r_bold"), HTMLGenerateSpanOfClass("Gives you...", "r_bold"))); + + // Have to do this to ensure the tooltip orders appropriately + string [int] allAugustSkills; + foreach augSkill, augSkillValue in __augSkillsToValue { + allAugustSkills[grabNumber(augSkill)] = augSkill; + } + + // Now that it is correctly iterating in order, color appropriately and build the allSkill table. + foreach augSkillNumber, augSkill in allAugustSkills { string lineColor = "black"; - int augSkillNumber = grabNumber(augSkill); + string augSkillValue = __augSkillsToValue[augSkill]; // Color the "free" skill in blue if they're in aftercore if (!__misc_state["in run"] && augSkillNumber == todaySkillInt) lineColor = "blue"; @@ -272,9 +281,9 @@ void IOTMAugustScepterGenerateResource(ChecklistEntry [int] resource_entries) // give a tip of the cap to the ol tools here buffer tooltip; - tooltip.append(HTMLGenerateTagWrap("div", "No, TourGuide, show me ALL the skills", mapMake("class", "r_bold r_centre", "style", "padding-bottom:0.25em;"))); + tooltip.append(HTMLGenerateTagWrap("div", "Well, you asked for it!", mapMake("class", "r_bold r_centre", "style", "padding-bottom:0.25em;"))); tooltip.append(HTMLGenerateSimpleTableLines(allSkills)); - string tooltipEnumerated = HTMLGenerateSpanOfClass(HTMLGenerateSpanOfClass(tooltip, "r_tooltip_inner_class r_tooltip_inner_class_margin") + "ALL the dang skills", "r_tooltip_outer_class"); + string tooltipEnumerated = HTMLGenerateSpanOfClass(HTMLGenerateSpanOfClass(tooltip, "r_tooltip_inner_class r_tooltip_inner_class_margin") + "No, TourGuide, show me ALL the skills.", "r_tooltip_outer_class"); description.listAppend(tooltipEnumerated); resource_entries.listAppend(ChecklistEntryMake("__item August Scepter", "skillz.php", ChecklistSubentryMake(title, subtitle, description), -1).ChecklistEntrySetIDTag("August Scepter resource")); diff --git a/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash b/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash index e36df1e6..c2748d52 100644 --- a/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash +++ b/Source/relay/TourGuide/Items of the Month/Items of the Month import.ash @@ -105,7 +105,7 @@ import "relay/TourGuide/Items of the Month/2021/Miniature Crystal Ball.ash"; import "relay/TourGuide/Items of the Month/2021/Emotion Chip.ash"; import "relay/TourGuide/Items of the Month/2021/Potted Power Plant.ash"; import "relay/TourGuide/Items of the Month/2021/Backup Camera.ash"; -// Missing: Shortest-Order Cook +import "relay/TourGuide/Items of the Month/2021/Short Order Cook.ash"; import "relay/TourGuide/Items of the Month/2021/Familiar Scrapbook.ash"; import "relay/TourGuide/Items of the Month/2021/Underground Fireworks Shop.ash"; // Missing: Candles diff --git a/Source/relay/relay_TourGuide.ash b/Source/relay/relay_TourGuide.ash index ee6cb732..4016a58f 100644 --- a/Source/relay/relay_TourGuide.ash +++ b/Source/relay/relay_TourGuide.ash @@ -1,6 +1,6 @@ //This script and its support scripts are in the public domain. -since r27519; // Eagle & Scepter supported +since r27521; // Eagle & Scepter supported import "relay/TourGuide/Main.ash" void main()