Skip to content
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

Use ammo_effect_str_id instead of std::string #73931

Merged
merged 7 commits into from
Jun 15, 2024

Conversation

Fris0uman
Copy link
Contributor

@Fris0uman Fris0uman commented May 19, 2024

Summary

None

Purpose of change

Describe the solution

  • Replace the thing with the other thing

  • Replace the RECOVER_n pseudo flag string parsing with a recovery_chance entry

  • Change how the probability is computed from 1 - (1/n) to n/100

  • Update json to use the new system: I'm keeping the same number as I don't think anyone writing those json expected the probability to be 1-(1/n) rather than n/100

Describe alternatives you've considered

Testing

Compile without error
Load a new game without error

Additional context

Most of those hardcoded "effects" should probably be flags instead but that's out of scope for this PR

We can change the recovery values if we want, some values seem pretty low but I'm not sure

@github-actions github-actions bot added Bionics CBM (Compact Bionic Modules) Vehicles Vehicles, parts, mechanics & interactions Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves json-styled JSON lint passed, label assigned by github actions labels May 19, 2024
@Fris0uman Fris0uman marked this pull request as ready for review May 22, 2024 14:42
@github-actions github-actions bot requested a review from KorGgenT May 22, 2024 14:42
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label May 22, 2024
@Fris0uman Fris0uman marked this pull request as draft May 22, 2024 15:47
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Archery Bows, crossbows, arrows, bolts labels May 30, 2024
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs labels May 30, 2024
@Fris0uman Fris0uman marked this pull request as ready for review May 30, 2024 11:57
@Fris0uman Fris0uman marked this pull request as draft May 30, 2024 12:05
@github-actions github-actions bot added Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Xedra Evolved Anything to do with Xedra Evolved labels May 30, 2024
@Fris0uman Fris0uman marked this pull request as ready for review May 30, 2024 12:39
@github-actions github-actions bot requested a review from Maleclypse May 30, 2024 12:39
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 30, 2024
@Maleclypse
Copy link
Member

Much clang angry.

@Fris0uman Fris0uman marked this pull request as draft June 3, 2024 20:00
@Fris0uman Fris0uman marked this pull request as ready for review June 3, 2024 20:06
@Fris0uman Fris0uman marked this pull request as draft June 4, 2024 08:08
@Fris0uman Fris0uman marked this pull request as ready for review June 5, 2024 12:55
@github-actions github-actions bot added the SDL: Tiles / Sound Tiles visual interface and sounds. label Jun 10, 2024
@dseguin dseguin merged commit 0c7dd6a into CleverRaven:master Jun 15, 2024
24 of 27 checks passed
@Fris0uman Fris0uman deleted the ammo_effects_id branch June 17, 2024 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Code: Tests Measurement, self-control, statistics, balancing. <Documentation> Design documents, internal info, guides and help. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Archery Bows, crossbows, arrows, bolts [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Xedra Evolved Anything to do with Xedra Evolved Monsters Monsters both friendly and unfriendly. SDL: Tiles / Sound Tiles visual interface and sounds. Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants