Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into lucky_and_tracker
Browse files Browse the repository at this point in the history
  • Loading branch information
@HippoKingKoL
HippoKingKoL committed Jan 22, 2025
2 parents ee541c6 + 1aa782e commit 4209a57
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 37 deletions.
5 changes: 3 additions & 2 deletions RELEASE/scripts/autoscend/auto_bedtime.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,8 +1016,8 @@ boolean doBedtime()
if(in_glover())
{
auto_sourceTerminalEnhance("damage");
enhances -= 1;
}
enhances -= 1;
}
else
{
auto_sourceTerminalEnhance("items");
Expand Down Expand Up @@ -1316,6 +1316,7 @@ boolean doBedtime()
acquireMilkOfMagnesiumIfUnused(true);
consumeMilkOfMagnesiumIfUnused();
auto_scepterRollover();
if(have_skill($skill[Calculate the Universe]) && auto_is_valid($skill[Calculate the Universe]) && (get_property("_universeCalculated").to_int() < min(3, get_property("skillLevel144").to_int())))
{
Expand Down
1 change: 1 addition & 0 deletions RELEASE/scripts/autoscend/autoscend_header.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ void auto_useBlackMonolith();
int auto_dousesRemaining();
boolean auto_haveAugustScepter();
void auto_scepterSkills();
void auto_scepterRollover();
void auto_lostStomach();
boolean auto_haveBofa();
boolean auto_canHabitat();
Expand Down
91 changes: 58 additions & 33 deletions RELEASE/scripts/autoscend/iotms/mr2023.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,55 +608,80 @@ void auto_scepterSkills()
{
return;
}
//Day 1 skills
if(my_daycount() == 1)

if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
{
if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
{
use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
}
if(canUse($skill[Aug. 30th: Beach Day!]) && !get_property("_aug30Cast").to_boolean())
use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
}
if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && pathHasFamiliar())
{
familiar hundred_fam = to_familiar(get_property("auto_100familiar"));
if (((in_avantGuard() && in_hardcore()) || (hundred_fam != $familiar[none] && (isAttackFamiliar(hundred_fam) || hundred_fam.block))) && have_familiar(findRockFamiliarInTerrarium()))
{
use_skill($skill[Aug. 30th: Beach Day!]); //Rollover adventures
use_familiar(findRockFamiliarInTerrarium());
use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment to lower weight of attack familiar or Burly bodyguard (Avant Guard) for Gremlins
}
if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && pathHasFamiliar())
else if((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small())
{
familiar hundred_fam = to_familiar(get_property("auto_100familiar"));
if (((in_avantGuard() && in_hardcore()) || (hundred_fam != $familiar[none] && (isAttackFamiliar(hundred_fam) || hundred_fam.block))) && have_familiar(findRockFamiliarInTerrarium()))
if(!is100FamRun())
{
use_familiar(findRockFamiliarInTerrarium());
use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment to lower weight of attack familiar or Burly bodyguard (Avant Guard) for Gremlins
use_familiar(findNonRockFamiliarInTerrarium()); //equip non-rock fam to ensure we get tiny gold medal
}
else if((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small())
else
{
if(!is100FamRun())
{
use_familiar(findNonRockFamiliarInTerrarium()); //equip non-rock fam to ensure we get tiny gold medal
}
else
{
use_familiar(hundred_fam); // assuming non-rock familiar
}
use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
use_familiar(hundred_fam); // assuming non-rock familiar
}
use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
}
}
//Day 2+ skills
if(my_daycount() >= 2)
//see how much mana cost reduction we can get (up to 3mp)
maximize("-mana cost", true);
int manaCostMaximize = numeric_modifier("Generated:_spec", "Mana Cost");
if(manaCostMaximize < 3 && canUse($skill[Aug. 30th: Beach Day!]) && !get_property("_aug30Cast").to_boolean() && get_property("_augSkillsCast").to_int()< 5)
{
if(canUse($skill[Aug. 24th: Waffle Day!]) && !get_property("_aug24Cast").to_boolean())
use_skill($skill[Aug. 30th: Beach Day!]); //For -MP (and Rollover Adventures)
}
}

void auto_scepterRollover()
{
//We don't want the baywatch if our accessory slots are already filled with > 7 adventure items or we if one of the slots is the counterclockwise watch
boolean noWatch = ((numeric_modifier(equipped_item($slot[acc1]),"Adventures") >= 7 &&
numeric_modifier(equipped_item($slot[acc2]),"Adventures") >= 7 &&
numeric_modifier(equipped_item($slot[acc3]),"Adventures") >= 7) ||
((is_watch(equipped_item($slot[acc1])) && numeric_modifier(equipped_item($slot[acc1]),"Adventures") >= 7) ||
(is_watch(equipped_item($slot[acc2])) && numeric_modifier(equipped_item($slot[acc2]),"Adventures") >= 7) ||
(is_watch(equipped_item($slot[acc3])) && numeric_modifier(equipped_item($slot[acc3]),"Adventures") >= 7)));
if(!noWatch && canUse($skill[Aug. 30th: Beach Day!]) && !get_property("_aug30Cast").to_boolean() && get_property("_augSkillsCast").to_int()< 5)
{
use_skill($skill[Aug. 30th: Beach Day!]); //For Rollover adventures (and -MP)
equipRollover(true);
}
//Get mainstats
if(get_property("_augSkillsCast").to_int()< 5 && my_level() < 13)
{
if(canUse($skill[Aug. 12th: Elephant Day!]) && !get_property("_aug12Cast").to_boolean() && my_primestat() == $stat[muscle])
{
use_skill($skill[Aug. 24th: Waffle Day!]); //get some waffles to hopefully change some bad monsters to better ones
use_skill($skill[Aug. 12th: Elephant Day!]); //get muscle stubstats
}
if(canUse($skill[Aug. 28th: Race Your Mouse Day!]) && !get_property("_aug28Cast").to_boolean() && ((!auto_hasStillSuit() && item_amount($item[Astral pet sweater]) == 0) || in_small()))
if(canUse($skill[Aug. 11th: Presidential Joke Day!]) && !get_property("_aug11Cast").to_boolean() && my_primestat() == $stat[mysticality])
{
if(!is100FamRun())
{
handleFamiliar("stat"); //get any familiar equipped if not in a 100% run
}
use_skill($skill[Aug. 28th: Race Your Mouse Day!]); //Fam equipment
use_skill($skill[Aug. 11th: Presidential Joke Day!]); //get mysticality stubstats
}
if(canUse($skill[Aug. 23rd: Ride the Wind Day!]) && !get_property("_aug23Cast").to_boolean() && my_primestat() == $stat[moxie])
{
use_skill($skill[Aug. 23rd: Ride the Wind Day!]); //get moxies stubstats
}
}
if(canUse($skill[Aug. 13th: Left\/Off Hander\'s Day!]) && !get_property("_aug13Cast").to_boolean() &&
get_property("_augSkillsCast").to_int()< 5 && numeric_modifier(equipped_item($slot[off-hand]),"Adventures") > 0 && weapon_hands(equipped_item($slot[off-hand])) == 0)
{
use_skill($skill[Aug. 13th: Left\/Off Hander\'s Day!]); //bump up the off-hand
}
if(canUse($skill[Aug. 27th: Just Because Day!]) && !get_property("_aug27Cast").to_boolean() && get_property("_augSkillsCast").to_int()< 5)
{
use_skill($skill[Aug. 27th: Just Because Day!]); //3 random buffs
}
}
void auto_lostStomach(boolean force)
Expand Down
14 changes: 12 additions & 2 deletions RELEASE/scripts/autoscend/quests/level_any.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,18 @@ boolean LX_dailyDungeonToken()
return false; //can switch to cubeling so wait until we have all the tool drops before doing daily dungeon
}
boolean needPole = true;
if(auto_haveCCSC())
{
needPole = false; // candy cane sword cane can act as an eleven-foot pole so don't buy if we already have it
}
if(can_interact()) //if you can not use cubeling then mallbuy missing tools in casual and postronin
{
auto_buyUpTo(1, $item[Eleven-Foot Pole]);
if(needPole)
{
auto_buyUpTo(1, $item[Eleven-Foot Pole]);
}
auto_buyUpTo(1, $item[Pick-O-Matic Lockpicks]);
if(!possessEquipment($item[Ring of Detect Boring Doors])) //do not buy a second one if already equipped
{
Expand All @@ -625,7 +634,8 @@ boolean LX_dailyDungeonToken()
}
//if you can not use the cubeling then pull the missing tools if possible
if (!auto_haveCCSC() && item_amount($item[Eleven-Foot Pole]) == 0) {
if(needPole)
{
// don't need the Eleven-foot Pole if we have the Candy Cane Sword Cane as it adds turn free NCs.
pullXWhenHaveY($item[Eleven-Foot Pole], 1, 0);
}
Expand Down

0 comments on commit 4209a57

Please sign in to comment.