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(i18n): metric bullets part 1: rename .223 -> 5.56x45mm #2691

Merged
merged 4 commits into from
Apr 29, 2023

Conversation

scarf005
Copy link
Member

@scarf005 scarf005 commented Apr 24, 2023

Summary

SUMMARY: I18N "metric bullets part 1: rename .223 -> 5.56x45mm"

Purpose of change

part 1 of #2690.

  1. the inconsistency in displayed bullet diameter was causing issues.
    • you need to search twice, once for .223 and once again for 5.56.
    • some bullets use 5.56 NATO,
    • 5.56x45mm ammo belt is crafted from .223 ammo belt linkage, unintuitive.
  2. .223 and 5.56x45mm are technically of same calibre,
  3. therefore, it'd be safe to display 5.56x45mm first then display it's a .223.

Describe the solution

  1. changed default display name of .223 to 5.56x45mm.
  2. regex-replaced occurances of .223 to 5.56x45mm.
  3. changed name of .223 Remington to 5.56x45mm '.223 Remington'.

Describe alternatives you've considered

  • rename ammo id 223 to 5.56x45mm as well, but that'd cause issues with previous saves. also id migration is undocumented.
  • use shorter name, e.g 5.56mm where appliable, as iirc cata only has one variant of 5.56mm wheras 7.62mm has multiple (7.62x39mm(soviet), 7.62x51mm(NATO), 7.62x63mm(30-06 springfield)

Testing

loaded without problems.

image
all 5.56 / .223 calibre bullets can be searched at once.

Cataclysm: Bright Nights - cbn-experimental-2023-04-24-0723_02
ammunition type is displayed as "5.56x45mm".

@github-actions github-actions bot added JSON related to game datas in JSON format. mods PR changes related to mods. labels Apr 24, 2023
@scarf005 scarf005 force-pushed the metric-rounds-5.56 branch from 0f3e5b4 to f8ad882 Compare April 24, 2023 14:52
@scarf005 scarf005 mentioned this pull request Apr 24, 2023
@chaosvolt
Copy link
Member

As noted in discussion in the issue and on discord, .223 Remington (5.56x45mm) is also a potential alternative, depending on if we were to standardize around the "name used in country of origin goes first, metric designation if first name isn't metric already" idea.

@scarf005
Copy link
Member Author

scarf005 commented Apr 24, 2023

.223 Remington (5.56x45mm)

the issue with this approach is that it does not follow other metric bullet names which uses <bullet size> <name>. i think there should be consistency.

@chaosvolt
Copy link
Member

Thing is also that both of these are bullet sizes, so the consistency is already broken (and kinda has to be broken if we want the item to be at all easy to tell apart from the other 5.56mm ammo, because it being the US-unit variant is literally the distinguishing factor).

@scarf005
Copy link
Member Author

scarf005 commented Apr 24, 2023

But the point is that .223 being distinguishable from 5.56mm is the problem. lores aside, they're the same 5.56x45mm bullet with different damage property. compatible ammos should be grouped together.

if we want the item to be at all easy to tell apart from the other 5.56mm ammo

but the point of the PR is to not make it easy to tell apart from other 5.56mm ammo, because it is the 5.56mm ammo. copied from added rationale in #2690:

use metric names like 7.62mm rounds. this is to make searching bullet consistent. after the changes, finding bullet would always adhere to <bullet dimension> <bullet name> which would make finding and sorting compatible bullets easier.

e.g

name dimension(compatible gun) name(identifier)
5.56x45mm (.223 Remington) 5.56x45mm .223 Remington
5.56x45mm NATO M855A1 5.56x45mm NATO M855A1

@chaosvolt
Copy link
Member

I suppose this does work too. Plus since this is a case where the ammo (minor differences in specifications aside) is well-known by two names, US or metric, depending on context, then I suppose it doesn't matter. Technically for most purposes the order of the names doesn't matter either I suppose, since searching for 5.56 will return all such results, but it will throw off results when you have a pile of ammo sorted alphabetically.

@scarf005 scarf005 force-pushed the metric-rounds-5.56 branch from f8ad882 to 7da1cc6 Compare April 25, 2023 00:00
@chaosvolt chaosvolt merged commit 413fd95 into cataclysmbnteam:upload Apr 29, 2023
@scarf005 scarf005 deleted the metric-rounds-5.56 branch April 29, 2023 02:22
@Krwak
Copy link
Contributor

Krwak commented May 13, 2023

Completely agree with the OP, it adds to the confusion when crafting and also more items, and searching. Very small benefit in keeping them for the gun enthusiasts when compared to the negatives - bloat it adds.

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. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants