Skip to content

Commit

Permalink
Daily Candles Support (#1093)
Browse files Browse the repository at this point in the history 
* add ear candle buff to init provider

* formatting fixes in auto_buff.ash

* added daily candles to aut_buff

* added uses for candles

* syntax fixes

* removed usage of humanity candle

Co-authored-by: quarklikeadork <[email protected]>
  • Loading branch information
@Alium58 @quarklikeadork
Alium58 and quarklikeadork authored Apr 4, 2022
1 parent b74ad27 commit dcc3be1
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 37 deletions.
82 changes: 46 additions & 36 deletions RELEASE/scripts/autoscend/auto_buff.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,10 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Bandersnatched]: useItem = $item[Tonic O\' Banderas]; break;
case $effect[Barbecue Saucy]: useItem = $item[Dollop of Barbecue Sauce]; break;
case $effect[Be A Mind Master]: useItem = $item[Daily Affirmation: Be A Mind Master]; break;
case $effect[A Beastly Odor]: useItem = $item[The Beast Within&trade; candle];break;
case $effect[Become Superficially Interested]: useItem = $item[Daily Affirmation: Be Superficially Interested]; break;
case $effect[Bendin\' Hell]: useSkill = $skill[Bend Hell]; break;
case $effect[Bent Knees]: useSkill = $skill[Bendable Knees]; break;
case $effect[Bendin\' Hell]: useSkill = $skill[Bend Hell]; break;
case $effect[Bent Knees]: useSkill = $skill[Bendable Knees]; break;
case $effect[Benetton\'s Medley of Diversity]: useSkill = $skill[Benetton\'s Medley of Diversity]; break;
case $effect[Berry Elemental]: useItem = $item[Tapioc Berry]; break;
case $effect[Berry Statistical]: useItem = $item[Snarf Berry]; break;
Expand Down Expand Up @@ -237,28 +238,31 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Burning Hands]: useItem = $item[sticky lava globs]; break;
case $effect[Busy Bein\' Delicious]: useItem = $item[Crimbo fudge]; break;
case $effect[Butt-Rock Hair]: useItem = $item[Hair Spray]; break;
case $effect[Can\'t Smell Nothin\']: useItem = $item[Dogsgotnonoz pills]; break;
case $effect[Car-Charged]: useItem = $item[Battery (car)]; break;
case $effect[Can\'t Smell Nothin\']: useItem = $item[Dogsgotnonoz pills]; break;
case $effect[Car-Charged]: useItem = $item[Battery (car)]; break;
case $effect[Carlweather\'s Cantata of Confrontation]:useSkill = $skill[Carlweather\'s Cantata of Confrontation];break;
case $effect[Carol Of The Bulls]: useSkill = $skill[Carol Of The Bulls]; break;
case $effect[Carol Of The Hells]: useSkill = $skill[Carol Of The Hells]; break;
case $effect[Carol Of The Thrills]: useSkill = $skill[Carol Of The Thrills]; break;
case $effect[Carol Of The Bulls]: useSkill = $skill[Carol Of The Bulls]; break;
case $effect[Carol Of The Hells]: useSkill = $skill[Carol Of The Hells]; break;
case $effect[Carol Of The Thrills]: useSkill = $skill[Carol Of The Thrills]; break;
case $effect[Cautious Prowl]: useSkill = $skill[Walk: Cautious Prowl]; break;
case $effect[Ceaseless Snarling]: useSkill = $skill[Ceaseless Snarl]; break;
case $effect[Ceaseless Snarling]: useSkill = $skill[Ceaseless Snarl]; break;
case $effect[Celestial Camouflage]: useItem = $item[Celestial Squid Ink]; break;
case $effect[Celestial Saltiness]: useItem = $item[Celestial Au Jus]; break;
case $effect[Celestial Sheen]: useItem = $item[Celestial Olive Oil]; break;
case $effect[Celestial Vision]: useItem = $item[Celestial Carrot Juice]; break;
case $effect[Celestial Vision]: useItem = $item[Celestial Carrot Juice]; break;
case $effect[Cinnamon Challenger]: useItem = $item[Pulled Red Taffy]; break;
case $effect[Clear Ears, Can\'t Lose]: useItem = $item[Ear Candle]; break;
case $effect[Cletus\'s Canticle of Celerity]: useSkill = $skill[Cletus\'s Canticle of Celerity];break;
case $effect[Cloak of Shadows]: useSkill = $skill[Blood Cloak]; break;
case $effect[Cloak of Shadows]: useSkill = $skill[Blood Cloak]; break;
case $effect[Clyde\'s Blessing]: useItem = $item[The Legendary Beat]; break;
case $effect[Chalky Hand]: useItem = $item[Handful of Hand Chalk]; break;
case $effect[Chocolatesphere]: useSkill = $skill[Chocolatesphere]; break;
case $effect[Chocolatesphere]: useSkill = $skill[Chocolatesphere]; break;
case $effect[Cranberry Cordiality]: useItem = $item[Cranberry Cordial]; break;
case $effect[Coffeesphere]: useSkill = $skill[Coffeesphere]; break;
case $effect[Coffeesphere]: useSkill = $skill[Coffeesphere]; break;
case $effect[Cold Hard Skin]: useItem = $item[Frost-Rimed Seal Hide]; break;
case $effect[Confidence of the Votive]: useItem = $item[Votive of Confidence]; break;
case $effect[Contemptible Emanations]: useItem = $item[Cologne of Contempt]; break;
case $effect[Covered in the Rainbow]: useItem = $item[Rainbow Glitter Candle]; break;
case $effect[The Cupcake of Wrath]: useItem = $item[Green-Frosted Astral Cupcake]; break;
case $effect[Curiosity of Br\'er Tarrypin]:
if(pathHasFamiliar() && auto_have_skill($skill[Curiosity of Br\'er Tarrypin]) && acquireTotem())
Expand Down Expand Up @@ -290,6 +294,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Eau D\'enmity]: useItem = $item[Perfume of Prejudice]; break;
case $effect[Eau de Tortue]: useItem = $item[Turtle Pheromones]; break;
case $effect[Egged On]: useItem = $item[Robin\'s Egg]; break;
case $effect[El Aroma de Salsa]: useItem = $item[Salsa Caliente&trade; candle]; break;
case $effect[Eldritch Alignment]: useItem = $item[Eldritch Alignment Spray]; break;
case $effect[Elemental Saucesphere]: useSkill = $skill[Elemental Saucesphere]; break;
case $effect[Empathy]:
Expand All @@ -298,24 +303,26 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
useSkill = $skill[Empathy of the Newt];
} break;
case $effect[Erudite]: useItem = $item[Black Sheepskin Diploma]; break;
case $effect[Ew, The Humanity]: useItem = $item[Scent of a Human&trade; candle];break;
case $effect[Expert Oiliness]: useItem = $item[Oil of Expertise]; break;
case $effect[Experimental Effect G-9]: useItem = $item[Experimental Serum G-9]; break;
case $effect[Extended Toes]: useSkill = $skill[Retractable Toes]; break;
case $effect[Extra Backbone]: useItem = $item[Really Thick Spine]; break;
case $effect[Extreme Muscle Relaxation]: useItem = $item[Mick\'s IcyVapoHotness Rub]; break;
case $effect[Everything Is Bananas]: useItem = $item[Banana Candle]; break;
case $effect[Everything Must Go!]: useItem = $item[Violent Pastilles]; break;
case $effect[Eyes All Black]: useItem = $item[Delicious Candy]; break;
case $effect[Faboooo]: useItem = $item[Fabiotion]; break;
case $effect[Far Out]: useItem = $item[Patchouli Incense Stick]; break;
case $effect[Fat Leon\'s Phat Loot Lyric]: useSkill = $skill[Fat Leon\'s Phat Loot Lyric]; break;
case $effect[Feeling Lonely]: useSkill = $skill[none]; break;
case $effect[Feeling Excited]: useSkill = $skill[none]; break;
case $effect[Feeling Nervous]: useSkill = $skill[none]; break;
case $effect[Feeling Peaceful]: useSkill = $skill[none]; break;
case $effect[Feeling Lonely]: useSkill = $skill[none]; break;
case $effect[Feeling Excited]: useSkill = $skill[none]; break;
case $effect[Feeling Nervous]: useSkill = $skill[none]; break;
case $effect[Feeling Peaceful]: useSkill = $skill[none]; break;
case $effect[Feeling Punchy]: useItem = $item[Punching Potion]; break;
case $effect[Feroci Tea]: useItem = $item[cuppa Feroci tea]; break;
case $effect[Fever From the Flavor]: useItem = $item[bottle of antifreeze]; break;
case $effect[Fireproof Lips]: useItem = $item[SPF 451 lip balm]; break;
case $effect[Fever From the Flavor]: useItem = $item[bottle of antifreeze]; break;
case $effect[Fireproof Lips]: useItem = $item[SPF 451 lip balm]; break;
case $effect[Fire Inside]: useItem = $item[Hot Coal]; break;
case $effect[Fishy\, Oily]:
if(in_heavyrains())
Expand Down Expand Up @@ -366,13 +373,14 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[The Glistening]: useItem = $item[Vial of the Glistening]; break;
case $effect[Glittering Eyelashes]: useItem = $item[Glittery Mascara]; break;
case $effect[Go Get \'Em\, Tiger!]: useItem = $item[Ben-gal&trade; Balm]; break;
case $effect[Good Things Are Coming, You Can Smell It]: useItem = $item[Smoldering Clover&trade; candle];break;
case $effect[Got Milk]: useItem = $item[Milk of Magnesium]; break;
case $effect[Gothy]: useItem = $item[Spooky Eyeliner]; break;
case $effect[Gr8ness]: useItem = $item[Potion of Temporary Gr8ness]; break;
case $effect[Graham Crackling]: useItem = $item[Heather Graham Cracker]; break;
case $effect[Greasy Peasy]: useItem = $item[Robot Grease]; break;
case $effect[Greedy Resolve]: useItem = $item[Resolution: Be Wealthier]; break;
case $effect[Gristlesphere]: useSkill = $skill[Gristlesphere]; break;
case $effect[Gristlesphere]: useSkill = $skill[Gristlesphere]; break;
case $effect[Gummed Shoes]: useItem = $item[Shoe Gum]; break;
case $effect[Gummi-Grin]: useItem = $item[Gummi Turtle]; break;
case $effect[Hairy Palms]: useItem = $item[Orcish Hand Lotion]; break;
Expand All @@ -382,12 +390,12 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Hardly Poisoned At All]: useSkill = $skill[Disco Nap]; break;
case $effect[Healthy Blue Glow]: useItem = $item[gold star]; break;
case $effect[Heightened Senses]: useItem = $item[airborne mutagen]; break;
case $effect[Heart of Green]: useItem = $item[green candy heart]; break;
case $effect[Heart of Lavender]: useItem = $item[lavender candy heart]; break;
case $effect[Heart of Orange]: useItem = $item[orange candy heart]; break;
case $effect[Heart of Pink]: useItem = $item[pink candy heart]; break;
case $effect[Heart of White]: useItem = $item[white candy heart]; break;
case $effect[Heart of Yellow]: useItem = $item[yellow candy heart]; break;
case $effect[Heart of Green]: useItem = $item[green candy heart]; break;
case $effect[Heart of Lavender]: useItem = $item[lavender candy heart]; break;
case $effect[Heart of Orange]: useItem = $item[orange candy heart]; break;
case $effect[Heart of Pink]: useItem = $item[pink candy heart]; break;
case $effect[Heart of White]: useItem = $item[white candy heart]; break;
case $effect[Heart of Yellow]: useItem = $item[yellow candy heart]; break;
case $effect[Hide of Sobek]: useSkill = $skill[Hide of Sobek]; break;
case $effect[High Colognic]: useItem = $item[Musk Turtle]; break;
case $effect[Hippy Stench]: useItem = $item[reodorant]; break;
Expand All @@ -403,20 +411,20 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Human-Machine Hybrid]: useItem = $item[Gene Tonic: Construct]; break;
case $effect[Human-Mer-kin Hybrid]: useItem = $item[Gene Tonic: Mer-kin]; break;
case $effect[Human-Pirate Hybrid]: useItem = $item[Gene Tonic: Pirate]; break;
case $effect[Hyperoffended]: useItem = $item[donkey flipbook]; break;
case $effect[Hyperoffended]: useItem = $item[donkey flipbook]; break;
case $effect[Hyphemariffic]: useItem = $item[Black Eyedrops]; break;
case $effect[Icy Glare]: useSkill = $skill[Icy Glare]; break;
case $effect[Impeccable Coiffure]: useSkill = $skill[Self-Combing Hair]; break;
case $effect[Inigo\'s Incantation of Inspiration]:useSkill = $skill[Inigo\'s Incantation of Inspiration];break;
case $effect[Incredibly Hulking]: useItem = $item[Ferrigno\'s Elixir of Power]; break;
case $effect[Industrial Strength Starch]: useItem = $item[Industrial Strength Starch]; break;
case $effect[Ink Cloud]: useSkill = $skill[Ink Gland]; break;
case $effect[Ink Cloud]: useSkill = $skill[Ink Gland]; break;
case $effect[Inked Well]: useSkill = $skill[Squid Glands]; break;
case $effect[Inky Camouflage]: useItem = $item[Vial of Squid Ink]; break;
case $effect[Inky Camouflage]: useItem = $item[Vial of Squid Ink]; break;
case $effect[Inscrutable Gaze]: useSkill = $skill[Inscrutable Gaze]; break;
case $effect[Insulated Trousers]: useItem = $item[Cold Powder]; break;
case $effect[Intimidating Mien]: useSkill = $skill[Intimidating Mien]; break;
case $effect[Invisible Avatar]: useSkill = $skill[none]; break;
case $effect[Invisible Avatar]: useSkill = $skill[none]; break;
case $effect[Irresistible Resolve]: useItem = $item[Resolution: Be Sexier]; break;
case $effect[Jackasses\' Symphony of Destruction]:useSkill = $skill[Jackasses\' Symphony of Destruction]; break;
case $effect[Jalape&ntilde;o Saucesphere]: useSkill = $skill[Jalape&ntilde;o Saucesphere]; break;
Expand All @@ -438,7 +446,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Liquidy Smoky]: useItem = $item[Liquid Smoke]; break;
case $effect[Lit Up]: useItem = $item[Bottle of Lighter Fluid]; break;
case $effect[Litterbug]: useItem = $item[Old Candy Wrapper]; break;
case $effect[Living Fast]: useSkill = $skill[Live Fast]; break;
case $effect[Living Fast]: useSkill = $skill[Live Fast]; break;
case $effect[Locks Like the Raven]: useItem = $item[Black No. 2]; break;
case $effect[Loyal Tea]: useItem = $item[cuppa Loyal Tea]; break;
case $effect[Lucky Struck]: useItem = $item[Lucky Strikes Holo-Record]; break;
Expand Down Expand Up @@ -486,10 +494,11 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Obscuri Tea]: useItem = $item[cuppa Obscuri tea]; break;
case $effect[Ode to Booze]: shrugAT($effect[Ode to Booze]);
useSkill = $skill[The Ode to Booze]; break;
case $effect[The Odour of Magick]: useItem = $item[Natural Magick Candle]; break;
case $effect[Of Course It Looks Great]: useSkill = $skill[Check Hair]; break;
case $effect[Oiled Skin]: useItem = $item[Skin Oil]; break;
case $effect[Oiled-Up]: useItem = $item[Pec Oil]; break;
case $effect[Oilsphere]: useSkill = $skill[Oilsphere]; break;
case $effect[Oilsphere]: useSkill = $skill[Oilsphere]; break;
case $effect[OMG WTF]: useItem = $item[Confiscated Cell Phone]; break;
case $effect[One Very Clear Eye]: useItem = $item[Cyclops Eyedrops]; break;
case $effect[Orange Crusher]: useItem = $item[Pulled Orange Taffy]; break;
Expand All @@ -504,7 +513,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Patent Sallowness]: useItem = $item[Patent Sallowness Tonic]; break;
case $effect[Patience of the Tortoise]: useSkill = $skill[Patience of the Tortoise]; break;
case $effect[Patient Smile]: useSkill = $skill[Patient Smile]; break;
case $effect[Paul\'s Passionate Pop Song]: useSkill = $skill[Paul\'s Passionate Pop Song]; break;
case $effect[Paul\'s Passionate Pop Song]: useSkill = $skill[Paul\'s Passionate Pop Song]; break;
case $effect[Penne Fedora]: useSkill = $skill[none]; break;
case $effect[Peppermint Bite]: useItem = $item[Crimbo Peppermint Bark]; break;
case $effect[Peppermint Twisted]: useItem = $item[Peppermint Twist]; break;
Expand Down Expand Up @@ -535,7 +544,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Power of Heka]: useSkill = $skill[Power of Heka]; break;
case $effect[The Power Of LOV]: useItem = $item[LOV Elixir #3]; break;
case $effect[Prideful Strut]: useSkill = $skill[Walk: Prideful Strut]; break;
case $effect[Predjudicetidigitation]: useItem = $item[worst candy];break;
case $effect[Predjudicetidigitation]: useItem = $item[worst candy]; break;
case $effect[Protection from Bad Stuff]: useItem = $item[scroll of Protection from Bad Stuff];break;
case $effect[Provocative Perkiness]: useItem = $item[Libation of Liveliness]; break;
case $effect[Puddingskin]: useItem = $item[scroll of Puddingskin]; break;
Expand Down Expand Up @@ -590,6 +599,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
break;
case $effect[Scarysauce]: useSkill = $skill[Scarysauce]; break;
case $effect[Scowl of the Auk]: useSkill = $skill[Scowl of the Auk]; break;
case $effect[Scorched Earth]: useItem = $item[Napalm In The Morning&trade; candle];break;
case $effect[Screaming! \ SCREAMING! \ AAAAAAAH!]:useSkill = $skill[Powerful Vocal Chords]; break;
case $effect[Seal Clubbing Frenzy]: useSkill = $skill[Seal Clubbing Frenzy]; break;
case $effect[Sealed Brain]: useItem = $item[Seal-Brain Elixir]; break;
Expand All @@ -608,9 +618,9 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[Shelter of Shed]: useSkill = $skill[Shelter of Shed]; break;
case $effect[Shrieking Weasel]: useItem = $item[Shrieking Weasel Holo-Record]; break;
case $effect[Simmering]: useSkill = $skill[Simmer]; break;
case $effect[Simply Invisible]: useItem = $item[Invisibility Potion]; break;
case $effect[Simply Invisible]: useItem = $item[Invisibility Potion]; break;
case $effect[Simply Irresistible]: useItem = $item[Irresistibility Potion]; break;
case $effect[Simply Irritable]: useItem = $item[Irritability potion]; break;
case $effect[Simply Irritable]: useItem = $item[Irritability potion]; break;
case $effect[Singer\'s Faithful Ocelot]: useSkill = $skill[Singer\'s Faithful Ocelot]; break;
case $effect[Sinuses For Miles]: useItem = $item[Mick\'s IcyVapoHotness Inhaler];break;
case $effect[Sleaze-Resistant Trousers]: useItem = $item[Sleaze Powder]; break;
Expand Down Expand Up @@ -640,7 +650,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
case $effect[The Sonata of Sneakiness]: useSkill = $skill[The Sonata of Sneakiness]; break;
case $effect[Soulerskates]: useSkill = $skill[Soul Rotation]; break;
case $effect[Sour Softshoe]: useItem = $item[pulled yellow taffy]; break;
case $effect[Spectral Awareness]: useSkill = $skill[Spectral Awareness]; break;
case $effect[Spectral Awareness]: useSkill = $skill[Spectral Awareness]; break;
case $effect[Spice Haze]: useSkill = $skill[Bind Spice Ghost]; break;
case $effect[Spiky Hair]: useItem = $item[Super-Spiky Hair Gel]; break;
case $effect[Spiky Shell]:
Expand Down
6 changes: 6 additions & 0 deletions RELEASE/scripts/autoscend/auto_post_adv.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ void auto_beaten_handler()
loc += "day:" +my_daycount()+ ":level:" +my_level()+ ":place:" +my_location();
set_property("auto_beatenUpLocations", loc);
set_property("auto_beatenUpLastAdv", true);

//try to avoid getting beaten up again
buffMaintain($effect[Everything Is Bananas]);

if(my_location() == $location[The X-32-F Combat Training Snowman])
{
Expand Down Expand Up @@ -919,6 +922,9 @@ boolean auto_post_adventure()
buffMaintain($effect[Carol of the Thrills], 30, 1, 1); //3MP/adv for non ATs. +3 XP/fight
buffMaintain($effect[Aloysius\' Antiphon of Aptitude], 40, 1, 1); //4MP/adv for non ATs. +3 XP/fight split equally 1 per stat.
}
// items which give stats
buffMaintain($effect[Scorched Earth]);
}
Expand Down
3 changes: 3 additions & 0 deletions RELEASE/scripts/autoscend/auto_providers.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ float provideInitiative(int amt, location loc, boolean doEquips, boolean specula
Adorable Lookout,
Alacri Tea,
All Fired Up,
Clear Ears\, Can't Lose,
Fishy\, Oily,
The Glistening,
Human-Machine Hybrid,
Expand Down Expand Up @@ -752,6 +753,7 @@ int [element] provideResistances(int [element] amt, location loc, boolean doEqui
Hyphemariffic,
Sleaze-Resistant Trousers,
Hyperoffended,
Covered in the Rainbow,
]))
return result();
}
Expand Down Expand Up @@ -1017,6 +1019,7 @@ float [stat] provideStats(int [stat] amt, location loc, boolean doEquips, boolea
Unrunnable Face,
// all-stat effects
Confidence of the Votive,
Human-Human Hybrid,
Industrial Strength Starch,
Mutated,
Expand Down
4 changes: 4 additions & 0 deletions RELEASE/scripts/autoscend/auto_restore.ash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1721,6 +1721,10 @@ boolean acquireMP(int goal, int meat_reserve, boolean useFreeRests)
return true;
}

//since we need to restore, lets reduce MP cost of future skills
buffMaintain($effect[The Odour of Magick]);
buffMaintain($effect[Using Protection]);

// Sausages restore 999MP, this is a pretty arbitrary cutoff but it should reduce pain
// TODO: move this to general effectiveness method
if(my_maxmp() - my_mp() > 300)
Expand Down
Loading

0 comments on commit dcc3be1

Please sign in to comment.