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.

Sign up for GitHub

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

Style and fix json #31469

Merged
merged 2 commits into from
Jun 15, 2019
Merged

Style and fix json #31469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eadebd3
Style json
jbytheway Jun 15, 2019
14f3bd5
Mark new profession as such
jbytheway Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/json/itemgroups/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@
[ "chem_hexamine", 10 ],
[ "esbit_stove", 15 ],
[ "mess_tin", 5 ],
[ "riding_saddle", 3],
[ "saddlebag", 5]
[ "riding_saddle", 3 ],
[ "saddlebag", 5 ]
]
},
{
Expand Down
41 changes: 24 additions & 17 deletions data/json/items/armor/pets_horse_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{
"id": "saddlebag",
"type": "ARMOR",
"name": "saddle bags",
"description": "A pair of covered pouches laid across the back of a horse behind the saddle.",
"weight": 1000,
"volume": 30,
"price": 15000,
"material": [ "leather" ],
"symbol": "[",
"color": "green",
"covers": [ "HANDS" ],
"coverage": 50,
"encumbrance": 30,
"storage": 120,
"warmth": 10,
"material_thickness": 2,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
"id": "saddlebag",
"type": "ARMOR",
"name": "saddle bags",
"description": "A pair of covered pouches laid across the back of a horse behind the saddle.",
"weight": 1000,
"volume": 30,
"price": 15000,
"material": [
"leather"
],
"symbol": "[",
"color": "green",
"covers": [
"HANDS"
],
"coverage": 50,
"encumbrance": 30,
"storage": 120,
"warmth": 10,
"material_thickness": 2,
"flags": [
"BELTED",
"WATER_FRIENDLY"
]
}
35 changes: 18 additions & 17 deletions data/json/professions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3752,6 +3752,7 @@
}
},
{
"type": "profession",
"ident": "politician",
"name": "Career Politician",
"description": "You've spent your life appealing to the people, persuading many and promising much throughout your time in office. Now that your voting base wants to eat you alive, winning hearts and minds just got that much harder.",
Expand Down Expand Up @@ -3784,22 +3785,22 @@
"points": 2,
"skills": { "level": 2, "name": "survival" },
"items": {
"both": [
"jeans",
"dress_shirt",
"jacket_leather",
"socks",
"cowboy_hat",
"boots_western",
"wristwatch",
"riding_saddle",
"pockknife",
"cattlefodder",
"cattlefodder",
"cig"
],
"male": [ "boxer_shorts" ],
"female": [ "bra", "panties" ]
"both": [
"jeans",
"dress_shirt",
"jacket_leather",
"socks",
"cowboy_hat",
"boots_western",
"wristwatch",
"riding_saddle",
"pockknife",
"cattlefodder",
"cattlefodder",
"cig"
],
"male": [ "boxer_shorts" ],
"female": [ "bra", "panties" ]
}
}
]
]