From d004e14b6160975e09a60ad783e5661bfdf5ee51 Mon Sep 17 00:00:00 2001 From: Sam Gaus Date: Sun, 4 Aug 2024 12:12:58 +0100 Subject: [PATCH 1/4] Get me through the first few adventures of the day --- RELEASE/scripts/autoscend.ash | 2 +- RELEASE/scripts/autoscend/auto_bedtime.ash | 6 +++--- RELEASE/scripts/autoscend/auto_familiar.ash | 5 +++++ RELEASE/scripts/autoscend/iotms/clan.ash | 12 +++++++++++- RELEASE/scripts/autoscend/iotms/mr2016.ash | 6 +++++- RELEASE/scripts/autoscend/iotms/mr2018.ash | 5 +++++ 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash index fa8c8f09a..48e509ecd 100644 --- a/RELEASE/scripts/autoscend.ash +++ b/RELEASE/scripts/autoscend.ash @@ -1094,7 +1094,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])) { diff --git a/RELEASE/scripts/autoscend/auto_bedtime.ash b/RELEASE/scripts/autoscend/auto_bedtime.ash index 59d37ab2e..da8956d71 100644 --- a/RELEASE/scripts/autoscend/auto_bedtime.ash +++ b/RELEASE/scripts/autoscend/auto_bedtime.ash @@ -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"); @@ -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') { @@ -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"); } diff --git a/RELEASE/scripts/autoscend/auto_familiar.ash b/RELEASE/scripts/autoscend/auto_familiar.ash index aa66b3070..1a5765e2a 100644 --- a/RELEASE/scripts/autoscend/auto_familiar.ash +++ b/RELEASE/scripts/autoscend/auto_familiar.ash @@ -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 diff --git a/RELEASE/scripts/autoscend/iotms/clan.ash b/RELEASE/scripts/autoscend/iotms/clan.ash index 02f29c626..ac4e986e8 100644 --- a/RELEASE/scripts/autoscend/iotms/clan.ash +++ b/RELEASE/scripts/autoscend/iotms/clan.ash @@ -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; } @@ -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; @@ -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")) # { diff --git a/RELEASE/scripts/autoscend/iotms/mr2016.ash b/RELEASE/scripts/autoscend/iotms/mr2016.ash index 301e00623..42b389825 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2016.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2016.ash @@ -12,7 +12,7 @@ boolean snojoFightAvailable() { return false; } - if(in_koe()) + if(in_koe() || in_bad_moon()) { return false; } @@ -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; diff --git a/RELEASE/scripts/autoscend/iotms/mr2018.ash b/RELEASE/scripts/autoscend/iotms/mr2018.ash index eccdf6168..d69cf315e 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2018.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2018.ash @@ -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; From 70f9795697a7b1b08663424cf82915db03011dd1 Mon Sep 17 00:00:00 2001 From: Sam Gaus Date: Sun, 4 Aug 2024 12:16:53 +0100 Subject: [PATCH 2/4] No horsery --- RELEASE/scripts/autoscend/iotms/mr2017.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2017.ash b/RELEASE/scripts/autoscend/iotms/mr2017.ash index 99fb7363f..52c6de383 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2017.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2017.ash @@ -1547,7 +1547,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; } From d1c1dac3888a7d1e2efbbf112ce6c29fcf3e9292 Mon Sep 17 00:00:00 2001 From: Sam Gaus Date: Sun, 4 Aug 2024 12:54:58 +0100 Subject: [PATCH 3/4] No BDC --- RELEASE/scripts/autoscend/iotms/mr2018.ash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE/scripts/autoscend/iotms/mr2018.ash b/RELEASE/scripts/autoscend/iotms/mr2018.ash index d69cf315e..6df4695a1 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2018.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2018.ash @@ -1274,7 +1274,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; } From fa49f939433c29270c48acc847f298c55e9c512d Mon Sep 17 00:00:00 2001 From: Sam Gaus Date: Sun, 4 Aug 2024 13:05:35 +0100 Subject: [PATCH 4/4] No NEP --- RELEASE/scripts/autoscend/iotms/mr2018.ash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE/scripts/autoscend/iotms/mr2018.ash b/RELEASE/scripts/autoscend/iotms/mr2018.ash index 6df4695a1..91d64fec5 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2018.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2018.ash @@ -783,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; }