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

fix: Remove ammo types from Taurus Raging Bull revolver #5593

Merged
merged 2 commits into from
Oct 21, 2024

Conversation

Soadreqm
Copy link
Contributor

Checklist

Required

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.

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Oct 21, 2024
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes is fine,

As a heads up regarding removals of weapons, we're looking to migrate firearms to gun shows instead of delete them from now on. The idea is anyone's favorite gun can exist but fairly useless ones should be relegated to special locations that gun collecting players will beeline to loot. Deleting weapons isn't desired given we have a good alternative and a very large portion of the playerbase is gun nuts.

@RoyalFox2140 RoyalFox2140 merged commit 1acd5e9 into cataclysmbnteam:main Oct 21, 2024
9 checks passed
@ZChris13
Copy link

ZChris13 commented Oct 21, 2024

fact check: .45 Colt is the shortest of these cartridges, .454 Casull is the beefed up magnum variant that Dick Casull developed when he started blowing up .45 Colt cartridges and guns with his high pressure loads. Everything that can load .454 Casull can also load .45 Colt.

@Soadreqm
Copy link
Contributor Author

Huh, really? That does make sense. Guess I better put it back then.

@chaosvolt
Copy link
Member

This messed up something very important: https://github.com/cataclysmbnteam/Cataclysm-BN/blob/main/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json#L823

You didn't update what ammo will spawn loaded in the gun itself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants