Skip to content

Commit

Permalink
KOE and auto_choice_adv Cleanup (#1392)
Browse files Browse the repository at this point in the history
lets KOE work again
  • Loading branch information
bustarhymes69 authored Nov 24, 2023
1 parent 47677c5 commit eff72ea
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 22 deletions.
34 changes: 16 additions & 18 deletions RELEASE/scripts/autoscend/auto_choice_adv.ash
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion RELEASE/scripts/autoscend/auto_util.ash
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 8 additions & 2 deletions RELEASE/scripts/autoscend/iotms/mr2022.ash
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,12 @@ boolean auto_juneCleaverAdventure()
if (autoEquip($slot[weapon], $item[June cleaver]))
{
return autoAdv($location[The Dire Warren]);
location cleaverLoc = $location[The Dire Warren];
if (in_koe())
{
cleaverLoc = $location[Cobb's Knob Treasury]; // arbitrarily picked always accessible location
}
return autoAdv(cleaverLoc);
}
return false;
}
Expand Down Expand Up @@ -672,7 +677,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))
Expand Down
2 changes: 1 addition & 1 deletion RELEASE/scripts/autoscend/quests/level_any.ash
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit eff72ea

Please sign in to comment.