c #20
Merged
c #20
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
…ing items with charges
Some of the translation tests verify the existence of a path, but don't say what that path is on failure. Capture the path so that they do.
This related to a libintl bug and is no longer relevant now that we don't use libintl.
The new translation tests require a .mo file to be compiled related to the TEST_DATA mod. This was done for CI in the build.sh script, but that's not appropriate for local users. Move the commands from build.sh to Makefile and CMakeLists.txt. Also, add a stamp file so that the Makefile does not rebuild the .mo files unnecessarily.
* Add penalties for fighting while prone Accuracy: - 80% chance for large to-hit penalty, 20% for small penalty Damage: - Reduced to 30% of normal damage Stumble: - 4x penalty to STR when determining stumble severity Attack speed: - 4x movement cost penalty Stamina cost: - Increase stamina usage by 50 * Add lesser penalties for crouching Accuracy: - 75% chance of lesser to-hit penalty, 25% chance of no penalty Damage: - Damage while crouched reduced to 80% Stumble: - Half STR applied to stumble calculation Attack speed: - 50% extra move cost Stamina cost: - Increase stamina cost by 20
* Re does the stuff from #51639 and adds a better pipe-spear as a second stage.
* Update recipe_deconstruction.json * Update recipe_deconstruction.json * Update recipe_deconstruction.json
Support the translation tests better outside of CI
* Fix crash when repairing items This was caused by #51600 which pops the current target if cannot_continue_repair is true. However, this popped target is later used as fix_location (it's a reference set earlier). This also fixes #51828 and #51674. * Update src/activity_handlers.cpp Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
Previously only the cardinal directions and above were supported; now all eight horizontal neighbours, above, and below are.
[Magiclysm] Add bag of infite knives, allow to specify more conditions for artifact recharging
[Fuji_Mil_Prof] Removes Lingering MBRs and Further Fixes #44207
* Snail Mutation tree * Batrachian Mutation Tree * Mixed work to complete mutation trees Need to add rabbit dreams Additional Insect and Cattle traits Merge fixes, rabbit dreams, eoc * Night Raider and Tunnel Fighter traits * Make Spiked Tail insect * Enchantment Condition Day and Night Co-authored-by: actual-nh <actual-nh@users.noreply.github.com>
…1734) * Spelling fix on Meditation * Smartphones and Other Tweaks Most professions that started with a cell phone now start with a smartphone. Survivalist types who would prefer the reliability of replaceable batteries, as well as the political prisoner, retain their cell phones. Phones were not added to characters who didn't already have one, though there's a case that could be made for why some of them should. Removed scissors from Tailor, as a pair are included in the tailor's kit which provides cutting quality Gave the Special Operator a battery for their radio. Removed the Crazy Cat Lady/Dude's winter coat and boots since those are far too warm for the default start, gave them sneakers and a messenger bag to make up for the loss of inventory space. I assume this was left unchanged when the starting date was updated to be later in Spring, as the Survivor also used to start with the same coat and boots. Gave the Day Driver and Kitted Survivor long-sleeved shirts instead of their t-shirts and light jackets to bring them in line with Survivor clothing setup. Replaced the Burglar's balaclava with a ski mask. There was a note in the file stating that a ski mask would be preferable equipment but that it did not work with Wool Allergy. Now that we have replacement gear for wool allergy starts, listing the ski mask in the burglar's equipment is okay as it will be automatically swapped to the balaclava in the event the player chooses Wool Allergy. Replaced the Sorority Girl's tank top and leather jacket with a polo shirt to better match the Frat boy's loadout. If there was a specific reason for giving her those clothes, let me know. Misc. underwear tweaks, giving top underwear to some female professions that were inexplicably missing them, and replacing regular bras with sports bras and briefs with boxer shorts for the more active professions Removed the reference to the Professional Cyclist being young. The age mechanic is a can of worms when it comes to professions that don't make sense above or below a certain character age, but that's beyond the scope of what I was doing here. Removed the reference to the Combat Mechanic being a high school dropout. Changed the spelling of "armour" to the American English spelling of "armor". Expanded the Hobo's description a bit because it seemed too short, drawing on the old description for inspiration. Tweaked the Motorized Police Officer's description to differentiate it from the Police Officer's, and to justify the lack of a starting motorcycle. Genericized the Biker's description from the Harley-Davidson brand to just "motorcycle". Gave the Mail Carrier a more accurate US Postal Service reference in their description. Removed references to aliens in the Mail Carrier and Meth Cook's descriptions, for consistency with the other professions that universally only reference zombies as the main threat in the world. Changed "holiday" in the Tourist's description to the American term, "vacation". Miscellaneous edits to profession descriptions to fix spelling and grammar mistakes, and to bring some of the excessively lengthy ones more in line with the rest. Corrected the Blackbelt's name to "Black Belt" Capitalized the "boss" in the Mafia Boss' name for consistency with the other professions. * gave a purse to the Sorority Girl removing Sorority Girl's leather jacket prevented her from having any storage for her items. a purse seemed like a reasonable compensation. Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
* prying and oxytorch documentation * prying_data loading * prying activity_actor * use prying activity_actor * prying tests * prying data and qualities to terrains, furniture and items * clang_tidy fix 1 Co-authored-by: Saicchi <Saicchi@users.noreply.github.com>
* BATONS * KNIVES * PISTOLS * RIFLES
[DinoMod] dino weak points
* First tranch of snippets for corpses. Hopefully to encourage others to add some. Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
* Added hat * Added suit * Added to a itemgroup. Feel free to suggest other places this may go.
The new Makefile-based json styling breaks for json files whose paths contain spaces. This happens in particular in some sound packs. There's no good way to make Makefiles handle lists of paths which might contain spaces, so just skip those. They won't be checked in files anyway. And if you really want to style them style-all-json will work.
* Added Debug Stamina mutation Defined the (inexhaustible) Debug Stamina mutation. Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
* Added hat * Added suit * Added to a itemgroup. Feel free to suggest other places this may go. * Added a simple map extra depicting a violent prisoner escape from a prison van. * test? * Changed some numbers a little. Done in web-editor.
…s when using plastic bags (#51797) Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
* New set of Hobbies * Update hobbies.json * Update hobbies.json * Update hobbies.json * Update hobbies.json * Update hobbies.json * Update data/json/hobbies.json * Update data/json/hobbies.json * Update data/json/hobbies.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Fix stats through kills variable initialization
Update the table of contents in doc/JSON_INFO.md
Routine i18n updates on 25 September 2021
Use cata_fatal() instead of abort() in enum_to_string<relic_recharge_has>()
Minor fixes to #51630
* Clean up rithmatic * Update NPCs.md * Update npctalk.cpp * Update npctalk.cpp
* Fixed base camp bb handling of multi line entries * Added second canteen base camp expansion
* remove can_consume
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
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context