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

Commodity name clean-up #4875

Merged
merged 2 commits into from
May 15, 2020
Merged

Commodity name clean-up #4875

merged 2 commits into from
May 15, 2020

Conversation

WKFO
Copy link
Contributor

@WKFO WKFO commented May 7, 2020

Radioactives are mostly useful and should be paid for.
Radioactive waste mostly isn't and... you get the idea.
(I think it has been that way before, maybe it changed during pigui conversion project, idk)

Commodity "hand weapons" are called "small arms" in market but "hand weapons" in system economy data (and, in turn, trading computer). I changed all into "small arms", as it is in the commodity market.

@WKFO WKFO changed the title Radioactive waste clarification Commodity name clean-up May 7, 2020
@impaktor
Copy link
Member

impaktor commented May 9, 2020

I'm not sold on the last modification.

When I worked with the commodity prices, I discovered the "Hand weapons" - "small arms" discrepancy in the code (and Frontier), but after speaking to @fluffyfreak I/we decided it was best to keep it as it was. At least, that's how I remember it then.

@Web-eWorks
Copy link
Member

Web-eWorks commented May 11, 2020

I'll side with Small Arms under one condition - if Battle Weapons are intended to be things like APCs and rocket launchers, machine guns, power armor, etc. then it makes sense to have the definition between small arms like pistols, carbines, knives, etc and the bigger, more prohibited stuff that's intended to be outfitting a PMC or rebellion.

If "Battle Weapons" is the small stuff like pistols, plasma swords, etc. then why do we need hand weapons? Knives are easily understood to be consumer goods already, and I highly doubt that a system government blocking all form of firearms is going to let shipments of medieval poleaxes in (although that's its own pickle, as when firearms are Battle Weapons, there's almost nothing left for the Hand Weapons category...)

@WKFO
Copy link
Contributor Author

WKFO commented May 11, 2020

In game description for battle weapons:
Heavy military-grade weapons, like armoured hover tanks, and surface-to-space missiles. Trading in them is usually a governmental monopoly. On the black market, however, these can often fetch a hefty sum of money.

In game description for hand weapons/small arms:
Providing insurance beyond the long arm of the law, hand weapons are essential for space traders in far-out systems. However, many governments see them as a threat to their own control over their population and strictly control their trade and possession.

I don't care if we call it hand weapons or small arms, I just don't get why a single commodity is called two different things in the first place. I think we should call it either small arms, or hand weapons; not the former in one place and the latter in another. "Hand weapons" is okay too.

@Web-eWorks Web-eWorks merged commit a103770 into pioneerspacesim:master May 15, 2020
@WKFO WKFO deleted the lang-change branch May 16, 2020 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants