Skip to content

Commit

Permalink
G-Lover Twin Peak without Gs (#1478)
Browse files Browse the repository at this point in the history
Prevents extra adventuring in Twin Peak if unable to create jar of oil using crude oil congealer due to lack of Gs
  • Loading branch information
bustarhymes69 authored Sep 21, 2024
1 parent bc9cdb6 commit 3f93dc4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
4 changes: 2 additions & 2 deletions RELEASE/scripts/autoscend/auto_choice_adv.ash
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,8 @@ boolean auto_run_choice(int choice, string page)
case 605: // Welcome to the Great Overlook Lodge (Twin Peak Part 2)
run_choice(1); // always advance to next option via choice 1
break;
case 606: // Lost in the Great Overlook
if(in_bhy())
case 606: // Lost in the Great Overlook Lodge
if(in_bhy() || in_glover() && item_amount($item[Jar Of Oil]) == 0)
{
// we can't make an oil jar to solve the quest, just adventure until the hotel is burned down
run_choice(6); // and flee the music NC
Expand Down
16 changes: 12 additions & 4 deletions RELEASE/scripts/autoscend/quests/level_09.ash
Original file line number Diff line number Diff line change
Expand Up @@ -899,14 +899,22 @@ boolean L9_oilPeak()
{
if(in_glover())
{
if(item_amount($item[Crude Oil Congealer]) < 1 && item_amount($item[G]) > 2)
{
buy($coinmaster[G-Mart], 1, $item[Crude Oil Congealer]);
}
if(item_amount($item[Crude Oil Congealer]) > 0)
{
use(1, $item[Crude Oil Congealer]);
}
else
{
if(item_amount($item[G]) > 2)
{
buy($coinmaster[G-Mart], 1, $item[Crude Oil Congealer]);
use(1, $item[Crude Oil Congealer]);
}
else
{
return false;
}
}
}
else if(auto_is_valid($item[Bubblin' Crude]) && creatable_amount($item[Jar Of Oil]) > 0)
{
Expand Down

0 comments on commit 3f93dc4

Please sign in to comment.