Fixed fingerless survivor glove thickness, tidied up items and recipe…

…s for consistency (CleverRaven#49527)
ralreegorganon · Jul 6, 2021 · 88cf8e4 · 88cf8e4
1 parent 284f215
commit 88cf8e4
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 6 deletions.
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -541,11 +541,11 @@
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
   },
   {
-    "id": "gloves_survivor_fingerless",
+    "id": "gloves_lsurvivor_fingerless",
     "type": "ARMOR",
     "looks_like": "gloves_lsurvivor",
     "category": "armor",
-    "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" },
+    "name": { "str": "pair of fingerless light survivor gloves", "str_pl": "pairs of fingerless light survivor gloves" },
     "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.",
     "weight": "160 g",
     "volume": "700 ml",
@@ -559,7 +559,38 @@
     "coverage": 85,
     "encumbrance": 8,
     "warmth": 12,
-    "material_thickness": 2,
+    "material_thickness": 1,
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "ALLOWS_NATURAL_ATTACKS" ]
+  },
+  {
+    "id": "xl_gloves_lsurvivor_fingerless",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL fingerless light survivor gloves", "str_pl": "pairs of XL fingerless light survivor gloves" },
+    "copy-from": "gloves_lsurvivor_fingerless",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
+    "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF", "ALLOWS_NATURAL_ATTACKS" ]
+  },
+  {
+    "id": "gloves_survivor_fingerless",
+    "type": "ARMOR",
+    "looks_like": "gloves_survivor",
+    "category": "armor",
+    "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" },
+    "description": "A pair of customized, Kevlar armored leather gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.",
+    "weight": "200 g",
+    "volume": "700 ml",
+    "price": 16000,
+    "price_postapoc": 2000,
+    "to_hit": 2,
+    "material": [ "kevlar_layered", "leather" ],
+    "symbol": "[",
+    "color": "brown",
+    "covers": [ "hand_l", "hand_r" ],
+    "coverage": 85,
+    "encumbrance": 16,
+    "warmth": 12,
+    "material_thickness": 3,
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "ALLOWS_NATURAL_ATTACKS", "ALLOWS_TALONS" ]
   },
@@ -904,7 +935,7 @@
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OVERSIZE" ]
   },
   {
-    "id": "gloves_xlsurvivor",
+    "id": "xl_gloves_survivor",
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "pair of XL survivor gloves", "str_pl": "pairs of XL survivor gloves" },

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -1385,5 +1385,15 @@
     "type": "MIGRATION",
     "replace": "towel",
     "flags": [ "FILTHY" ]
+  },
+  {
+    "id": "gloves_survivor_fingerless",
+    "type": "MIGRATION",
+    "replace": "gloves_lsurvivor_fingerless"
+  },
+  {
+    "id": "gloves_xlsurvivor",
+    "type": "MIGRATION",
+    "replace": "xl_gloves_survivor"
   }
 ]
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -416,14 +416,34 @@
     "time": "30 m",
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "gloves_lsurvivor", 1 ] ] ]
+    "components": [ [ [ "gloves_survivor", 1 ] ] ]
   },
   {
     "result": "xl_gloves_survivor_fingerless",
     "type": "recipe",
     "copy-from": "gloves_survivor_fingerless",
     "time": "40 m",
     "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "xl_gloves_survivor", 1 ] ] ]
+  },
+  {
+    "result": "gloves_lsurvivor_fingerless",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_HANDS",
+    "skill_used": "tailor",
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "gloves_lsurvivor", 1 ] ] ]
+  },
+  {
+    "result": "xl_gloves_lsurvivor_fingerless",
+    "type": "recipe",
+    "copy-from": "gloves_lsurvivor_fingerless",
+    "time": "40 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "xl_gloves_lsurvivor", 1 ] ] ]
   },
   {
@@ -626,7 +646,7 @@
     ]
   },
   {
-    "result": "gloves_xlsurvivor",
+    "result": "xl_gloves_survivor",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_ARMOR",