Standardize holster drawcost, add wrist variants (#3173)

* Standardize holster drawcost, add wrist variants * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Sep 21, 2023 · 134c3b5 · 134c3b5
1 parent e4680a7
commit 134c3b5
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 29 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -2052,7 +2052,8 @@
       [ "motorbike_boots", 5 ],
       [ "holster", 8 ],
       [ "sholster", 4 ],
-      [ "bootstrap", 3 ],
+      [ "bootstrap", 2 ],
+      [ "wristholster", 1 ],
       [ "legpouch", 12 ],
       [ "legpouch_large", 6 ],
       [ "chestpouch", 9 ],
@@ -3330,8 +3331,10 @@
     "items": [
       { "item": "back_holster", "prob": 5 },
       { "item": "bholster", "prob": 10 },
-      { "item": "bootsheath", "prob": 10 },
-      { "item": "bootstrap", "prob": 5 },
+      { "item": "bootsheath", "prob": 8 },
+      { "item": "wristsheath", "prob": 2 },
+      { "item": "bootstrap", "prob": 4 },
+      { "item": "wristholster", "prob": 1 },
       { "item": "bow_sling", "prob": 5 },
       { "item": "bscabbard", "prob": 5 },
       { "item": "holster", "prob": 20 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -339,7 +339,8 @@
       [ "bandolier_shotgun", 8 ],
       [ "torso_bandolier_shotgun", 3 ],
       [ "holster", 8 ],
-      [ "bootstrap", 3 ],
+      [ "bootstrap", 2 ],
+      [ "wristholster", 1 ],
       [ "bholster", 5 ],
       [ "legpouch", 4 ],
       [ "legpouch_large", 2 ],
@@ -496,7 +497,8 @@
       [ "baldric", 4 ],
       [ "bscabbard", 4 ],
       [ "sheath", 6 ],
-      [ "bootsheath", 6 ],
+      [ "bootsheath", 5 ],
+      [ "wristsheath", 1 ],
       [ "cestus", 1 ],
       [ "battleaxe", 1 ],
       [ "warhammer", 1 ],

diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -23,7 +23,6 @@
       "holster_msg": "You clip your %s to your %s",
       "max_volume": "2 L",
       "max_weight": 3600,
-      "draw_cost": 50,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "FANCY", "WAIST", "NO_QUICKDRAW", "WATER_FRIENDLY" ]
@@ -125,7 +124,6 @@
       "holster_msg": "You tuck your %s into your %s",
       "max_volume": "500 ml",
       "max_weight": 400,
-      "draw_cost": 60,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "WAIST", "WATER_FRIENDLY" ]
@@ -169,7 +167,6 @@
       "holster_msg": "You attach your %s to your %s.",
       "max_volume": "2250 ml",
       "max_weight": 3600,
-      "draw_cost": 50,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "WAIST", "WATER_FRIENDLY" ]
@@ -198,7 +195,6 @@
       "holster_msg": "You sheath your %s",
       "min_volume": "250 ml",
       "max_volume": "1 L",
-      "draw_cost": 3,
       "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]
     },
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "WAIST", "OVERSIZE" ]
@@ -231,7 +227,6 @@
       "min_volume": "40 ml",
       "max_volume": "1500 ml",
       "max_weight": "1500 g",
-      "draw_cost": 50,
       "flags": [ "BELT_CLIP", "SHEATH_KNIFE" ]
     },
     "flags": [ "WAIST", "NO_QUICKDRAW", "WATER_FRIENDLY" ]
@@ -259,7 +254,6 @@
       "max_volume": "1250 ml",
       "max_weight": "1500 g",
       "min_volume": "40 ml",
-      "draw_cost": 60,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "WAIST", "WATER_FRIENDLY" ]

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -461,7 +461,7 @@
     "price_postapoc": 750,
     "coverage": 95,
     "proportional": { "weight": 1.2, "volume": 1.2, "price": 2, "encumbrance": 2 },
-    "use_action": { "type": "holster", "max_volume": "250 ml", "max_weight": 600, "draw_cost": 80, "multi": 2, "skills": [ "pistol" ] },
+    "use_action": { "type": "holster", "max_volume": "250 ml", "max_weight": 600, "draw_cost": 150, "multi": 2, "skills": [ "pistol" ] },
     "extend": { "flags": [ "FANCY" ] }
   },
   {

diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -52,6 +52,27 @@
       "skills": [ "pistol" ]
     }
   },
+  {
+    "id": "wristholster",
+    "type": "ARMOR",
+    "name": { "str": "wrist holster" },
+    "description": "A small concealed holster worn on the wrist.  It is quick to use but can only carry very small pistols, gamblers' derringers and the like.  Activate to holster/draw a pistol.",
+    "weight": "80 g",
+    "volume": "250 ml",
+    "price": "52 USD",
+    "price_postapoc": "250 cent",
+    "to_hit": -1,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "bandolier_wrist",
+    "color": "brown",
+    "covers": [ "hand_either" ],
+    "coverage": 5,
+    "encumbrance": 1,
+    "material_thickness": 1,
+    "use_action": { "type": "holster", "min_volume": "15 ml", "max_volume": "250 ml", "draw_cost": 50, "skills": [ "pistol" ] },
+    "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
+  },
   {
     "id": "bow_sling",
     "type": "ARMOR",

diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
@@ -499,7 +499,7 @@
       "holster_prompt": "Sheath sword",
       "holster_msg": "You sheath your %s",
       "max_volume": "3750 ml",
-      "draw_cost": 5,
+      "draw_cost": 150,
       "flags": [ "SHEATH_SWORD", "SHEATH_AXE" ]
     },
     "flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "BELTED", "ONLY_ONE" ]
@@ -539,7 +539,7 @@
       "holster_prompt": "Sheath knife",
       "holster_msg": "You sheath your %s",
       "max_volume": "750 ml",
-      "draw_cost": 3,
+      "draw_cost": 80,
       "flags": [ "SHEATH_KNIFE" ]
     },
     "flags": [ "POWERARMOR_MOD", "COMPACT", "WATERPROOF", "STURDY", "WAIST" ]

diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json
@@ -21,7 +21,6 @@
       "holster_prompt": "Sheath axe",
       "holster_msg": "You sheath your %s",
       "max_volume": "3250 ml",
-      "draw_cost": 10,
       "flags": [ "SHEATH_AXE" ]
     },
     "flags": [ "NONCONDUCTIVE", "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -50,7 +49,6 @@
       "holster_prompt": "Sheath sword",
       "holster_msg": "You sheath your %s",
       "max_volume": "3 L",
-      "draw_cost": 10,
       "flags": [ "SHEATH_SWORD" ]
     },
     "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -79,7 +77,36 @@
       "holster_msg": "You sheath your %s",
       "min_volume": "15 ml",
       "max_volume": "500 ml",
-      "draw_cost": 30,
+      "draw_cost": 150,
+      "flags": [ "SHEATH_KNIFE" ]
+    },
+    "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "wristsheath",
+    "type": "ARMOR",
+    "name": { "str": "wrist sheath" },
+    "description": "A small concealed knife sheath worn on the wrist.  It is quick to use but can only carry very small blades.  Activate to sheathe/draw a weapon.",
+    "weight": "80 g",
+    "volume": "250 ml",
+    "price": "52 USD",
+    "price_postapoc": "250 cent",
+    "to_hit": -1,
+    "material": [ "leather" ],
+    "symbol": "[",
+    "looks_like": "bandolier_wrist",
+    "color": "brown",
+    "covers": [ "hand_either" ],
+    "coverage": 5,
+    "encumbrance": 1,
+    "material_thickness": 1,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Sheath knife",
+      "holster_msg": "You sheath your %s",
+      "min_volume": "15 ml",
+      "max_volume": "250 ml",
+      "draw_cost": 50,
       "flags": [ "SHEATH_KNIFE" ]
     },
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
@@ -108,7 +135,7 @@
       "holster_prompt": "Sheath sword",
       "holster_msg": "You sheath your %s",
       "max_volume": "3750 ml",
-      "draw_cost": 20,
+      "draw_cost": 150,
       "flags": [ "SHEATH_SWORD" ]
     },
     "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -164,7 +191,7 @@
       "holster_prompt": "Sheath knife",
       "holster_msg": "You sheath your %s",
       "max_volume": "750 ml",
