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

vehicle_part name to object #38699

Merged
merged 1 commit into from
Mar 12, 2020
Merged

vehicle_part name to object #38699

merged 1 commit into from
Mar 12, 2020

Conversation

snipercup
Copy link
Contributor

Summary

SUMMARY: none

Purpose of change

Contributes to #36110 and #36611

Describe the solution

Change name to object

Describe alternatives you've considered

Not changing

Testing

image
image
image

@@ -2,7 +2,7 @@
{
"id": "aisle_lights",
"type": "vehicle_part",
"name": "aisle lights",
"name": { "str": "aisle lights" },
Copy link
Contributor

@AMurkin AMurkin Mar 11, 2020

Choose a reason for hiding this comment

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

lights and harness should have plural forms. Or not?

@ZhilkinSerg ZhilkinSerg added the [JSON] Changes (can be) made in JSON label Mar 11, 2020
@@ -220,7 +220,7 @@
{
"id": "lit_aisle_horizontal",
"type": "vehicle_part",
"name": "aisle with lights",
"name": { "str": "aisle with lights" },
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"name": { "str": "aisle with lights" },
"name": { "str": "aisle with lights", "str_pl": "aisles with lights" },

@@ -2,7 +2,7 @@
{
"id": "aisle_lights",
"type": "vehicle_part",
"name": "aisle lights",
"name": { "str": "aisle lights" },
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"name": { "str": "aisle lights" },
"name": { "str": "aisle lights", "str_pl": "aisle lights" },

@@ -1851,7 +1851,7 @@
{
"type": "vehicle_part",
"id": "seatbelt_heavyduty",
"name": "5-point harness",
"name": { "str": "5-point harness" },
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"name": { "str": "5-point harness" },
"name": { "str": "5-point harness", "str_pl": "5-point harnesses" },

@@ -2263,7 +2263,7 @@
{
"type": "vehicle_part",
"id": "craft_rig",
"name": "FOODCO kitchen buddy",
"name": { "str": "FOODCO kitchen buddy" },
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"name": { "str": "FOODCO kitchen buddy" },
"name": { "str": "FOODCO kitchen buddy", "str_pl": "FOODCO kitchen buddies" },

@snipercup
Copy link
Contributor Author

snipercup commented Mar 11, 2020

Cannot add plurals am afraid:

 DEBUG    : Error: data/mods//dda/../../json/vehicleparts/vehicle_parts.json: line 1854:50: str_pl not supported here

    "type": "vehicle_part",
    "id": "seatbelt_heavyduty",
    "name": { "str": "5-point harness", "str_pl":
                                                 ^
                                                  "5-point harnesses" },
    "symbol": ",",
    "color": "light_gray",


 FUNCTION : bool main_menu::load_character_tab(bool)
 FILE     : src/main_menu.cpp
 LINE     : 1072

This pr should be merged as-is unless there is a typo I missed

@AMurkin
Copy link
Contributor

AMurkin commented Mar 11, 2020

Sorry for the confusion. It just looks unusual.

@ZhilkinSerg ZhilkinSerg merged commit 54e147b into CleverRaven:master Mar 12, 2020
@snipercup snipercup deleted the vehicle_part-name-to-object branch March 12, 2020 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants