Skip to content

Commit

Permalink
equip LED Candle and some CMC tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Malibu-Stacey committed Oct 23, 2023
1 parent c6213f2 commit 17ef58a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion RELEASE/scripts/autoscend/auto_familiar.ash
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
9 changes: 6 additions & 3 deletions RELEASE/scripts/autoscend/iotms/mr2021.ash
Original file line number Diff line number Diff line change
Expand Up @@ -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&trade;];
}
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;
}
Expand All @@ -940,7 +943,7 @@ void auto_CMCconsult()
bestOption = 5;
consumableBought = $item[Fleshazole&trade;];
}
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
Expand Down

0 comments on commit 17ef58a

Please sign in to comment.