-      "draw_cost": 3,
+      "draw_cost": 80,
       "flags": [ "SHEATH_KNIFE" ]
     },
     "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -192,7 +219,7 @@
       "holster_prompt": "Holster spear",
       "holster_msg": "You holster your %s.",
       "max_volume": "3500 ml",
-      "draw_cost": 50,
+      "draw_cost": 150,
       "flags": [ "SHEATH_SPEAR" ]
     },
     "flags": [ "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]

diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
@@ -50,7 +50,7 @@
       "min_volume": "250ml",
       "max_volume": "2500ml",
       "multi": 2,
-      "draw_cost": 3,
+      "draw_cost": 150,
       "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]
     },
     "flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ]
@@ -405,7 +405,7 @@
       "holster_prompt": "Sheath golf club",
       "holster_msg": "You awkwardly sheath your %s",
       "max_volume": "1 L",
-      "draw_cost": 40,
+      "draw_cost": 150,
       "flags": [ "SHEATH_GOLF" ]
     }
   },
@@ -879,7 +879,7 @@
       "min_volume": "250ml",
       "max_volume": "2500ml",
       "multi": 2,
-      "draw_cost": 3,
+      "draw_cost": 120,
       "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]
     },
     "flags": [ "ONLY_ONE", "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -1832,7 +1832,6 @@
         "type": "holster",
         "holster_prompt": "Sheath blade",
         "holster_msg": "You sheath your %s",
-        "draw_cost": 3,
         "min_volume": "250 ml",
         "max_volume": "1 L",
         "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]

diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json
@@ -239,6 +239,32 @@
     "qualities": [ { "id": "SEW", "level": 1 } ],
     "components": [ [ [ "leather", 3 ] ], [ [ "filament", 5, "LIST" ] ] ]
   },
+  {
+    "result": "wristsheath",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "skills_required": [ "melee", 1 ],
+    "time": "50 m",
+    "autolearn": true,
+    "qualities": [ { "id": "SEW", "level": 1 } ],
+    "components": [ [ [ "leather", 2 ] ], [ [ "filament", 3, "LIST" ] ] ]
+  },
+  {
+    "result": "wristholster",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "skills_required": [ "pistol", 1 ],
+    "time": "50 m",
+    "autolearn": true,
+    "qualities": [ { "id": "SEW", "level": 1 } ],
+    "components": [ [ [ "leather", 2 ] ], [ [ "filament", 3, "LIST" ] ] ]
+  },
   {
     "result": "bow_sling",
     "type": "recipe",

diff --git a/data/mods/Aftershock/items/armor.json b/data/mods/Aftershock/items/armor.json
@@ -360,7 +360,6 @@
       "holster_msg": "You stash your %s.",
       "max_volume": "4 L",
       "max_weight": "12 kg",
-      "draw_cost": 50,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "WATER_FRIENDLY", "BELTED" ]

diff --git a/data/mods/CRT_EXPANSION/items/crt_clothes.json b/data/mods/CRT_EXPANSION/items/crt_clothes.json
@@ -109,7 +109,6 @@
       "holster_msg": "You sheath your %s",
       "min_volume": 0,
       "max_volume": "1 L",
-      "draw_cost": 5,
       "flags": [ "BELT_CLIP", "SHEATH_KNIFE", "SHEATH_SWORD" ]
     },
     "flags": [ "STURDY", "WAIST" ]

diff --git a/data/mods/Magiclysm/items/enchanted_belts.json b/data/mods/Magiclysm/items/enchanted_belts.json
@@ -20,7 +20,6 @@
       "holster_msg": "You tuck your %s into your %s",
       "max_volume": "500 ml",
       "max_weight": 400,
-      "draw_cost": 60,
       "flags": [ "BELT_CLIP" ]
     },
     "flags": [ "WAIST", "WATER_FRIENDLY", "STURDY" ]
@@ -86,7 +85,6 @@
       "min_volume": "1 ml",
       "max_volume": "4 L",
       "max_weight": "5 kg",
-      "draw_cost": 5,
       "multi": 4,
       "skills": [
         "pistol",
@@ -129,7 +127,6 @@
         "type": "holster",
         "holster_prompt": "Sheath blade",
         "holster_msg": "You sheath your %s",
-        "draw_cost": 3,
         "min_volume": "250 ml",
         "max_volume": "1 L",
         "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]