d #59
Merged
d #59
Conversation
This file contains 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
As above
just one line...
The two checks were detecting string types in completely different ways. Make them both behave the same way, and remove the now-unused approach.
Warn about comparison or sorting of pairs or tuples where one of the elements is a string.
to take into account npc helpers To make it synchronize with dig_activity_actor::finish
…into update-dig-channel
add medicine cabinet item_group to house palette
Update dig_channel_activity_actor::finish to match dig_activity_actor::finish
Masochist mutation tree rework
This doesn't actually catch any more real cases in the current code, but it future-proofs while I'm thinking about such things.
The results were already being sorted, it makes sense to be consistent and sort the components too.
* Make flu shot last 6 months instead of forever The add_effect method's fourth argument "permanent" was set to true, making the flu shot last forever, despite the 30_days duration. This commit removes the permanent flag, and changes duration to 6 months (24 weeks).
adjust better pocket formula to prefer non watertight containers
allow consume menu to look in containers
* Reformat MAGIC.md tables and JSON examples * Fix typo in effect_str example Co-authored-by: Matthew S. Klosak <msklosak@gmail.com>
We don't want people to accidentally get achievements when they are merely doing dev work or debugging issues. Make it so that most debug menu functions disable achievements. Also, add a new debug menu option to re-enable them (for cases where people were just working around bugs, or when people want to debug achievements themselves). When achievements are disabled, the tracker still tracks them but doesn't print any log messages when they are attained. Longer-term, this will matter more. Once there is global tracking of achievements across games the achievements attained while they were disabled won't count towards that.
Fix typo causing thief mode bug
Enforce localized sorting 3
* fix typo in containers documentation * Update doc/JSON_INFO.md Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com> Co-authored-by: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Remove old skill boost migration code
Using the debug menu disables achievements
Churls have proper medieval daggers
In the item info display, pocket "general_info" display is now shown only if the new iteminfo_parts::DESCRIPTION_POCKETS flag is given, and contents info is only added if DESCRIPTION_CONTENTS is given. These changes allow 3 of the formerly failing iteminfo_test assertions to pass. The other 2 formerly failing tests related to BASE_RIGIDITY, which is handled at the pocket level now), so the "item rigidity" tests were simply removed.
Fix iteminfo tests and refactor pocket display
add new tea item_groups
This is a bit of a hack, but usage of a global seems to be the minimally invasive way to do this. Also categorized the messages into Info, Warning, and Error types.
Add previously missing json-loading of desc_freq in music instruments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
d