From eadebd34720eb267c886c84898a87783f9ab92c3 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sat, 15 Jun 2019 15:48:56 +0100 Subject: [PATCH 1/2] Style json Some recent merges snuck in some un-linted json files. --- data/json/itemgroups/tools.json | 4 +- data/json/items/armor/pets_horse_armor.json | 41 ++++++++++++--------- data/json/professions.json | 34 ++++++++--------- 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 8b8243c7c0c85..88d2dc7092ac5 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -266,8 +266,8 @@ [ "chem_hexamine", 10 ], [ "esbit_stove", 15 ], [ "mess_tin", 5 ], - [ "riding_saddle", 3], - [ "saddlebag", 5] + [ "riding_saddle", 3 ], + [ "saddlebag", 5 ] ] }, { diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json index 32a6876fed34d..78906f7ae7548 100644 --- a/data/json/items/armor/pets_horse_armor.json +++ b/data/json/items/armor/pets_horse_armor.json @@ -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" + ] } diff --git a/data/json/professions.json b/data/json/professions.json index 061729b2e5c8b..90a5b19983ac5 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3784,22 +3784,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" ] } } -] \ No newline at end of file +] From 14f3bd5482ba1f1cdb1886943fb5ac785e0f8e20 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sat, 15 Jun 2019 15:57:49 +0100 Subject: [PATCH 2/2] Mark new profession as such --- data/json/professions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/professions.json b/data/json/professions.json index 90a5b19983ac5..e68bcec4ac4f7 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -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.",