diff --git a/BUILD/familiars/boss.dat b/BUILD/familiars/boss.dat index 0a83a678d..42e0f165c 100644 --- a/BUILD/familiars/boss.dat +++ b/BUILD/familiars/boss.dat @@ -3,4 +3,6 @@ Fist Turkey Shorter-Order Cook Mu Warbear Drone +Vampire Vintner +Jill-of-All-Trades Mosquito diff --git a/BUILD/familiars/drop.dat b/BUILD/familiars/drop.dat index 6d1843ba3..63a886aa9 100644 --- a/BUILD/familiars/drop.dat +++ b/BUILD/familiars/drop.dat @@ -4,6 +4,8 @@ # # every 2 cookbookbat ingredients generate a size 1 density 7 food. prioritize having enough to craft 1. Cookbookbat item:Vegetable of Jarlsberg<2;item:Yeast of Boris<2;item:St. Sneaky Pete's Whey<2 +# jill will drop her fam equip and a halloween map. Only consider map though +Jill-of-All-Trades item:Map to a candy-rich block<1 # 5 turkey booze drops a day. each is size 1 and density of either 5, 5.5, or 6 Fist Turkey prop:_turkeyBooze<5 # every 10 yellow pixels make a size 2 density 5 food or drink. unlimited drops per day. prioritize having enough to craft 2. diff --git a/BUILD/familiars/item.dat b/BUILD/familiars/item.dat index 825d1ffbd..e6636fb0e 100644 --- a/BUILD/familiars/item.dat +++ b/BUILD/familiars/item.dat @@ -4,6 +4,8 @@ # exempt from 10 lbs restriction in KOLHS path Steam-Powered Cheerleader path:KOLHS # Fairies with a multiplier +# 1.5x multiplier fairy +Jill-of-All-Trades item:LED candle>1 # 1.4x multiplier fairy Steam-Powered Cheerleader prop:_cheerleaderSteam>150 # 1.3x multiplier fairy @@ -22,6 +24,8 @@ Reagnimated Gnome !path:Heavy Rains XO Skeleton # Fairy that drops bacon with no limit. 1 per combat Intergnat +# Fairyeverything +Jill-of-All-Trades # Fairyballs Elf Operative Optimistic Candle diff --git a/BUILD/familiars/meat.dat b/BUILD/familiars/meat.dat index 792d9581c..c80793663 100644 --- a/BUILD/familiars/meat.dat +++ b/BUILD/familiars/meat.dat @@ -16,9 +16,13 @@ Adventurous Spelunker prop:_spelunkingTalesDrops<1 # Might as well get devilish folios Blavious Kloop prop:_kloopDrops<3 # Leprechauns with a >1 multiplier +# 1.5x multiplier leprechaun +Jill-of-All-Trades item:LED candle>1 #Mutant Cactus Bud grimdark:0 Hobo Monkey #Mutant Cactus Bud grimdark:1 +# Does everything +Jill-of-All-Trades # Volleychauns Golden Monkey Bloovian Groose diff --git a/BUILD/familiars/regen.dat b/BUILD/familiars/regen.dat index 915a2972b..a269af29f 100644 --- a/BUILD/familiars/regen.dat +++ b/BUILD/familiars/regen.dat @@ -8,6 +8,8 @@ Galloping Grill prop:_hotAshesDrops<5 # starfish that drops 5 tokens a day that can be exchanged for a spleen consumable that gives adv Rogue Program prop:_tokenDrops<5 +# Fairyeverything +Jill-of-All-Trades # Fairywhelps. Weight is better used on these and 2 of them drop useful items. Pocket Professor Garbage Fire diff --git a/BUILD/familiars/stat.dat b/BUILD/familiars/stat.dat index 9de58a1b4..237173750 100644 --- a/BUILD/familiars/stat.dat +++ b/BUILD/familiars/stat.dat @@ -7,8 +7,11 @@ Hovering Sombrero ML:>=120 # Can be tuned to give pure mainstat, so it's better than other volleyballs Crimbo Shrub # Volleyballs with a multiplier +Jill-of-All-Trades item:LED candle>1 #Baby Mutant Rattlesnake grimdark:0 #Baby Mutant Rattlesnake grimdark:1 +# Fairyeverything +Jill-of-All-Trades # Fairyballs Elf Operative Optimistic Candle diff --git a/RELEASE/data/autoscend_familiars.txt b/RELEASE/data/autoscend_familiars.txt index f28f7025b..04471a513 100644 --- a/RELEASE/data/autoscend_familiars.txt +++ b/RELEASE/data/autoscend_familiars.txt @@ -16,7 +16,9 @@ boss 1 Fist Turkey boss 2 Shorter-Order Cook boss 3 Mu boss 4 Warbear Drone -boss 5 Mosquito +boss 5 Vampire Vintner +boss 6 Jill-of-All-Trades +boss 7 Mosquito # "drop" type is used when we want to grab a familiar that drops items themselves rather than boosting the odds of the enemy dropping items. # @@ -24,64 +26,66 @@ boss 5 Mosquito # # every 2 cookbookbat ingredients generate a size 1 density 7 food. prioritize having enough to craft 1. drop 0 Cookbookbat item:Vegetable of Jarlsberg<2;item:Yeast of Boris<2;item:St. Sneaky Pete's Whey<2 +# jill will drop her fam equip and a halloween map. Only consider map though +drop 1 Jill-of-All-Trades item:Map to a candy-rich block<1 # 5 turkey booze drops a day. each is size 1 and density of either 5, 5.5, or 6 -drop 1 Fist Turkey prop:_turkeyBooze<5 +drop 2 Fist Turkey prop:_turkeyBooze<5 # every 10 yellow pixels make a size 2 density 5 food or drink. unlimited drops per day. prioritize having enough to craft 2. # drops 1 per combat with chance of 2nd if wearing familiar specific equip -drop 2 Puck Man item:Yellow Pixel<20 -drop 3 Ms. Puck Man item:Yellow Pixel<20 +drop 3 Puck Man item:Yellow Pixel<20 +drop 4 Ms. Puck Man item:Yellow Pixel<20 # 1st wax drop per run only takes 5 combats, afterwards 30. makes a single size 2 density 4.25 food or drink -drop 4 Optimistic Candle prop:optimisticCandleProgress>=25 +drop 5 Optimistic Candle prop:optimisticCandleProgress>=25 # 1st robin egg per run only takes 5 combats, afterwards 30. potion that gives all res +3 -drop 5 Rockin' Robin prop:rockinRobinProgress>=25 +drop 6 Rockin' Robin prop:rockinRobinProgress>=25 # 1st burning newspaper per run only takes 5 combats, afterwards 30. can be used for +5 adv on dayroll back equip -drop 6 Garbage Fire prop:garbageFireProgress>=25 +drop 7 Garbage Fire prop:garbageFireProgress>=25 # Hot ashes can make a potion that gives +15 ML for 15 adv. keep 1 of them in stock -drop 7 Galloping Grill prop:_hotAshesDrops<5;item:hot ashes<1 +drop 8 Galloping Grill prop:_hotAshesDrops<5;item:hot ashes<1 # # get substats from fist turkey in The Source path -drop 8 Fist Turkey prop:_turkeyMuscle<5;mainstat:Muscle;path:The Source -drop 9 Fist Turkey prop:_turkeyMyst<5;mainstat:Mysticality;path:The Source -drop 10 Fist Turkey prop:_turkeyMoxie<5;mainstat:Moxie;path:The Source +drop 9 Fist Turkey prop:_turkeyMuscle<5;mainstat:Muscle;path:The Source +drop 10 Fist Turkey prop:_turkeyMyst<5;mainstat:Mysticality;path:The Source +drop 11 Fist Turkey prop:_turkeyMoxie<5;mainstat:Moxie;path:The Source # # Cat Burglar can charge up heists. 30 combats give it 2 charges. -drop 11 Cat Burglar prop:_catBurglarCharge<30 +drop 12 Cat Burglar prop:_catBurglarCharge<30 # # Melodramedary generating spit seems good -drop 12 Melodramedary prop:camelSpit<100 +drop 13 Melodramedary prop:camelSpit<100 # # Drops BACON every battle. 100 bacon makes size 15 density 4.83 food. 150 bacon can get you a fat loot token -drop 13 Intergnat item:BACON<150 +drop 14 Intergnat item:BACON<150 # # Generate extra cookbookbat ingredients to make sure we have enough stock on hand for higher-tier foods -drop 14 Cookbookbat item:Vegetable of Jarlsberg<4 -drop 15 Cookbookbat item:Yeast of Boris<4 -drop 16 Cookbookbat item:St. Sneaky Pete's Whey<4 +drop 15 Cookbookbat item:Vegetable of Jarlsberg<4 +drop 16 Cookbookbat item:Yeast of Boris<4 +drop 17 Cookbookbat item:St. Sneaky Pete's Whey<4 # Below this lines drops are not needed more of for the run and are just grabbing for profit. # Most are useful in limited amounts which we already grab via boolean autoChooseFamiliar(location place) # # density 1.875 size 4 spleen consumables. boolean autoChooseFamiliar(location place) will already grab the amount needed for spleen # Here they are only used to grab extras. -drop 17 Grim Brother prop:_grimFairyTaleDrops<5 -drop 18 Pair of Stomping Boots !path:G-Lover;prop:_bootStomps<7 -drop 19 Baby Sandworm prop:_aguaDrops<5 -drop 20 Bloovian Groose prop:_grooseDrops<5 -drop 21 Golden Monkey prop:_powderedGoldDrops<5 -drop 22 Unconscious Collective prop:_dreamJarDrops<5 +drop 18 Grim Brother prop:_grimFairyTaleDrops<5 +drop 19 Pair of Stomping Boots !path:G-Lover;prop:_bootStomps<7 +drop 20 Baby Sandworm prop:_aguaDrops<5 +drop 21 Bloovian Groose prop:_grooseDrops<5 +drop 22 Golden Monkey prop:_powderedGoldDrops<5 +drop 23 Unconscious Collective prop:_dreamJarDrops<5 # psychoanalytic jar 1 per day. -drop 23 Angry Jung Man prop:_jungDrops<1 +drop 24 Angry Jung Man prop:_jungDrops<1 # grimstone mask 1 per day -drop 24 Grimstone Golem prop:_grimstoneMaskDrops<1 +drop 25 Grimstone Golem prop:_grimstoneMaskDrops<1 # tales of spelunking 1 per day -drop 25 Adventurous Spelunker prop:_spelunkingTalesDrops<1 +drop 26 Adventurous Spelunker prop:_spelunkingTalesDrops<1 # can drop 5 devilish folio a day -drop 26 Blavious Kloop prop:_kloopDrops<5 +drop 27 Blavious Kloop prop:_kloopDrops<5 # can drop 5 absinthe a day -drop 27 Green Pixie prop:_absintheDrops<5 +drop 28 Green Pixie prop:_absintheDrops<5 # Hot ashes can make a potion that gives +15 ML for 15 adv. drop limit 5/day -drop 28 Galloping Grill prop:_hotAshesDrops<5 +drop 29 Galloping Grill prop:_hotAshesDrops<5 # If all else fails, keep generating CBB ingredients -drop 29 Cookbookbat +drop 30 Cookbookbat # We want to delevel, but don't want to deal damage gremlins 0 Nosy Nose @@ -103,81 +107,85 @@ init 3 Happy Medium # exempt from 10 lbs restriction in KOLHS path item 0 Steam-Powered Cheerleader path:KOLHS # Fairies with a multiplier +# 1.5x multiplier fairy +item 1 Jill-of-All-Trades item:LED candle>1 # 1.4x multiplier fairy -item 1 Steam-Powered Cheerleader prop:_cheerleaderSteam>150 +item 2 Steam-Powered Cheerleader prop:_cheerleaderSteam>150 # 1.3x multiplier fairy -item 2 Steam-Powered Cheerleader prop:_cheerleaderSteam>100 +item 3 Steam-Powered Cheerleader prop:_cheerleaderSteam>100 # Jumpsuited Hound Dog is a 1.25x multiplier fairy that provides +combat. # Jumpsuited Hound Dog DELIBERATELY not included because it provides usually unwanted +combat # 1.2x multiplier fairy -item 3 Steam-Powered Cheerleader prop:_cheerleaderSteam>50 +item 4 Steam-Powered Cheerleader prop:_cheerleaderSteam>50 # 1.1x multiplier fairy -item 4 Steam-Powered Cheerleader prop:_cheerleaderSteam>0 +item 5 Steam-Powered Cheerleader prop:_cheerleaderSteam>0 # fairy with useful special powers above a certain weight so we want to preload it -item 5 Grey Goose prop_boolean:auto_prioritizeGoose +item 6 Grey Goose prop_boolean:auto_prioritizeGoose # fairy that generates extra adventures -item 6 Reagnimated Gnome !path:Heavy Rains +item 7 Reagnimated Gnome !path:Heavy Rains # Fairywhelp that drops x and o without limit. 1 each per 9 combats. 3 o for food. 3 x for drink, 23 x to skip half bridge. -item 7 XO Skeleton +item 8 XO Skeleton # Fairy that drops bacon with no limit. 1 per combat -item 8 Intergnat +item 9 Intergnat +# Fairyeverything +item 10 Jill-of-All-Trades # Fairyballs -item 9 Elf Operative -item 10 Optimistic Candle -item 11 Rockin' Robin -item 12 God Lobster item:God Lobster's Crown>0 -item 13 Hobo in Sheep's Clothing +item 11 Elf Operative +item 12 Optimistic Candle +item 13 Rockin' Robin +item 14 God Lobster item:God Lobster's Crown>0 +item 15 Hobo in Sheep's Clothing # Fairywhelps -item 14 Pocket Professor -item 15 Garbage Fire -item 16 Dandy Lion -item 17 Choctopus +item 16 Pocket Professor +item 17 Garbage Fire +item 18 Dandy Lion +item 19 Choctopus # Fairychauns -item 18 Fist Turkey -item 19 Cat Burglar -item 20 Angry Jung Man -item 21 Grimstone Golem -item 22 Adventurous Spelunker -item 23 Blavious Kloop -item 24 Hippo Ballerina -item 25 Dancing Frog -item 26 Coffee Pixie -item 27 Attention-Deficit Demon -item 28 Jitterbug -item 29 Casagnova Gnome -item 30 Psychedelic Bear -item 31 Piano Cat +item 20 Fist Turkey +item 21 Cat Burglar +item 22 Angry Jung Man +item 23 Grimstone Golem +item 24 Adventurous Spelunker +item 25 Blavious Kloop +item 26 Hippo Ballerina +item 27 Dancing Frog +item 28 Coffee Pixie +item 29 Attention-Deficit Demon +item 30 Jitterbug +item 31 Casagnova Gnome +item 32 Psychedelic Bear +item 33 Piano Cat # Slightly special fairies -item 32 Grey Goose -item 33 Ghost of Crimbo Carols -item 34 Red-Nosed Snapper -item 35 Pair of Stomping Boots !path:G-Lover -item 36 Gelatinous Cubeling -item 37 Steam-Powered Cheerleader -item 38 Obtuse Angel -item 39 Green Pixie +item 34 Grey Goose +item 35 Ghost of Crimbo Carols +item 36 Red-Nosed Snapper +item 37 Pair of Stomping Boots !path:G-Lover +item 38 Gelatinous Cubeling +item 39 Steam-Powered Cheerleader +item 40 Obtuse Angel +item 41 Green Pixie # Elemental fairies -item 40 Sleazy Gravy Fairy -item 41 Stinky Gravy Fairy -item 42 Flaming Gravy Fairy -item 43 Frozen Gravy Fairy -item 44 Spooky Gravy Fairy +item 42 Sleazy Gravy Fairy +item 43 Stinky Gravy Fairy +item 44 Flaming Gravy Fairy +item 45 Frozen Gravy Fairy +item 46 Spooky Gravy Fairy # Physical damage fairy -item 45 Bowlet -item 46 Crimbo Elf +item 47 Bowlet +item 48 Crimbo Elf # Barely special fairies -item 47 Mechanical Songbird -item 48 Grouper Groupie -item 49 Peppermint Rhino +item 49 Mechanical Songbird +item 50 Grouper Groupie +item 51 Peppermint Rhino # Fairy that if fed equipment will regen MP and give extra drops. Since we do not make use of this functionality it is just a fairy. -item 50 Slimeling +item 52 Slimeling # Turtles are cute -item 51 Syncopated Turtle +item 53 Syncopated Turtle # The original -item 52 Baby Gravy Fairy +item 54 Baby Gravy Fairy # Mutant Fire Ant multiplier is 1.3-(0.15*grimace darkness). Too marginal because of opportunity cost compared to leveling another familiar. # If we level it today when it gives a good bonus, tomorrow it might drop to bad bonus and we have to start leveling another fairy. -item 53 Mutant Fire Ant +item 55 Mutant Fire Ant # Wanna get that jar meat 0 Angry Jung Man prop:_jungDrops<1;day:1 @@ -197,47 +205,51 @@ meat 8 Adventurous Spelunker prop:_spelunkingTalesDrops<1 # Might as well get devilish folios meat 9 Blavious Kloop prop:_kloopDrops<3 # Leprechauns with a >1 multiplier +# 1.5x multiplier leprechaun +meat 10 Jill-of-All-Trades item:LED candle>1 #Mutant Cactus Bud grimdark:0 -meat 10 Hobo Monkey +meat 11 Hobo Monkey #Mutant Cactus Bud grimdark:1 +# Does everything +meat 12 Jill-of-All-Trades # Volleychauns -meat 11 Golden Monkey -meat 12 Bloovian Groose -meat 13 Unconscious Collective -meat 14 Grim Brother -meat 15 Dramatic Hedgehog -meat 16 Chauvinist Pig -meat 17 Uniclops -meat 18 Hunchbacked Minion -meat 19 Nervous Tick -meat 20 Cymbal-Playing Monkey -meat 21 Cheshire Bat +meat 13 Golden Monkey +meat 14 Bloovian Groose +meat 15 Unconscious Collective +meat 16 Grim Brother +meat 17 Dramatic Hedgehog +meat 18 Chauvinist Pig +meat 19 Uniclops +meat 20 Hunchbacked Minion +meat 21 Nervous Tick +meat 22 Cymbal-Playing Monkey +meat 23 Cheshire Bat # Fairychauns -meat 22 Cat Burglar -meat 23 Blavious Kloop -meat 24 Adventurous Spelunker -meat 25 Hippo Ballerina -meat 26 Dancing Frog -meat 27 Cheshire Bat -meat 28 Piano Cat -meat 29 Psychedelic Bear -meat 30 Casagnova Gnome -meat 31 Jitterbug -meat 32 Attention-Deficit Demon -meat 33 Coffee Pixie +meat 24 Cat Burglar +meat 25 Blavious Kloop +meat 26 Adventurous Spelunker +meat 27 Hippo Ballerina +meat 28 Dancing Frog +meat 29 Cheshire Bat +meat 30 Piano Cat +meat 31 Psychedelic Bear +meat 32 Casagnova Gnome +meat 33 Jitterbug +meat 34 Attention-Deficit Demon +meat 35 Coffee Pixie # Wowee -meat 34 Hand Turkey +meat 36 Hand Turkey # Sorry, we don't use him for yellow rays but we can at least use him for meat I guess -meat 35 He-Boulder +meat 37 He-Boulder # Marginally special leprechauns -meat 36 Ghost of Crimbo Commerce -meat 37 Knob Goblin Organ Grinder +meat 38 Ghost of Crimbo Commerce +meat 39 Knob Goblin Organ Grinder #Mutant Cactus Bud grimdark:2 -meat 38 Urchin Urchin +meat 40 Urchin Urchin # Memes, doesn't actually give substats apparently -meat 39 Cornbeefadon +meat 41 Cornbeefadon # The original -meat 40 Leprechaun +meat 42 Leprechaun # Typical starfish are better than whelps # Whelps on average restore .375*(weight+5) @@ -249,54 +261,56 @@ meat 40 Leprechaun regen 0 Galloping Grill prop:_hotAshesDrops<5 # starfish that drops 5 tokens a day that can be exchanged for a spleen consumable that gives adv regen 1 Rogue Program prop:_tokenDrops<5 +# Fairyeverything +regen 2 Jill-of-All-Trades # Fairywhelps. Weight is better used on these and 2 of them drop useful items. -regen 2 Pocket Professor -regen 3 Garbage Fire -regen 4 XO Skeleton +regen 3 Pocket Professor +regen 4 Garbage Fire +regen 5 XO Skeleton # Drops assorted stuff, mostly junk. has some awesome food. requires familiar equip brass bung spigot to regen HP/MP -regen 5 Lil' Barrel Mimic item:brass bung spigot>0 +regen 6 Lil' Barrel Mimic item:brass bung spigot>0 # It's a starfish with reduced activation rate, except it ALWAYS attacks on turn one, so that's probably more hits per battle on average in short battles? oh, and it's a sombrero too -regen 6 Galloping Grill -regen 7 Patriotic Eagle +regen 7 Galloping Grill +regen 8 Patriotic Eagle # A super starfish (50% activation instead of 33%) -regen 8 Sausage Golem +regen 9 Sausage Golem # A slightly boosted starfish, for pastamancers -regen 9 Animated Macaroni Duck class:Pastamancer +regen 10 Animated Macaroni Duck class:Pastamancer # Regular starfish -regen 10 Unspeakachu -regen 11 Twitching Space Critter -regen 12 Rock Lobster -regen 13 Animated Macaroni Duck -regen 14 Midget Clownfish -regen 15 Snow Angel -regen 16 Underworld Bonsai -regen 17 Star Starfish +regen 11 Unspeakachu +regen 12 Twitching Space Critter +regen 13 Rock Lobster +regen 14 Animated Macaroni Duck +regen 15 Midget Clownfish +regen 16 Snow Angel +regen 17 Underworld Bonsai +regen 18 Star Starfish # Fairysuperwhelps -regen 18 Choctopus +regen 19 Choctopus # Superwhelps -regen 19 Plastic Pirate Skull -regen 20 Trick-or-Treating Tot +regen 20 Plastic Pirate Skull +regen 21 Trick-or-Treating Tot # Fairywhelps -regen 21 Dandy Lion +regen 22 Dandy Lion # Special whelps -regen 22 Ms. Puck Man -regen 23 Puck Man -regen 24 Squamous Gibberer -regen 25 He-Boulder -regen 26 Cotton Candy Carnie +regen 23 Ms. Puck Man +regen 24 Puck Man +regen 25 Squamous Gibberer +regen 26 He-Boulder +regen 27 Cotton Candy Carnie # Slightly better whelp for saucerors -regen 27 Pet Cheezling class:Sauceror +regen 28 Pet Cheezling class:Sauceror # Whelps with a multiplier, why not I guess #Mutant Gila Monster grimdark:0 #Mutant Gila Monster grimdark:1 # Marginally special whelps #Mutant Gila Monster grimdark:2 -regen 28 Pottery Barn Owl +regen 29 Pottery Barn Owl # Regular old whelps -regen 29 Pet Cheezling -regen 30 Ghuol Whelp +regen 30 Pet Cheezling +regen 31 Ghuol Whelp # The absolute default that everyone should have after their first run -regen 31 Mosquito +regen 32 Mosquito # Sombrero is desirable with a decent amount of ML stat 0 Galloping Grill ML:>=120 @@ -307,48 +321,51 @@ stat 4 Hovering Sombrero ML:>=120 # Can be tuned to give pure mainstat, so it's better than other volleyballs stat 5 Crimbo Shrub # Volleyballs with a multiplier +stat 6 Jill-of-All-Trades item:LED candle>1 #Baby Mutant Rattlesnake grimdark:0 #Baby Mutant Rattlesnake grimdark:1 +# Fairyeverything +stat 7 Jill-of-All-Trades # Fairyballs -stat 6 Elf Operative -stat 7 Optimistic Candle -stat 8 Rockin' Robin -stat 9 Hobo in Sheep's Clothing +stat 8 Elf Operative +stat 9 Optimistic Candle +stat 10 Rockin' Robin +stat 11 Hobo in Sheep's Clothing # Volleychauns -stat 10 Ghost of Crimbo Commerce -stat 11 Golden Monkey -stat 12 Bloovian Groose -stat 13 Unconscious Collective -stat 14 Grim Brother -stat 15 Dramatic Hedgehog -stat 16 Chauvinist Pig -stat 17 Uniclops -stat 18 Hunchbacked Minion -stat 19 Nervous Tick -stat 20 Cymbal-Playing Monkey -stat 21 Cheshire Bat +stat 12 Ghost of Crimbo Commerce +stat 13 Golden Monkey +stat 14 Bloovian Groose +stat 15 Unconscious Collective +stat 16 Grim Brother +stat 17 Dramatic Hedgehog +stat 18 Chauvinist Pig +stat 19 Uniclops +stat 20 Hunchbacked Minion +stat 21 Nervous Tick +stat 22 Cymbal-Playing Monkey +stat 23 Cheshire Bat # VolleyWhelps -stat 22 Melodramedary +stat 24 Melodramedary # Build up weight for free runs -stat 23 Frumious Bandersnatch +stat 25 Frumious Bandersnatch # Slightly special volleyballs -stat 24 Ghost of Crimbo Cheer -stat 25 Reanimated Reanimator -stat 26 God Lobster -stat 27 Party Mouse -stat 28 Lil' Barrel Mimic -stat 29 Piranha Plant -stat 30 Antique Nutcracker -stat 31 Jill-O-Lantern +stat 26 Ghost of Crimbo Cheer +stat 27 Reanimated Reanimator +stat 28 God Lobster +stat 29 Party Mouse +stat 30 Lil' Barrel Mimic +stat 31 Piranha Plant +stat 32 Antique Nutcracker +stat 33 Jill-O-Lantern # Fancy -stat 32 Miniature Sword & Martini Guy +stat 34 Miniature Sword & Martini Guy #Baby Mutant Rattlesnake grimdark:2 # Turtles are cute -stat 33 Grinning Turtle +stat 35 Grinning Turtle # His winning smile -stat 34 Smiling Rat +stat 36 Smiling Rat # The original -stat 35 Blood-Faced Volleyball +stat 37 Blood-Faced Volleyball yellowray 0 Crimbo Shrub # Nanorhino and He-Boulder would require a bit of extra doing to make work diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash index c4c50bb90..bb6984933 100644 --- a/RELEASE/scripts/autoscend.ash +++ b/RELEASE/scripts/autoscend.ash @@ -1,4 +1,4 @@ -since r27557; // support small path +since r27637; // support jill-of-all-trades /*** autoscend_header.ash must be first import All non-accessory scripts must be imported here @@ -1781,6 +1781,7 @@ boolean doTasks() auto_buyFireworksHat(); auto_CMCconsult(); auto_checkTrainSet(); + prioritizeGoose(); ocrs_postCombatResolve(); beatenUpResolution(); @@ -1844,7 +1845,6 @@ boolean doTasks() auto_voteSetup(0,0,0); auto_setSongboom(); if(LX_ForceNC()) return true; - prioritizeGoose(); if(LX_dronesOut()) return true; if(LM_bond()) return true; if(LX_calculateTheUniverse(false)) return true; diff --git a/RELEASE/scripts/autoscend/auto_familiar.ash b/RELEASE/scripts/autoscend/auto_familiar.ash index 9330b00f4..e1fb84049 100644 --- a/RELEASE/scripts/autoscend/auto_familiar.ash +++ b/RELEASE/scripts/autoscend/auto_familiar.ash @@ -282,6 +282,8 @@ familiar lookupFamiliarDatafile(string type) //we do not want a fallback here. if no matching familiar is found then do nothing here, a familiar will be automatically set in pre adventure auto_log_debug("lookupFamiliarDatafile is checking for type [" + type + "]"); + // store what type of fam we are looking for + set_property("auto_lastFamiliarLookupType",type); string [string,int,string] familiars_text; if(!file_to_map("autoscend_familiars.txt", familiars_text)) { @@ -461,13 +463,13 @@ boolean autoChooseFamiliar(location place) } // if we somehow end up in The Valley of Rof L'm Fao might as well try to get N - if ($location[The Valley of Rof L'm Fao] == place && item_amount($item[lowercase N]) == 0 && item_amount($item[ND]) == 0 && item_amount($item[Wand of Nagamar]) == 0 && get_property("auto_wandOfNagamar").to_boolean()) { + if ($location[The Valley of Rof L\'m Fao] == place && item_amount($item[lowercase N]) == 0 && item_amount($item[ND]) == 0 && item_amount($item[Wand of Nagamar]) == 0 && get_property("auto_wandOfNagamar").to_boolean()) { famChoice = lookupFamiliarDatafile("item"); } - // the D is only individually useful in paths that also visit The Valley of Rof L'm Fao for N + // the D is only individually useful in paths that also visit The Valley of Rof L\'m Fao for N // this is only in Low Key Summer for now, but can be in other paths if they get support: Journeyman, Grey You if ($location[The Castle in the Clouds in the Sky (Basement)] == place && item_amount($item[heavy D]) == 0 && item_amount($item[ND]) == 0 && item_amount($item[Wand of Nagamar]) == 0 && get_property("auto_wandOfNagamar").to_boolean()) { - boolean wantTheD = in_lowkeysummer() && (item_amount($item[lowercase N]) > 0 || $location[The Valley of Rof L'm Fao].turns_spent < 11); //!possessEquipment($item[Kekekey]) + boolean wantTheD = in_lowkeysummer() && (item_amount($item[lowercase N]) > 0 || $location[The Valley of Rof L\'m Fao].turns_spent < 11); //!possessEquipment($item[Kekekey]) if(wantTheD) { famChoice = lookupFamiliarDatafile("item"); @@ -775,7 +777,7 @@ void preAdvUpdateFamiliar(location place) run_choice(-1); set_property("_auto_gnomeArenaVisited", "true"); } - autoEquip($slot[familiar], $item[gnomish housemaid's kgnee]); + autoEquip($slot[familiar], $item[gnomish housemaid\'s kgnee]); } if (my_familiar() == $familiar[Baby Bugged Bugbear]) @@ -801,6 +803,13 @@ void preAdvUpdateFamiliar(location place) } } } + + if(my_familiar() == $familiar[Jill-of-All-Trades] && item_amount($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(); + } if(auto_checkFamiliarMummery(my_familiar())) { diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash index cd120a458..96f76f95a 100644 --- a/RELEASE/scripts/autoscend/autoscend_header.ash +++ b/RELEASE/scripts/autoscend/autoscend_header.ash @@ -524,6 +524,8 @@ void auto_scepterSkills(); void auto_lostStomach(); boolean auto_haveEagle(); boolean auto_getCitizenZone(string goal); +boolean auto_haveJillOfAllTrades(); +void auto_handleJillOfAllTrades(); ######################################################################################################## //Defined in autoscend/paths/actually_ed_the_undying.ash diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash index e4c15efb0..de3d2d69a 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2022.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2022.ash @@ -157,11 +157,9 @@ boolean auto_haveGreyGoose() int gooseExpectedDrones() { if(!auto_haveGreyGoose()) return 0; - if(my_familiar() == $familiar[Grey Goose]) - { - set_property("auto_gooseExpectedDrones", familiar_weight($familiar[Grey Goose]) - 5); - } - return get_property("auto_gooseExpectedDrones").to_int(); + int gooseWeight = familiar_weight($familiar[Grey Goose]); + if(gooseWeight < 5) return 0; + return gooseWeight - 5; } boolean dronesOut() //want a function to override the task order if we have drones out so as not to waste them @@ -181,7 +179,7 @@ void prioritizeGoose() //prioritize Goose only if we still have things to get ((item_amount($item[Stone Wool]) == 0 && have_effect($effect[Stone-Faced]) == 0 && internalQuestStatus("questL11Worship") <= 2) && gooseExpectedDrones() < 1) || (internalQuestStatus("questL08Trapper") <= 1 && gooseExpectedDrones() < 1) || (((internalQuestStatus("questL09Topping") >= 2 && internalQuestStatus("questL09Topping") <= 3) && get_property("twinPeakProgress").to_int() < 15) && gooseExpectedDrones() < 2) || - ((needStarKey() && (item_amount($item[star]) < 7 && item_amount($item[line]) < 6)) && gooseExpectedDrones() < 8) || + ((needStarKey() && (item_amount($item[star]) < 7 && item_amount($item[line]) < 6)) && gooseExpectedDrones() < 4) || (internalQuestStatus("questL11Ron") < 5 && gooseExpectedDrones() < 2) || ((get_property("hiddenBowlingAlleyProgress").to_int() + item_amount($item[Bowling Ball])) < 5 && gooseExpectedDrones() < 2) || (((item_amount($item[Crumbling Wooden Wheel]) + item_amount($item[Tomb Ratchet])) < 9) && gooseExpectedDrones() < 3)) diff --git a/RELEASE/scripts/autoscend/iotms/mr2023.ash b/RELEASE/scripts/autoscend/iotms/mr2023.ash index bb86d1742..a89879568 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2023.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2023.ash @@ -475,6 +475,80 @@ void auto_lostStomach(boolean force) } } +boolean auto_haveJillOfAllTrades() +{ + if(auto_have_familiar($familiar[Jill-of-All-Trades])) + { + return true; + } + return false; +} + +string getParsedCandleMode() +{ + // returns candle mode which matches our familiar categories + switch(get_property("ledCandleMode")) + { + case "disco": + return "item"; + case "ultraviolet": + return "meat"; + case "reading": + return "stat"; + case "red": + return "boss"; + default: + return "unknown"; + + } +} + +void auto_handleJillOfAllTrades() +{ + if (!auto_haveJillOfAllTrades() || item_amount($item[LED candle]) == 0) + { + return; + } + + // only bother to configure candle if Jill is equiped + if(my_familiar() != $familiar[Jill-of-All-Trades]) + { + return; + } + + string currentMode = getParsedCandleMode(); + // want to configure jill to have bonus of whatever fam type we last looked up + string desiredCandleMode = get_property("auto_lastFamiliarLookupType"); + + auto_log_debug(`Jill current mode: {currentMode} and desired is {desiredCandleMode}`); + if(currentMode == desiredCandleMode) + { + return; + } + + switch(desiredCandleMode) + { + case "item": + case "regen": + cli_execute("jillcandle item"); + break; + case "meat": + cli_execute("jillcandle meat"); + break; + case "stat": + case "drop": + cli_execute("jillcandle stat"); + break; + case "boss": + cli_execute("jillcandle attack"); + break; + default: + abort("tried to configure Jill's LED Candle with a non-supported type"); + } + + return; +} + boolean auto_haveEagle() { if(auto_have_familiar($familiar[Patriotic Eagle]))