diff --git a/RELEASE/scripts/autoscend/auto_familiar.ash b/RELEASE/scripts/autoscend/auto_familiar.ash index b8d44ab3a2..cfddd6bae9 100644 --- a/RELEASE/scripts/autoscend/auto_familiar.ash +++ b/RELEASE/scripts/autoscend/auto_familiar.ash @@ -807,11 +807,12 @@ void preAdvUpdateFamiliar(location place) } } - if(my_familiar() == $familiar[Jill-of-All-Trades] && item_amount($item[LED candle]) > 0) + if(my_familiar() == $familiar[Jill-of-All-Trades] && possessEquipment($item[LED candle]) > 0) { // maximizer uses whatever mode LED candle is in, won't change it // so ensure in correct mode prior to maximizing auto_handleJillOfAllTrades(); + autoEquip($item[LED Candle]); // force maximizer to equip it when we have it. } if(auto_checkFamiliarMummery(my_familiar())) diff --git a/RELEASE/scripts/autoscend/iotms/mr2021.ash b/RELEASE/scripts/autoscend/iotms/mr2021.ash index 339ec55af5..8f0a6229fb 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2021.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2021.ash @@ -923,14 +923,17 @@ void auto_CMCconsult() bestOption = 5; consumableBought = $item[Breathitin™]; } - else if(contains_text(page, "Homebodyl") && freeCrafts() < 5) + else if (!(auto_is_valid($familiar[cookbookbat]) && have_familiar($familiar[cookbookbat]) && knoll_available()) && contains_text(page, "Homebodyl") && freeCrafts() < 5) { + // don't need free crafts if we have the Cookbookbat in knoll signs. + // Cookbookbat gives us 5 free cooks every day & we only use free crafting on cooking in knoll signs auto_log_info("Buying Homebodyl pill from CMC", "blue"); bestOption = 5; consumableBought = $item[Homebodyl™]; } - else if(contains_text(page, "ice crown")) + else if ((!in_small() || in_hardcore()) && contains_text(page, "ice crown")) { + // don't need the ice crown in Normal Small as we pull hats. auto_log_info("Buying ice crown from CMC", "blue"); bestOption = 1; } @@ -940,7 +943,7 @@ void auto_CMCconsult() bestOption = 5; consumableBought = $item[Fleshazole™]; } - else if(auto_CMCconsultsLeft() > 2 && !can_interact()) + else if (auto_CMCconsultsLeft() > 2 && !can_interact() && !in_small()) { //reserve the last 2 consults for something more valuable than booze/food //consume logic will drink/eat later