From 78b9bdf763c3f7b50ad4421b12a11fc7e16337f6 Mon Sep 17 00:00:00 2001 From: Aaron McGuire Date: Mon, 28 Aug 2023 23:55:05 -0400 Subject: [PATCH] typos + fixing eagle tile --- Source/relay/TourGuide/Pulls.ash | 9 +++++---- Source/relay/TourGuide/Sets/Active Banishes.ash | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/relay/TourGuide/Pulls.ash b/Source/relay/TourGuide/Pulls.ash index 5361cc3c..c7dc6537 100644 --- a/Source/relay/TourGuide/Pulls.ash +++ b/Source/relay/TourGuide/Pulls.ash @@ -638,9 +638,10 @@ void generatePullList(Checklist [int] checklists) int hospital_progress = get_property_int("hiddenHospitalProgress"); if (hospital_progress < 7) { - if (__misc_state["Torso aware"]) item [int] + item [int] missingSurgeonComponents; + if (__misc_state["Torso aware"]) missingSurgeonComponents = items_missing($items[bloodied surgical dungarees,surgical mask,head mirror,half-size scalpel,surgical apron]); - if (!__misc_state["Torso aware"]) item [int] + if (!__misc_state["Torso aware"]) missingSurgeonComponents = items_missing($items[bloodied surgical dungarees,surgical mask,head mirror,half-size scalpel]); if (missingSurgeonComponents.count() > 0) @@ -654,7 +655,7 @@ void generatePullList(Checklist [int] checklists) boolean hiddenTavernUnlocked = get_property_ascension("hiddenTavernUnlock"); if ($item[book of matches].available_amount() == 0 && !hiddenTavernUnlocked) { - pullable_item_list.listAppend(GPItemMake($item[book of matches], "Unlock Cursed Punch & Bowl of Scorpions for Hidden City turnsaving", bowlingBallsNeeded)); + pullable_item_list.listAppend(GPItemMake($item[book of matches], "Unlock Cursed Punch & Bowl of Scorpions for Hidden City turnsaving", 1)); } // Can pull a bowling ball, I guess. @@ -734,7 +735,7 @@ void generatePullList(Checklist [int] checklists) // If the user can use a red rocket, and user doesn't have a cleaver, suggest pulling a guilty sprout if (__misc_state["in run"] && __misc_state["can eat just about anything"] && available_amount($item[Clan VIP Lounge key]) > 0 && get_property("_fireworksShop").to_boolean() && my_path().id != PATH_G_LOVER) { - if (!__iotms_usable[$item["June Cleaver"]]) { + if (!__iotms_usable[$item[June Cleaver]]) { int sproutStats = MAX(0, 4 * 225 * (1.0 + numeric_modifier(my_primestat().to_string() + " Experience Percent") / 100.0)); pullable_item_list.listAppend(GPItemMake($item[guilty sprout],"Food; gain "+sproutStats+" stats with a red-rocketed sprout!")); } diff --git a/Source/relay/TourGuide/Sets/Active Banishes.ash b/Source/relay/TourGuide/Sets/Active Banishes.ash index 86b727b9..8aa1bb92 100644 --- a/Source/relay/TourGuide/Sets/Active Banishes.ash +++ b/Source/relay/TourGuide/Sets/Active Banishes.ash @@ -166,7 +166,7 @@ void ActiveBanishesList(ChecklistEntry [int] resource_entries) phylum phylumBanished = $phylum[none]; int monsterCount = 0; - if (phylaResult.length() > 0) { + if (phylaResult.count() > 0) { name = "Current Phyla Banished"; int screechCharge = get_property_int("screechCombats");