From 707b40740edb6cacaf5b51e6d7583974e772223a Mon Sep 17 00:00:00 2001 From: bustarhymes69 <79654812+bustarhymes69@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:31:15 -0800 Subject: [PATCH 1/5] KOE and auto_choice_adv Cleanup lets KOE work again --- RELEASE/scripts/autoscend/auto_choice_adv.ash | 34 +++++++++---------- RELEASE/scripts/autoscend/auto_util.ash | 6 +++- RELEASE/scripts/autoscend/iotms/mr2022.ash | 5 +-- .../scripts/autoscend/quests/level_any.ash | 2 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/RELEASE/scripts/autoscend/auto_choice_adv.ash b/RELEASE/scripts/autoscend/auto_choice_adv.ash index a94fb1dce..178d18dc2 100644 --- a/RELEASE/scripts/autoscend/auto_choice_adv.ash +++ b/RELEASE/scripts/autoscend/auto_choice_adv.ash @@ -414,7 +414,7 @@ boolean auto_run_choice(int choice, string page) run_choice(6); // skip break; case 888: // Take a Look, it's in a Book! (Rise) (The Haunted Library) - run_choice(4); // skip + run_choice(5); // skip break; case 889: // Take a Look, it's in a Book! (Fall) (The Haunted Library) if(item_amount($item[dictionary]) == 0 && get_property("auto_getDictionary").to_boolean()) @@ -624,18 +624,18 @@ boolean auto_run_choice(int choice, string page) case 1436: // Billiards Room Options (Cartography) cartographyChoiceHandler(choice); break; - case 1467: - case 1468: - case 1469: - case 1470: - case 1471: - case 1472: - case 1473: - case 1474: - case 1475: + case 1467: // Poetic Justice (Cleaver) + case 1468: // Aunts not Ants (Cleaver) + case 1469: // Beware of Aligator (Cleaver) + case 1470: // Teacher's Pet (Cleaver) + case 1471: // Lost and Found (Cleaver) + case 1472: // Summer Days (Cleaver) + case 1473: // Bath Time (Cleaver) + case 1474: // Delicious Sprouts (Cleaver) + case 1475: // Hypnotic Master (Cleaver) juneCleaverChoiceHandler(choice); break; - case 1491: //Strange Stalagmite(s) (Strange stalagmite from Rock Garden) + case 1491: // Strange Stalagmite(s) (Rock Garden) if(my_primestat() == $stat[Muscle]) { run_choice(1); // muscle stats @@ -649,23 +649,21 @@ boolean auto_run_choice(int choice, string page) run_choice(3); // moxie stats } break; - case 1494: + case 1494: // Examine S.I.T. Course Certificate (S.I.T Course) if(my_level() < 8) { - run_choice(3); //Cryptobotanist (S.I.T. Course) + run_choice(3); // Cryptobotanist (S.I.T. Course) } else { - run_choice(2); //Insectologist (S.I.T. Course) + run_choice(2); // Insectologist (S.I.T. Course) } break; case 1497: // Calling Rufus - // get artifact quest - run_choice(2); + run_choice(2); // get artifact quest break; case 1500: // Like a Loded Stone - // Only come here to get shadow waters buff - run_choice(2); + run_choice(2); // only come here to get shadow waters buff break; default: break; diff --git a/RELEASE/scripts/autoscend/auto_util.ash b/RELEASE/scripts/autoscend/auto_util.ash index 0b62d03ca..b3822c434 100644 --- a/RELEASE/scripts/autoscend/auto_util.ash +++ b/RELEASE/scripts/autoscend/auto_util.ash @@ -2442,12 +2442,16 @@ boolean have_skills(boolean[skill] array) //From Bale\'s woods.ash relay script. boolean woods_questStart() { - if (internalQuestStatus("questL02Larva") < 0 && internalQuestStatus("questG02Whitecastle") < 0) + if(internalQuestStatus("questL02Larva") < 0 && internalQuestStatus("questG02Whitecastle") < 0) { // distant woods access is gated behind level 2 quest & whitey's grove quest. // for some reason mafia doesn't track this any other way return false; } + if(in_koe()) // no access to woods or forest village in KoE + { + return false; + } if(available_amount($item[Continuum Transfunctioner]) > 0) { return false; diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index 408ab006f..6e83ca3d6 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -251,7 +251,7 @@ boolean auto_canUseJuneCleaver() { boolean auto_juneCleaverAdventure() { - if (!auto_canUseJuneCleaver() || get_property("_juneCleaverFightsLeft").to_int() > 0) + if (!auto_canUseJuneCleaver() || get_property("_juneCleaverFightsLeft").to_int() > 0 || !zone_isAvailable($location[The Dire Warren])) { return false; } @@ -672,7 +672,8 @@ boolean auto_autumnatonQuest() if(auto_autumnatonCheckForUpgrade("leftarm1") && auto_autumnatonCheckForUpgrade("rightarm1") && item_amount($item[barrel of gunpowder]) < 5 && - get_property("sidequestLighthouseCompleted") == "none") + get_property("sidequestLighthouseCompleted") == "none" && + !in_koe()) { location targetLocation = $location[Sonofa Beach]; if(!auto_autumnatonCanAdv(targetLocation) && zone_available(targetLocation)) diff --git a/RELEASE/scripts/autoscend/quests/level_any.ash b/RELEASE/scripts/autoscend/quests/level_any.ash index ea01f7553..3b5c3df6c 100644 --- a/RELEASE/scripts/autoscend/quests/level_any.ash +++ b/RELEASE/scripts/autoscend/quests/level_any.ash @@ -341,7 +341,7 @@ boolean LX_islandAccess() boolean startHippyBoatmanSubQuest() { - if(my_basestat(my_primestat()) >= 25 && get_property("questM19Hippy") == "unstarted") + if(my_basestat(my_primestat()) >= 25 && get_property("questM19Hippy") == "unstarted" && !in_koe()) { string temp = visit_url("place.php?whichplace=woods&action=woods_smokesignals"); temp = visit_url("choice.php?pwd=&whichchoice=798&option=1"); From b1e3f9f96bda159928998e8450228a9015eb5023 Mon Sep 17 00:00:00 2001 From: bustarhymes69 <79654812+bustarhymes69@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:10:03 -0800 Subject: [PATCH 2/5] Updated Cleaver Location Cleaver location changed in KoE --- RELEASE/scripts/autoscend/iotms/mr2022.ash | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index 6e83ca3d6..91ee169aa 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -251,14 +251,21 @@ boolean auto_canUseJuneCleaver() { boolean auto_juneCleaverAdventure() { - if (!auto_canUseJuneCleaver() || get_property("_juneCleaverFightsLeft").to_int() > 0 || !zone_isAvailable($location[The Dire Warren])) + if (!auto_canUseJuneCleaver() || get_property("_juneCleaverFightsLeft").to_int() > 0) { return false; } if (autoEquip($slot[weapon], $item[June cleaver])) { - return autoAdv($location[The Dire Warren]); + if (in_koe()) + { + autoAdv($location[Cobb's Knob Treasury]); // arbitrarily picked always accessible location + } + else + { + autoAdv($location[The Dire Warren]); + } } return false; } From 745e6e320b063a0f192d71491e6945804a3b513e Mon Sep 17 00:00:00 2001 From: Malibu Stacey <50261170+Malibu-Stacey@users.noreply.github.com> Date: Fri, 24 Nov 2023 11:06:31 -0800 Subject: [PATCH 3/5] Update mr2022.ash --- RELEASE/scripts/autoscend/iotms/mr2022.ash | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index 91ee169aa..a448b09e6 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -258,14 +258,12 @@ boolean auto_juneCleaverAdventure() if (autoEquip($slot[weapon], $item[June cleaver])) { + location cleaverLoc = $location[The Dire Warren]; if (in_koe()) { - autoAdv($location[Cobb's Knob Treasury]); // arbitrarily picked always accessible location - } - else - { - autoAdv($location[The Dire Warren]); + cleaverLoc = $location[Cobb's Knob Treasury]); // arbitrarily picked always accessible location } + autoAdv(cleaverLoc); } return false; } From b7e74ab5fbbf325c940d1d16c5288e79323aa966 Mon Sep 17 00:00:00 2001 From: Malibu Stacey <50261170+Malibu-Stacey@users.noreply.github.com> Date: Fri, 24 Nov 2023 11:14:00 -0800 Subject: [PATCH 4/5] Update mr2022.ash --- RELEASE/scripts/autoscend/iotms/mr2022.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index a448b09e6..5a79750ed 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -263,7 +263,7 @@ boolean auto_juneCleaverAdventure() { cleaverLoc = $location[Cobb's Knob Treasury]); // arbitrarily picked always accessible location } - autoAdv(cleaverLoc); + return autoAdv(cleaverLoc); } return false; } From 0493272c98dd64c8f0a73d33170344dd4bfa6608 Mon Sep 17 00:00:00 2001 From: Malibu Stacey <50261170+Malibu-Stacey@users.noreply.github.com> Date: Fri, 24 Nov 2023 11:16:44 -0800 Subject: [PATCH 5/5] Update mr2022.ash --- RELEASE/scripts/autoscend/iotms/mr2022.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index 5a79750ed..32957355d 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -261,7 +261,7 @@ boolean auto_juneCleaverAdventure() location cleaverLoc = $location[The Dire Warren]; if (in_koe()) { - cleaverLoc = $location[Cobb's Knob Treasury]); // arbitrarily picked always accessible location + cleaverLoc = $location[Cobb's Knob Treasury]; // arbitrarily picked always accessible location } return autoAdv(cleaverLoc); }