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

Intercom UHMWPE armor consistency #64133

Merged
merged 1 commit into from
Mar 17, 2023

Conversation

SurFlurer
Copy link
Contributor

@SurFlurer SurFlurer commented Mar 11, 2023

Summary

Bugfixes "Intercom should sell the same set of UHMWPE armor."

Purpose of change

"effect": [
{ "u_sell_item": "RobofacCoin", "count": 6 },
{ "u_spawn_item": "robofac_military_skirt" },
{ "u_spawn_item": "robofac_military_vambraces" },
{ "u_spawn_item": "robofac_military_greaves" },
{ "u_spawn_item": "robofac_military_helmet" },

"effect": [
{ "u_sell_item": "RobofacCoin", "count": 6 },
{ "u_spawn_item": "robofac_military_skirt" },
{ "u_spawn_item": "robofac_military_vambraces" },
{ "u_spawn_item": "robofac_military_greaves" },
{ "u_spawn_item": "robofac_military_mantle" },
{ "u_spawn_item": "robofac_military_helmet" }

It's self-explanatory.

When Hub01 makes the breakthrough in researching UHMWPE, you can immediately buy the set of robofac_military_*** , or if you choose not to buy them on the spot, you can come back later and buy them. However, if you come back later and buy, you'll not have the robofac_military_mantle, as the code suggests. I tend to see it as a little mistake that the original contributor forgot to add robofac_military_mantle to the list, rather than a punitive measures for pc not buying them on the spot.

Describe the solution

The two sets of UHMWPE armor should be the same.

Describe alternatives you've considered

None.

Testing

All tests good.

Additional context

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 11, 2023
@bombasticSlacks
Copy link
Contributor

https://github.com/CleverRaven/Cataclysm-DDA/pull/53871/files#diff-9d41b73fc315eccaa85ae5886f90d1102bcd4a05cf98fa38898a0df90db593a7R746 the original PR provided the mantle for free. At some point, this was changed and no one bothered to add the mantle to the rebuy option.

@bombasticSlacks bombasticSlacks merged commit 7863db8 into CleverRaven:master Mar 17, 2023
@SurFlurer
Copy link
Contributor Author

https://github.com/CleverRaven/Cataclysm-DDA/pull/53871/files#diff-9d41b73fc315eccaa85ae5886f90d1102bcd4a05cf98fa38898a0df90db593a7R746 the original PR provided the mantle for free. At some point, this was changed and no one bothered to add the mantle to the rebuy option.

Thank you for merging and pointing that out!

@SurFlurer SurFlurer deleted the patch-1 branch March 18, 2023 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants