Merge pull request CleverRaven#36724 from ZhilkinSerg/sa-2020-01-05 #41
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
Actually learned recipes and the displayed list had gone out of sync.
…ecipe-display Prune secret recipes from character creation display
Move bronze to materials.json
* spellcasting npcs adds spellcasting npcs to magiclysm * linted linted * continuing spellcasting npcs should be the last peices to get them working in game * linted, again misplaced file and linted * linted finally, maybe. * names more descriptive information in the mission dialog * spaces added spaces after periods (double space after each .) * ellipses changed ellipses to the unicode character * Update data/mods/Magiclysm/npc/missiondef.json Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru> * Update data/mods/Magiclysm/npc/missiondef.json Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru> * Update data/mods/Magiclysm/npc/missiondef.json Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru> * Update data/mods/Magiclysm/npc/missiondef.json Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru> * travis fix fixed double space, tag in wrong file, tag incomplete * more travis * travis maybe this is right? * travis the third * travis the final? Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Moved canning pot and can sealer required recipes to canned.json. Leave pickled items in food.json.
Plant derived materials do burn IRL. references #30111
* Added 2 new NPCs, upgraded mapgen
* Increase food spawns
* Create foodguard.json
* Create cook.json
* grammar fix
* grammar and wording fix
* grammar and wording
* Update data/json/npcs/godco/cook.json
Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru>
* fix novels
Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
* more natural speech
* prob & count
* fix: { "trust": 2 }
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Part of the project to deprecate player
* Classes and NC Rabbit Raiser * Mr Lapin and edits to class items * Cabin additions Mission change in npc as well * Linting and validation * Update Mr_Lapin.json * try to fix errors * remove chance Maybe this will work? * Update cabin.json * I think this has fixed it * Update classes.json * item groups and collections * Update NC_Rabbit_Raiser.json learning new ways to mark entries * Update classes.json * See if this works * fixed errors from tests * Update specials.json * Update specials.json * Update overmap_terrain.json * Update Mr_Lapin.json * Update Mr_Lapin.json * Update Mr_Lapin.json * Additional spaces after punctuation * Update data/json/overmap/overmap_special/specials.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Move class to Lapin file Consolidating to the holdouts npc file. Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Code optimizations reported by static code analysis (2020-01-05)
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