Generic modern json (CleverRaven#38004) #82
Merged
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
There are still two loose ends on proper encapsulation here. Namely, the non-const get_field() and get_items(). These need to be replaced with either the necessary setters or by moving necessary code to submap.
* Craft soapy water out of soap flakes Add soap flakes as a componet for crafting soapy water. * Update recipe_medsandchemicals.json Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
fix typo
* add more basements * Update regional_map_settings.json
* Added recipe for ghee I noticed we didn't have a ghee recipe, so I added one. It seemed similar to cooking_oil2 so I used that as a base. Should I add a rag to the components to represent straining through cheesecloth? Should it require a strainer? * Now you need a strainer of some sort. added a variety * Make craft time realistic Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Added an indian cookbook, moved curry and ghee recipes to that Tested and things seem to be working * Itemgroups added The book should spawn in a number of different places now, with a fairly low distribution. Not married to those numbers, though * Set ghee recipe to be in cookbook * Removed Indian Cookbook from books, itemgroups, and recipes Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Tweaked description window x start point
Fix typo on pages.h
Ammo Name to object leave the s, double have decimal
* Ignore missing author login instead of crashing. * Import changelogs up to January 2020. * Copyedit changelog
…ts (#37604) * Add boiled fiddleheads to any_veggy Fiddleheads should be more well integrated into the game. I've added them to any_veggy and removed the ability to boil fiddleheads in broth to avoid recursion errors * Update cooking_components.json Added a requirement list including cooking oils and butter, because many recipes should work fine with any of them * Added new list to pancakes recipe for testing So I can test the "any_butter_or_oil" requirement I swapped out the cooking oils for it * cooking_oil1 isn't a thing >__< * lint * Tests Past. Cake recipe time I ran a simple test, seeing if I could craft pancakes with butter. Worked fine. I'm gonna edit recipe_food.json next. Tests to follow * Added new cooking component: fry_oil For when you want the food to absorb some of the fat it's being deep fried in. Potato chips and French fries both use fry_oil, which contains cooking_oil, cooking_oil2, and ghee. All tested. Works properly for me * Update recipe_food.json Changed a bunch of recipes to use any_butter_or_oil. Tested each one. Seems to work fine * Fixed syntax error * Many minor changes to recipes I made fried liver and fried tripe use fry_oil Canged some pan frying oils to any_butter_or_oil Added boiled and sauteed fiddleheads to salad recipe Added salsify_baked to any_veggie * Took dandelion_cooked out of recipe because it's already in veggy_any * Update tile_config.json * Trying to pass tests * Update veggy_dishes.json Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Prevent potential DBZ in vehicle smash code
Gun-name-to-object-leave-the-s
To avoid meaningless repetitive editing.
…to-object Tool_armor, gun and monster name to object
…sidebar-option Fix duplicate sound display for labels sidebar
* use different pos as random NPC can be invalidated * remove random guy
Fix clang-tidy error with panels.cpp
Improve submap encapsulation
Comestible Name to object
Fix ui hotkey help not updating
Change good and bad memory traits have changed to match the new skill rust system
Update COMPILING-VS-VCPKG.md
The effect mutations have on limb mending was hardcoded in a if/else ladder. Yuck! Also, some of the slow healer mutations were not having an impact on mending speed, so add that.
* Add tests for basic info, conductivity, qualities Tests item info for description, category, volume, weight, qualities and conductivity. * Enhance and clean up iteminfo tests Include price and material in basic info test; refactor armor_info tests into one test case with two sections. All passing. * Add weapon, repairability, and flags Includes tests for: - Weapon attack rating and mvoes - Techniques when wielded - Repairability and with what tools - Item description flags * Add missing brace and fix brace style * Expand ranged weapon and food spoilage tests Using compound bow to test: - reload time - firing mode - weapon mods Using pine nuts to test: - freshness/spoiled indicator * Remove longshirt repair test This test fails with the magiclysm mod loaded, since it inserts "enchanted tailor's kit" into the repair options. Since it's not essential, I simply took it out for now. * Remove trailing space Co-Authored-By: Isaac Freund <ifreund@ifreund.xyz> * Disable lint for reload time test Co-Authored-By: Isaac Freund <ifreund@ifreund.xyz> * Ensure consistent spoilage estimate in test item.cpp#L934 `get_freshness_description` gives more detailed rot estimation messages to more skilled characters. Travis-CI revealed this test failing sometimes; this commit should ensure a consistent (0) skill level when testing these messages. Co-authored-by: Isaac Freund <ifreund@ifreund.xyz>
* Name to object, volume to string * Name to object, volume to string
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context