Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better Bad Moon Support #1479

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE/scripts/autoscend.ash
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ boolean dailyEvents()
put_closet(1, $item[empty rain-doh can]);
}

if(item_amount($item[Clan VIP Lounge Key]) > 0)
if(item_amount($item[Clan VIP Lounge Key]) > 0 && !in_bad_moon())
{
if(!get_property("_olympicSwimmingPoolItemFound").to_boolean() && is_unrestricted($item[Olympic-sized Clan Crate]))
{
Expand Down
6 changes: 3 additions & 3 deletions RELEASE/scripts/autoscend/auto_bedtime.ash
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ boolean doBedtime()
}
}

if((is_unrestricted($item[Clan Pool Table])) && (get_property("_poolGames").to_int() < 3) && (item_amount($item[Clan VIP Lounge Key]) > 0))
if((is_unrestricted($item[Clan Pool Table])) && !in_bad_moon() && (get_property("_poolGames").to_int() < 3) && (item_amount($item[Clan VIP Lounge Key]) > 0))
{
visit_url("clan_viplounge.php?preaction=poolgame&stance=1");
visit_url("clan_viplounge.php?preaction=poolgame&stance=1");
Expand Down Expand Up @@ -904,7 +904,7 @@ boolean doBedtime()
}

dailyEvents();
if((get_property("auto_clanstuff").to_int() < my_daycount()) && (get_clan_id() != -1))
if((get_property("auto_clanstuff").to_int() < my_daycount()) && (get_clan_id() != -1) && !in_bad_moon())
{
if(get_property("_klawSummons").to_int() == 0 && get_clan_rumpus() contains 'Mr. Klaw "Skill" Crane Game')
{
Expand Down Expand Up @@ -1297,7 +1297,7 @@ boolean doBedtime()
{
auto_log_info(yellowRay_str);
}
if(!get_property("_photocopyUsed").to_boolean() && (is_unrestricted($item[Deluxe Fax Machine])) && (my_adventures() > 0) && !(is_boris() || is_jarlsberg() || is_pete()) && (item_amount($item[Clan VIP Lounge Key]) > 0))
if(!get_property("_photocopyUsed").to_boolean() && (is_unrestricted($item[Deluxe Fax Machine])) && (my_adventures() > 0) && !(is_boris() || is_jarlsberg() || is_pete() || in_bad_moon()) && (item_amount($item[Clan VIP Lounge Key]) > 0))
{
auto_log_info("You may have a fax that you can use. Check it out!", "blue");
}
Expand Down
5 changes: 5 additions & 0 deletions RELEASE/scripts/autoscend/auto_familiar.ash
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@ void preAdvUpdateFamiliar(location place)
{
return; //will just error in those paths
}
if (in_bad_moon() && !have_familiar($familiar[Mosquito]))
{
// Since we start with no familiars, this can fail here too but succeed later.
return;
}
if(is100FamRun())
{
handleFamiliar(get_property("auto_100familiar").to_familiar()); //do not break 100 familiar runs
Expand Down
12 changes: 11 additions & 1 deletion RELEASE/scripts/autoscend/iotms/clan.ash
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ boolean handleFaxMonster(monster enemy, boolean fightIt, string option)
{
return false;
}
if(is_boris() || is_jarlsberg() || is_pete() || in_glover())
if(is_boris() || is_jarlsberg() || is_pete() || in_glover() || in_bad_moon())
{
return false;
}
Expand Down Expand Up @@ -345,6 +345,11 @@ boolean zataraAvailable()
return false;
}

if(in_bad_moon())
{
return false;
}

if(!(auto_get_clan_lounge() contains $item[Clan Carnival Game]))
{
return false;
Expand Down Expand Up @@ -419,6 +424,11 @@ boolean zataraClanmate()
return false;
}

if (in_bad_moon())
{
return false;
}

# string page = visit_url("clan_viplounge.php");
# if(!contains_text(page, "lovetester"))
# {
Expand Down
6 changes: 5 additions & 1 deletion RELEASE/scripts/autoscend/iotms/mr2016.ash
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ boolean snojoFightAvailable()
{
return false;
}
if(in_koe())
if(in_koe() || in_bad_moon())
{
return false;
}
Expand Down Expand Up @@ -592,6 +592,10 @@ item auto_bestBadge()

boolean auto_doPrecinct()
{
if (in_bad_moon())
{
return false;
}
if(!is_unrestricted($item[Detective School Application]))
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion RELEASE/scripts/autoscend/iotms/mr2017.ash
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,7 @@ string horseNormalize(string horseText)

boolean getHorse(string type)
{
if(!get_property("horseryAvailable").to_boolean())
if(!get_property("horseryAvailable").to_boolean() || in_bad_moon())
{
return false;
}
Expand Down
11 changes: 10 additions & 1 deletion RELEASE/scripts/autoscend/iotms/mr2018.ash
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ boolean fantasyRealmToken()
return false;
}

if (in_bad_moon())
{
return false;
}

if((get_property("frAlways").to_boolean() || get_property("_frToday").to_boolean()) && !possessEquipment($item[FantasyRealm G. E. M.]))
{
int option = 1;
Expand Down Expand Up @@ -778,6 +783,10 @@ boolean neverendingPartyAvailable()
// Can't adventure if the quest is complete for the day.
return false;
}
if (in_bad_moon())
{
return false;
}
return true;
}

Expand Down Expand Up @@ -1269,7 +1278,7 @@ boolean auto_voteMonster(boolean freeMon, location loc)

boolean fightClubNap()
{
if(!is_unrestricted($item[Boxing Day care package]))
if(!is_unrestricted($item[Boxing Day care package]) || in_bad_moon())
{
return false;
}
Expand Down
Loading