Support Cup of 13s as a once/day drink - #1754
Open
Danre98 wants to merge 28 commits into
Open
Conversation
Compensates for no ode to booze
midgleyc
reviewed
Jul 21, 2026
| // auto_canMakeCupOf13sDrink() expects that $item[none] is located in slot #3 (at least) of the return value if we were unable to pick an alternative to spoon | ||
| else {spoon_alt = $item[none];} | ||
|
|
||
| // summon spoons if possible. We do this here because mafia doesn't track how many times we can cast generate irony |
Member
There was a problem hiding this comment.
get_property("skillLevel245").to_int() (and _generateIronyUsed)
Contributor
Author
|
Nearly ready, just needs a quick set of tests to ensure the spoon summoning is all good. Expecting to be ready for review this weekend. |
Danre98
marked this pull request as ready for review
August 3, 2026 06:45
midgleyc
reviewed
Aug 3, 2026
|
|
||
| // Add cup of 13s if we are looking to drink | ||
| if(type == AUTO_ORGAN_LIVER && auto_haveCupOf13s() && get_property("_cupOf13sJewels") >= 12 && auto_canMakeCupOf13sDrink()) { | ||
| // really, it's 12 adventures, not 11.0. But we lose one relative to the other options because ode doesn't apply |
Member
There was a problem hiding this comment.
I don't think this matters practically, because 11adv / drunk is better than anything but pilsners (or stillsuit distillate), but we only lose one adventure due to ode not applying if we're in a path that can cast ode (or Pete, who has Rowdy Drinker).
midgleyc
reviewed
Aug 3, 2026
| @@ -786,7 +783,8 @@ void finalizeMaximize(boolean speculative) | |||
| if(toEquip != "") | |||
| { | |||
| removeFromMaximize("-equip " + toEquip); | |||
Member
There was a problem hiding this comment.
we're removing -equip unquoted and adding equip quoted. is this ever an issue?
midgleyc
reviewed
Aug 3, 2026
| string itString = it.to_string(); | ||
| // maximizer uses commas, so can't have a comma in an item name | ||
| // fortunately fuzzy matching means just stripping out the comma is fine | ||
| itString = itString.replace_string(",", ""); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Implements Cup of 13s as pure turnbloat--using spoon, dripping meat staff, and/or meat shield to create a 12 adv drink, net 9-12 advs depending on crafting. In effect this makes it 1/day because we use 12 of the 13 gems to do this.
Could be implemented to use more drunkenness and/or take advantage of the effects and/or use more ingredients (probably by someone else), but this is good enough for me.
Fixes #1751, introduced by the Cup of 13s.
How Has This Been Tested?
Not yet, will probably be tested along with #1753 in a combined (separate) testing branch.
Edit: Tested over a few standard runs
Checklist: