forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge pull request CleverRaven#39645 from Brian-Otten/melee-weapon-ba… #149
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
Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
…-Otten/Cataclysm-DDA into Melee-weapon-balance-fists
It makes more sense to name the statistics, since both scores and achievements are based on them, and we would only end up writing the same information twice. So, if a score has no description, derive one from its statistic.
Currently we track the time of the cataclysm, but not the time of the game starting. This is needed for achievements (and potentially other things, like missions) so add it. In legacy saves, it will default to the same time as the cataclysm.
Add new enumerator, and move into header.
Allow for achievements to specify a minimum or maximum time bound within which they must be completed. Test this with a new "kill within the first minute" achievement. With this change, achievements can now become "failed", meaning that it is impossible to ever achieve them in this game. Failed achievements get sorted to the bottom of the list, and get a new colour scheme. As a side-effect, other requirements can also get a "<=" constraint, which also means they can become impossible to satisfy, and can lead to achievements being failed. To support this we need to track which statistics are monotonic, so we know when such failures are irreversible.
Was printing e.g. "day 0" when it was "day 1".
To ensure consistent output from achievement tests.
Added wayfarer and spiritual traits, some skills and 2 more points to medieval peasant scenario.
[Aftershock] Change "faulty" to "burnt out" in PrepNet mission dialogues
Remove name_plural and replace it with str_pl
fix disappearing NPCs
Correctly namespace more math functions.
re-incorporates vehicular shelving that marries ceonvention between the vanilla `cargo_rack`, the `rack_blaze` from old blazemod and the `afs_hauling_space` from Aftershock. Predominately uses Shard's (from Shard's additions) `cargo_racks` as a direct reference.
Unarmed weapon balance (Part 1 of melee weapon balance project)
Blazemod Mini-PR: Further refactor blaze vehicle parts
Fixed bug where the air drag coefficient of a vehicle isn't updated when doors are opened/closed
Achievements: add support for time constraints
Add test for health effect on healing rate
Rather than using a static library for the coomon files, use an object library. Also, name it as a "common" thing, rather than a "lib" thing. This is a better fit for our use case, since we have no interest in actually installing the common library code as a library. Requires explicitly excluding messages.cpp from common files (since they conflict with test definitions). Previously this worked due to the archive member being ignored.
There are situations where ccache causes problems (such as interactions with other build accelerators) so it's useful to be able to turn it off. It remains on by default.
This includes the upstreamed version of #39441, with some improvements. And various other improvements too.
The new Catch2 version is structured so as to surface these warnings that previously did not occur. So they need to be resolved.
This was picked up by clang-tidy and has been showing up in everyone's CI.
The gender was randomized after the name was, leading to character possibly being given incorrect names for the gender.
Point apis 20200420
Add tests for BMI effect on speed
CMake tweaks to support build acceleration
Update Catch2 to v2.12.0 (from 2.9.1)
Flail weapon balance (Part 2 of melee weapon balance project)
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