Merge branch 'beta'

.github/workflows/ci.yml

@@ -23,27 +23,23 @@ jobs:
       id: mafia
       run: |
         set -o pipefail
-        export MAFIA_VERSION=$(head -n1 RELEASE/scripts/autoscend.ash | grep -o '[0-9]\+')
-        if [[ -z "$MAFIA_VERSION" ]]; then
-          echo "Couldn't determine required mafia version!"
-          exit 1
-        fi
-        export MAFIA_BUILD=$(curl --fail --silent --globoff 'https://ci.kolmafia.us/job/Kolmafia/api/json?tree=builds[number,artifacts[relativePath]]' | jq '[.builds[]] | map(select(.artifacts[].relativePath | contains(env.MAFIA_VERSION))) | .[] | .number' | head -n1)
+        export MAFIA_BUILD=$(curl --fail --silent --globoff 'https://ci.kolmafia.us/job/Kolmafia/api/json?tree=lastCompletedBuild[changeSet[items[revision]]]' | jq '.lastCompletedBuild.changeSet.items[0].revision')
         if [[ -z "$MAFIA_BUILD" ]]; then
-          echo "Couldn't determine Jenkins build number!"
+          echo "Could not determine mafia version of Jenkins last completed build!"
           exit 1
         fi
-        export JENKINS_URL="https://ci.kolmafia.us/job/Kolmafia/${MAFIA_BUILD}/artifact/dist/KoLmafia-${MAFIA_VERSION}.jar"
+        export JENKINS_URL="https://ci.kolmafia.us/job/Kolmafia/lastCompletedBuild/artifact/dist/KoLmafia-${MAFIA_BUILD}.jar"
         echo "::set-output name=jenkins::$JENKINS_URL"
+        echo "Jenkins URL = ${JENKINS_URL}"
         echo "::set-output name=build::$MAFIA_BUILD"
-        echo "::set-output name=version::$MAFIA_VERSION"
+        echo "Jenkins Mafia Build = ${MAFIA_BUILD}"
 
     - name: Cache KoLmafia
       id: cache
       uses: actions/cache@v2
       with:
         path: .github/kolmafia.jar
-        key: kolmafia-${{steps.mafia.outputs.build}}-${{steps.mafia.outputs.version}}
+        key: kolmafia-${{steps.mafia.outputs.build}}
 
     - name: Download KoLmafia
       if: steps.cache.outputs.cache-hit != 'true'

BUILD/monsters/sniff.dat

@@ -9,7 +9,7 @@ Pygmy Bowler
 Pygmy Witch Surgeon
 pygmy witch accountant	loc:The Hidden Office Building
 pygmy witch accountant	loc:The Hidden Apartment Building;effect:Thrice-Cursed
-Pygmy Janitor	!tavern:true
+Pygmy Janitor	loc:The Hidden Park;!tavern:true
 Quiet Healer
 Tomb Rat
 Blooper	loc:8-Bit Realm

BUILD/settings/any.dat

@@ -1,24 +1,25 @@
 auto_skipNEPOverride	boolean	If true will not use the Neverending Party even if mafia says it is available.
+auto_skipGuzzlrCocktailSet	boolean	If true will not accept and abandon a Platinum Guzzlr quest for the cocktail set.
+auto_mushroomGardenGrowth	integer	Picks the mushroom when growth reaches the given value (or higher). Defaults to 1 to pick every day, capped at 11.
 auto_delayHauntedKitchen	boolean	Should we delay the Haunted Kitchen until we have 9 resist? (Or in Ed, Even More Elemental Wards)?
 auto_dickstab	boolean	Do you want to let the script potentially spend lots of meat just to shave off a few adventures? You probably don't.
 auto_getDinseyGarbageMoney	boolean	Spend a few turns getting the easy FunBucks during a run?
-auto_borrowedTimeOnLiberation	boolean	Automatically use Borrowed Time when liberating the King? This assumes that you are going to bother to ascend again the same day.
 auto_delayTimer	integer	Sets the delay before each action, default is 1 second(s). It is not recommended to reduce this below 1.
 auto_powerLevelTimer	integer	Delay in seconds before each time we spend an adv powerleveling. default is 10 sec. lowest valid value is 1.
-auto_kingLiberation	boolean	Use the CHEDDAH kingLiberation script?
 auto_stayInRun	boolean	If true, we stop when the King can be freed but do not free the King. Paths with a choice at liberation time will always stayInRun regardless of this setting.
 auto_confidence	boolean	If true, we'll get the confidence buff instead of breaking the mirror. Good if your combat suite isn't very fleshed out yet, since it makes the Naughty Sorceress dramatically easier.
 auto_teaChoice	string	When using the tea tree, grab this 'tea'. Must use a string that acceptable to Mafia's 'teatree' command (Use ; to separate by daycount, leave blank to skip a day).
 auto_floundryChoice	string	Force floundry usage. Must use the item name (Use ; to separate by daycount, leave blank to skip a day).
-auto_xiblaxianChoice	string	When using Xiblaxian Stuff, do we make a Xiblaxian Ultraburrito or Xiblaxian Space-Whiskey
 auto_extrudeChoice	string	: separated by day, ; separated by order. Use food, booze. Defaults to booze for any empty fields.
 auto_mummeryChoice	string	Force mummery usage. Use familiar name and goals are in order (1..7) (Use ; to separate, leave blank to skip a goal).
 auto_blacklistFamiliar	string	A semi-colon separated string of familiar names that we do not want to use. They still may get used but this will minimize their usage.
 auto_doArtistQuest	boolean	If set, we will try to do the artist quest. If the artist is not-accessible, the setting will silently disable.
 auto_ashtonLimit	integer	If set, makes sure you save X of an item before feeding it to the Asdon Martin (ignores Soda Bread).
-auto_limitConsume	boolean	When true, will not eat or drink anything automatically.
+auto_limitConsume	boolean	When true will not eat or drink anything automatically.
+auto_skipNightcap	boolean	When true will not get overdrunk at the end of the day
 auto_consumeMinAdvPerFill	float	The minimum adventures per fill to consider for a consumable before eating or drinking it. Defaults to 0.0 and will consume whatever is available if necessary.
-auto_consumeKeyLimePies	boolean	When true, will pull and eat key lime pies if we require keys. Does nothing if auto_limitConsume is true;
+auto_consumePullDesirability	float	This value is used as a rough estimate of how much a pull is "worth" when the consumption algorithm is considering using pulls. Higher values will make it more conservative and vice-versa. Defaults to 5.0.
+auto_dontConsumeKeyLimePies	boolean	When false, will pull and eat key lime pies if we require keys. Does nothing if auto_limitConsume is true;
 auto_maximize_baseline	string	The string to use as the baseline for the maximizer when deciding gear. If this is blank or "default", it will use a generated maximizer statement that takes your current situation in to account somewhat.
 auto_equipment_override_hat	string	A semicolon separated list of overrides for the hat slot.
 auto_equipment_override_back	string	A semicolon separated list of overrides for the back slot.
@@ -33,7 +34,7 @@ auto_consultClan	string	The clan name of the player you want to do Zatara consul
 auto_consultChoice	string	The name of the player you want to do Zatara consults with.
 auto_considerGalaktik	boolean	When true autoscend may automatically enable galaktik quest for this run if it decides it is needed.
 auto_slowSteelOrgan	boolean	When true, don't immediately go for the Steel Organ (assuming we want a steel organ).
-auto_skipUnlockGuild    boolean When true, don't unlock the guild.
+auto_skipUnlockGuild	boolean	When true, don't unlock the guild.
 auto_save_adv_override	integer	Set an override to amount of adv to save at end of day. Set to -1 to handle this automatically.
 auto_saveMagicalSausage	boolean	When true, don't eat magical sausage, so you can save them up for aftercore.
 auto_useWishes	boolean	When true, use the Genie Bottle to go faster in non-Community Service runs.

BUILD/settings/sharing.dat

@@ -1,2 +1 @@
-auto_allowSharingData	boolean	Allow the script to send information about the ascension to a sad, abused database in hopes of great spades? Specifics will appear (at the bottom) once set to true.
-auto_shareMaximizer	boolean	Share maximzer data. This includes the maximzer string, class, path, softcore/hardcore and moon sign.
+auto_disableExcavator	boolean	When set to true will disable automatically sending spading data via the Extractor script

BUILD/settings_extra/post.dat

@@ -26,5 +26,7 @@ _auto_witchessBattles	integer	Tracker for Witchess Combats (yes, this is actuall
 auto_needLegs	boolean	In Ed, do we require getting legs before trying to Ka farm?
 auto_haveoven	boolean	Track oven status. If you have an oven this should be true. But we can't always check the campground.
 auto_doGalaktik	boolean	Do Galaktik optional sidequest this ascension?
+auto_doArmory	boolean	Do Lending a Hand (and a Foot) optional sidequest this ascension to unlock madeline baking supply?
+auto_doMeatsmith	boolean	Do Meatsmith optional sidequest this ascension?
 auto_L8_ninjaAssassinFail	boolean	True means we think we cannot defeat ninja snowmen assassins and are thus avoiding them this ascension. We will not copy them nor adventure in the lair of the ninja snowmen
 auto_L8_extremeInstead	boolean	True means we want to adventure in the extreme slope path instead of the ninja snowmen lair this ascension.

README.md

@@ -11,6 +11,10 @@ Seriously, we need and want the help. Want to learn how to code? Or maybe you kn
 autoscend is a script that will play through an entire ascension for you in the Kingdom of Loathing.
 It is built up from sl\_ascend and cc\_ascend before it.
 
+autoscend's goal is to be able to brute force an ascension for all paths of KoL, not to do it optimally, but within a couple of real-life days of the target. If you bear this in mind while you use it, you will have a much better experience.  
+If, however, you expect it to run absolutely bleeding edge ascensions with optimal day/turn counts you are in for a world of disappointment.  
+A general purpose ascension script, which supports accounts with any number of perms and/or Mr Store items from none to almost all, will not be optimally tuned to your specific situation. We suggest you adjust your expectations accordingly.
+
 ## License
 [![License: CC BY-NC-SA 4.0](https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png)](https://creativecommons.org/licenses/by-nc-sa/4.0/)  
 This work is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-nc-sa/4.0/).
@@ -60,9 +64,7 @@ requirements section. Other classes should work as well, but Sauceror works best
 
 ## Two Crazy Random Summer
 
-The recommended class/sign combination for running autoscend in TCRS is Sauceror/Blender.
-Other signs should work okay too, but they won't have any special support (like automatic diet,
-or using certain nice cheap potions).
+We do not recommend running autoscend on this path as the item seeds change almost monthly which makes it impossible for us to support it reliably.
 
 ## Actually Ed the Undying
 
@@ -107,6 +109,12 @@ gausie (IGN: gausie (#1197090))
 
 taltamir (IGN: taltamir (#2195333))
 
+phulin (IGN: worthawholebean (#1972588))
+
+chunkinaround (IGN: threebullethamburgler (#1993636))
+
+Phillammon (IGN: Phillammon (#2393910))
+
 ## Special Thanks
 
 This script would obviously not be possible without the work of Cheesecookie and soolar.

RELEASE/data/autoscend_familiars.txt

@@ -27,7 +27,7 @@ drop	0	Fist Turkey	prop:_turkeyBooze<5
 # drops 1 per combat with chance of 2nd if wearing familiar specific equip
 drop	1	Puck Man	item:Yellow Pixel<20
 drop	2	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
+# 1st wax drop per run only takes 5 combats, afterwards 30. makes a single size 2 density 4.25 food or drink 
 drop	3	Optimistic Candle	prop:optimisticCandleProgress>=25
 # 1st robin egg per run only takes 5 combats, afterwards 30. potion that gives all res +3
 drop	4	Rockin' Robin	prop:rockinRobinProgress>=25

RELEASE/data/autoscend_monsters.txt

@@ -106,7 +106,7 @@ sniff	7	Pygmy Bowler
 sniff	8	Pygmy Witch Surgeon
 sniff	9	pygmy witch accountant	loc:The Hidden Office Building
 sniff	10	pygmy witch accountant	loc:The Hidden Apartment Building;effect:Thrice-Cursed
-sniff	11	Pygmy Janitor	!tavern:true
+sniff	11	Pygmy Janitor	loc:The Hidden Park;!tavern:true
 sniff	12	Quiet Healer
 sniff	13	Tomb Rat
 sniff	14	Blooper	loc:8-Bit Realm