diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash index d8e23026a..8047980e5 100644 --- a/RELEASE/scripts/autoscend.ash +++ b/RELEASE/scripts/autoscend.ash @@ -1,4 +1,4 @@ -since r27374; // track noncombat forcers +since r27402; // Coinmaster support for Mr. Replica /*** autoscend_header.ash must be first import All non-accessory scripts must be imported here @@ -1107,6 +1107,27 @@ boolean dailyEvents() } } + if(!isActuallyEd() && my_daycount() > 1) + { + pullXWhenHaveY($item[Breathitin™], 1, 0); + if (item_amount($item[Breathitin™]) > 0) + { + use(1, $item[Breathitin™]); // get free outdoor fight charges + auto_log_info("Huffing some Breathitin before adventuring for the day. That's the stuff!","blue"); + } + } + + if(freeCrafts() == 0 && canChew($item[Homebodyl™]) && spleen_left() >= $item[Homebodyl™].spleen) + { + pullXWhenHaveY($item[Homebodyl™], 1, 0); + if (item_amount($item[Homebodyl™]) > 0) + { + use(1, $item[Homebodyl™]); // get free craft charges + auto_log_info("Huffing some Homebodyl and hyperfocusing on kitchen-grade demolitions.","blue"); + } + } + + auto_getGuzzlrCocktailSet(); auto_latheAppropriateWeapon(); auto_harvestBatteries(); diff --git a/RELEASE/scripts/autoscend/iotms/mr2015.ash b/RELEASE/scripts/autoscend/iotms/mr2015.ash index d79dd4983..a6f2aba36 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2015.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2015.ash @@ -613,7 +613,7 @@ boolean chateauPainting() boolean deck_available() { - return ((item_amount($item[Deck of Every Card]) > 0) && is_unrestricted($item[Deck of Every Card]) && auto_is_valid($item[Deck of Every Card])); + return (((item_amount($item[Deck of Every Card]) > 0) && is_unrestricted($item[Deck of Every Card]) && auto_is_valid($item[Deck of Every Card])) || ((item_amount($item[Replica Deck of Every Card]) > 0) && (in_lol()))); } int deck_draws_left() @@ -644,7 +644,17 @@ boolean deck_draw() { return false; } - string page = visit_url("inv_use.php?pwd=&which=3&whichitem=8382"); + + string deckItemId = ""; + if(in_lol()) + { + deckItemId = "11230"; + } + else + { + deckItemId = "8382"; + } + string page = visit_url("inv_use.php?cheat=1&pwd=&whichitem=" + deckItemId); page = visit_url("choice.php?pwd=&whichchoice=1085&option=1", true); return true; } @@ -779,8 +789,18 @@ boolean deck_cheat(string cheat) } } + string deckItemId = ""; - string page = visit_url("inv_use.php?cheat=1&pwd=&whichitem=8382"); + if(in_lol()) + { + //replica Deck id for when in Legacy of Loathing + deckItemId = "11230"; + } + else + { + deckItemId = "8382"; + } + string page = visit_url("inv_use.php?cheat=1&pwd=&whichitem=" + deckItemId); // Check that a valid card was selected, otherwise this wastes 5 draws. if(card != 0) diff --git a/RELEASE/scripts/autoscend/iotms/mr2023.ash b/RELEASE/scripts/autoscend/iotms/mr2023.ash index 2260636f0..d2b1ef25f 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2023.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2023.ash @@ -263,3 +263,18 @@ boolean shouldCinchoConfetti() // canSurvive checked in calling location. This function is only available to combat files return true; } + +boolean auto_haveCatalog() +{ + // check for normal version + static item catalog = $item[2002 Mr. Store Catalog]; + if(auto_is_valid(catalog) && (item_amount(catalog) > 0)) + { + return true; + } + + // check for replica in LoL path + static item replicaCatalog = $item[replica 2002 Mr. Store Catalog]; + return auto_is_valid(replicaCatalog) && (item_amount(replicaCatalog) > 0); + +} \ No newline at end of file diff --git a/RELEASE/scripts/autoscend/paths/legacy_of_loathing.ash b/RELEASE/scripts/autoscend/paths/legacy_of_loathing.ash index f472dc34b..319b22540 100644 --- a/RELEASE/scripts/autoscend/paths/legacy_of_loathing.ash +++ b/RELEASE/scripts/autoscend/paths/legacy_of_loathing.ash @@ -31,10 +31,14 @@ boolean lol_buyReplicas() // attempt to buy 2023 IOTM first as if you one them, they are immediately available // then attempt to buy sequentially year by year starting with 2004 // note with enough progress, can a second option up to year 2012 - if(contains_text(page, "cincho")) //2023 + if(contains_text(page, "cincho")) //May 2023 { buy($coinmaster[Replica Mr. Store], 1, $item[replica Cincho de Mayo]); } + //else if(contains_text(page,"2002")) //June 2023 + //{ + // buy($coinmaster[Replica Mr. Store], 1, $item[Replica 2002 Mr. Store Catalog]); //no mafia support yet, but at least buy it + //} else if(contains_text(page, "2004")) { if(!contains_text(page, "replica dark jill-o-lantern") || !contains_text(page, "replica hand turkey outline")) @@ -206,13 +210,18 @@ boolean lol_buyReplicas() void auto_LegacyOfLoathingDailies() { - if(item_amount($item[replica Libram of Resolutions]) > 0) + if(item_amount($item[replica Libram of Resolutions]) > 0 && get_property("_replicaResolutionsLibramUsed") == "false") { use(1, $item[replica Libram of Resolutions]); // get items } - if(item_amount($item[replica Smith\'s Tome]) > 0) + if(item_amount($item[replica Smith\'s Tome]) > 0 && get_property("_replicaSmithsTomeUsed") == "false") { use(1, $item[replica Smith\'s Tome]); // get items } + + if(item_amount($item[Replica 2002 Mr. Store Catalog]) > 0 && get_property("_2002MrStoreCreditsCollected") == "false") + { + use(1, $item[Replica 2002 Mr. Store Catalog]); //get catalog credits + } } diff --git a/RELEASE/scripts/autoscend/quests/level_05.ash b/RELEASE/scripts/autoscend/quests/level_05.ash index 283ea1560..90ef8d05f 100644 --- a/RELEASE/scripts/autoscend/quests/level_05.ash +++ b/RELEASE/scripts/autoscend/quests/level_05.ash @@ -30,6 +30,20 @@ boolean L5_getEncryptionKey() } } + if(!isActuallyEd() && canChew($item[Breathitin™]) && spleen_left() >= $item[Breathitin™].spleen)) + { + pullXWhenHaveY($item[Breathitin™], 1, 0); + if (item_amount($item[Breathitin™]) > 0) + { + use(1, $item[Breathitin™]); // get free outdoor fight charges + auto_log_info("Huffing some Breathitin before looking for the encryption key. That's the stuff!","blue"); + } + else + { + auto_log_info("Couldn't pull a Breathitin. Be a lot cooler if we could.","red"); + } + } + auto_log_info("Looking for the knob.", "blue"); return autoAdv($location[The Outskirts of Cobb\'s Knob]); } diff --git a/RELEASE/scripts/autoscend/quests/level_09.ash b/RELEASE/scripts/autoscend/quests/level_09.ash index 3e8425e7a..dd5288628 100644 --- a/RELEASE/scripts/autoscend/quests/level_09.ash +++ b/RELEASE/scripts/autoscend/quests/level_09.ash @@ -309,7 +309,16 @@ boolean L9_chasmBuild() // make sure our progress count is correct before we do anything. visit_url("place.php?whichplace=orc_chasm&action=bridge"+(to_int(get_property("chasmBridgeProgress")))); + // pull a keepsake box if we can + pullXWhenHaveY($item[smut orc keepsake box], 1, 0); + if (item_amount($item[smut orc keepsake box]) > 0) + { + use(1, $item[smut orc keepsake box]); // get bridge parts + auto_log_info("Pulled a smut orc keepsake box and opened it. Ew.","blue"); + } + // use any keepsake boxes we have + if(item_amount($item[Smut Orc Keepsake Box]) > 0 && auto_is_valid($item[Smut Orc Keepsake Box])) { use(1, $item[Smut Orc Keepsake Box]);