Ammo file refactoring #404
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
Contributor
LengthenedGradient
commented
Apr 25, 2024
LengthenedGradient
commented
- Refactors VerifyData in the ammo file
- Provides documentation for the ammo file
- Eliminates cook off edge cases that were confirmed unintended when first implemented.
Annotated some more things in the file, Simplified the logic of VerifyData and fixed what was confirmed to be a likely typo in the detonation code that prevented ammo crates with a single shot from being able to cookoff, only detonate. (Planned in a future commit is to fix cookoffs being impossible for shells above a certain weight)
Caps the VolumeRoll randomness to 25% minimum, particularly for larger calibers. Originally `BulletData.RoundVolume ^ 0.5` was not capped and could reach values above 150 (e.g. 155mmC AP), and since math.rand(0,150) is never larger than 150, it was possible for high caliber ammo types to be immune to cookoff. This was confirmed as unintentional. Adjusting the random range would require us knowing some upper bound on BulletData.RoundVolume (if you consider ACF missiles than the upper bound stretches the range quite a bit). So capping is the simplest solution that doesn't change the detonation changes for anything below the cap. I determined 25% minimum was a reasonable choice, but that could be changed if necessary. AmmoRoll was updated for the very rare case that the random call returns exactly the ratio (e.g. 1 for 1)
- Improved caliber verification for non scalable weapons, now it should properly default to 50mm if the weapon is defined but the user failed to provide a caliber value. - Fixed weapon name and weapon short name having trouble accounting for scalable weapons having items registered items under them. - Added a bunch of spaces between variables and the start of conditions. - Removed seemingly unused WeaponData field from ammo crates.
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.