Armor.json sorting pt. 6 (#37468)

* Undergarment.json and tool_armor.json * Revert "Undergarment.json and tool_armor.json" This reverts commit 873c253. * Tool_armor.json * Undergarment.json * Armor.json + things missed from earlier * Moved barrette to jewelry * Hot pants, loincloth, leggings to legs_clothes.json * Update tool_armor.json
CleverRaven · Jan 28, 2020 · 2be9d70 · 2be9d70
1 parent 3da5eb4
commit 2be9d70
Show file tree

Hide file tree

Showing 8 changed files with 984 additions and 980 deletions.
diff --git a/data/json/items/armor.json b/data/json/items/armor.json
diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
@@ -21,6 +21,27 @@
     "environmental_protection": 1,
     "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ]
   },
+  {
+    "id": "cape_fp",
+    "repairs_like": "sheet",
+    "type": "ARMOR",
+    "name": "Foodperson's cape",
+    "description": "A brightly-colored cape emblazoned with the \"Fp\" symbol.",
+    "weight": "900 g",
+    "volume": "3 L",
+    "price": 5000,
+    "to_hit": -1,
+    "material": [ "cotton" ],
+    "symbol": "]",
+    "looks_like": "cloak",
+    "color": "pink",
+    "covers": [ "TORSO" ],
+    "coverage": 50,
+    "encumbrance": 4,
+    "warmth": 10,
+    "material_thickness": 1,
+    "flags": [ "OVERSIZE", "BELTED" ]
+  },
   {
     "id": "cloak",
     "type": "ARMOR",

diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
@@ -24,6 +24,28 @@
     "environmental_protection": 6,
     "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ]
   },
+  {
+    "id": "cassock",
+    "repairs_like": "trenchcoat",
+    "type": "ARMOR",
+    "name": "cassock",
+    "name_plural": "cassocks",
+    "description": "A piece of clerical clothing, usually worn by Christian priests.",
+    "weight": "1200 g",
+    "volume": "5 L",
+    "price": 20000,
+    "to_hit": -5,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "robe",
+    "color": "dark_gray",
+    "covers": [ "LEGS", "TORSO", "ARMS" ],
+    "coverage": 90,
+    "encumbrance": 10,
+    "warmth": 20,
+    "material_thickness": 2,
+    "flags": [ "VARSIZE" ]
+  },
   {
     "id": "coat_fur",
     "type": "ARMOR",

diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
@@ -185,6 +185,19 @@
     "description": "Fake teeth inlaid with citrines, worn over the teeth.  It looks very shiny.",
     "color": "yellow"
   },
+  {
+    "id": "barrette",
+    "type": "ARMOR",
+    "name": "barrette",
+    "description": "A barrette with lots of ornaments.",
+    "weight": "5 g",
+    "volume": 0,
+    "price": 800,
+    "material": [ "plastic" ],
+    "symbol": "[",
+    "color": "pink",
+    "flags": [ "FANCY" ]
+  },
   {
     "id": "blue_topaz_dental_grill",
     "type": "ARMOR",
@@ -996,6 +1009,20 @@
     "color": "green",
     "flags": [ "FANCY" ]
   },
