fix: Remove ammo types from Taurus Raging Bull revolver #5593
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.
Checklist
Required
main
so it won't cause conflict when updatingmain
branch later.Optional
Purpose of change
The Taurus Raging Bull is a five cylinder revolver in .454 casull. In-game, it also fires .45 colt and .410 shot, but according to the Wikipedia article, only the Judge Magnum variant can do that. The rounds have the same diameter, but .45 colt and .410 shot are noticeably longer. It's pretty obvious when looking at photos of the guns, the Judge Magnum is HUGE.
Since the Raging Judge Magnum is in the game, and about twice the size of the Raging Bull, It's pretty clear that the Raging Bull is specifically meant to be the smaller variant.
Describe the solution
Removed .45 colt and .410 shot from permitted ammo types of the Taurus Raging Bull. Explicitly added them to Raging Judge Magnum, which used
copy-from
. Likewise removed .45 colt and .410 shot from the 5-round .454 speedloader, added them to 6-round .454 speedloader.Describe alternatives you've considered
Could also just remove one of the guns. Besides the Judge Magnum having one extra cylinder and being much chonkier, they were basically identical. Like, if the Judge Magnum doesn't have more permitted ammo types than the Bull, then it's really just a worse version of it, being impossible to fit inside a standard holster.
Testing
Loaded game with no errors, loaded gun with no errors.
Additional context
I presume that IRL you could fit .45 colt into a .454 speedloader just fine, but the Raging Bull is the only 5-round .454 revolver in the game right now - the Judge Magnum has six cylinders. Also, there doesn't seem to be a check to prevent using a speedloader to load a revolver with incompatible ammo. If the speedloader was left unchanged, you could use it to load .410 shot into the Raging Bull, even though you still couldn't fire it.
Not sure if that's really an error - the bullets are the same diameter, or close enough, and you could probably shove them into the cylinder, you just couldn't close it up with them sticking out the front. It is a bit of a UI problem though, since there's no warning that you're loading the gun with incompatible ammo, so for now the 5-round speedloader is only for .454.