+  {
+    "id": "pearl_collar",
+    "type": "ARMOR",
+    "name": "pearl collar",
+    "description": "A collar made from round and lustrous pearls, its former owner must be a wealthy individual.",
+    "weight": "30 g",
+    "volume": "300 ml",
+    "price": 590000,
+    "price_postapoc": 2000,
+    "material": [ "stone" ],
+    "symbol": "[",
+    "color": "white",
+    "flags": [ "SUPER_FANCY" ]
+  },
   {
     "id": "platinum_watch",
     "type": "ARMOR",

diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
@@ -0,0 +1,147 @@
+[
+  {
+    "id": "hot_pants",
+    "type": "ARMOR",
+    "name": "hot pants",
+    "name_plural": "hot pants",
+    "description": "A simple pair of short shorts.",
+    "weight": "92 g",
+    "volume": "250 ml",
+    "price": 2500,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "boxer_briefs",
+    "color": "light_red",
+    "covers": [ "LEGS" ],
+    "coverage": 15,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT" ]
+  },
+  {
+    "id": "hot_pants_fur",
+    "type": "ARMOR",
+    "name": "fur hot pants",
+    "name_plural": "fur hot pants",
+    "description": "A simple pair of fur short shorts.",
+    "weight": "118 g",
+    "volume": "250 ml",
+    "price": 5500,
+    "material": [ "fur" ],
+    "symbol": "[",
+    "looks_like": "hot_pants_leather",
+    "color": "brown",
+    "covers": [ "LEGS" ],
+    "coverage": 15,
+    "warmth": 10,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT" ]
+  },
+  {
+    "id": "hot_pants_leather",
+    "type": "ARMOR",
+    "name": "leather hot pants",
+    "name_plural": "leather hot pants",
+    "description": "A simple pair of leather short shorts.",
+    "weight": "106 g",
+    "volume": "250 ml",
+    "price": 2500,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "hot_pants",
+    "color": "dark_gray",
+    "covers": [ "LEGS" ],
+    "coverage": 15,
+    "warmth": 5,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT" ]
+  },
+  {
+    "id": "leggings",
+    "type": "ARMOR",
+    "name": "leggings",
+    "name_plural": "leggings",
+    "description": "Skin-tight nylon leggings, sometimes used when exercising, that keep your legs nice and warm.",
+    "weight": "155 g",
+    "volume": "500 ml",
+    "price": 1000,
+    "material": [ "lycra" ],
+    "symbol": "[",
+    "looks_like": "leg_warmers",
+    "color": "dark_gray",
+    "covers": [ "LEGS" ],
+    "coverage": 100,
+    "warmth": 20,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "loincloth",
+    "type": "ARMOR",
+    "name": "loincloth",
+    "description": "Rags stitched together and tied into a makeshift loincloth.  Covers your modesty, but not much else.",
+    "weight": "32 g",
+    "volume": "250 ml",
+    "price": 900,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "briefs",
+    "color": "brown",
+    "covers": [ "LEGS" ],
+    "coverage": 5,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ]
+  },
+  {
+    "id": "loincloth_fur",
+    "type": "ARMOR",
+    "name": "fur loincloth",
+    "description": "A fur pelt tied into a loincloth.  Covers your modesty, but not much else.  Now you are a true barbarian warrior.",
+    "weight": "64 g",
+    "volume": "250 ml",
+    "price": 7500,
+    "material": [ "fur" ],
+    "symbol": "[",
+    "looks_like": "loincloth_leather",
+    "color": "brown",
+    "covers": [ "LEGS" ],
+    "coverage": 5,
+    "warmth": 5,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ]
+  },
+  {
+    "id": "loincloth_leather",
+    "type": "ARMOR",
+    "name": "leather loincloth",
+    "description": "Leather patches stitched together and tied into a makeshift loincloth.  Covers your modesty, but not much else.",
+    "weight": "64 g",
+    "volume": "250 ml",
+    "price": 7500,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "loincloth",
+    "color": "brown",
+    "covers": [ "LEGS" ],
+    "coverage": 5,
+    "material_thickness": 2,
+    "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ]
+  },
+  {
+    "id": "loincloth_wool",
+    "type": "ARMOR",
+    "name": "wool loincloth",
+    "description": "Bits of wool stitched together and tied into a makeshift loincloth.  Covers your modesty, but not much else.",
+    "weight": "56 g",
+    "volume": "250 ml",
+    "price": 900,
+    "material": [ "wool" ],
+    "symbol": "[",
+    "looks_like": "loincloth",
+    "color": "blue",
+    "covers": [ "LEGS" ],
+    "coverage": 5,
+    "warmth": 5,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SKINTIGHT", "OVERSIZE" ]
+  }
+]
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
@@ -374,6 +374,27 @@
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "OUTER" ]
   },
+  {
+    "id": "chainmail_hauberk",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "chainmail hauberk",
+    "description": "A fully customized chainmail outfit, leaving the head uncovered.  The shirt, arms, and leggings have been modified with straps and combined with a gambeson to deal with uneven weight distribution, cold environments and to allow them to be used separately.",
+    "weight": "14430 g",
+    "volume": "2750 ml",
+    "price": 35988,
+    "to_hit": -1,
+    "material": [ "iron", "cotton" ],
+    "symbol": "[",
+    "looks_like": "armor_blarmor",
+    "color": "light_red",
+    "covers": [ "TORSO", "ARMS", "LEGS" ],
+    "coverage": 95,
+    "encumbrance": 20,
+    "warmth": 30,
+    "material_thickness": 6,
+    "flags": [ "VARSIZE", "STURDY" ]
+  },
   {
     "id": "chainmail_suit",
     "type": "ARMOR",