Merge pull request #41044 from wapcaplet/longer-swords

Add length to swords and blades, holsters and sheaths
CleverRaven · Jun 4, 2020 · 04aa54f · 04aa54f
2 parents df707fa + db4919b
commit 04aa54f
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 4 deletions.
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -23,6 +23,7 @@
         "min_item_volume": "1500 ml",
         "max_contains_volume": "9 L",
         "max_contains_weight": "10 kg",
+        "max_item_length": "60 cm",
         "moves": 150
       }
     ],
@@ -114,6 +115,7 @@
         "min_item_volume": "300 ml",
         "max_contains_volume": "800 ml",
         "max_contains_weight": "2 kg",
+        "max_item_length": "20 cm",
         "moves": 50
       }
     ],
@@ -222,6 +224,7 @@
         "min_item_volume": "750 ml",
         "max_contains_volume": "1250 ml",
         "max_contains_weight": "5 kg",
+        "max_item_length": "30 cm",
         "moves": 50
       }
     ],

diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json
@@ -21,6 +21,7 @@
         "moves": 10,
         "max_contains_volume": "3250 ml",
         "max_contains_weight": "5 kg",
+        "max_item_length": "100 cm",
         "holster": true,
         "flag_restriction": [ "SHEATH_AXE" ]
       }
@@ -50,6 +51,7 @@
       {
         "max_contains_volume": "3 L",
         "max_contains_weight": "4 kg",
+        "max_item_length": "130 cm",
         "moves": 10,
         "holster": true,
         "flag_restriction": [ "SHEATH_SWORD" ]
@@ -82,7 +84,8 @@
         "flag_restriction": [ "SHEATH_KNIFE" ],
         "moves": 30,
         "max_contains_volume": "500 ml",
-        "max_contains_weight": "1 kg"
+        "max_contains_weight": "1 kg",
+        "max_item_length": "30 cm"
       }
     ],
     "use_action": { "type": "holster", "holster_prompt": "Sheath knife", "holster_msg": "You sheath your %s" },
@@ -110,6 +113,7 @@
       {
         "max_contains_volume": "3750 ml",
         "max_contains_weight": "5 kg",
+        "max_item_length": "140 cm",
         "holster": true,
         "moves": 20,
         "flag_restriction": [ "SHEATH_SWORD" ]
@@ -137,7 +141,13 @@
     "encumbrance": 3,
     "material_thickness": 1,
     "pocket_data": [
-      { "max_contains_volume": "2 L", "max_contains_weight": "4 kg", "holster": true, "flag_restriction": [ "SHEATH_SWORD" ] }
+      {
+        "max_contains_volume": "2 L",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "100 cm",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_SWORD" ]
+      }
     ],
     "use_action": { "type": "holster", "holster_prompt": "Sheath sword", "holster_msg": "You sheath your %s" },
     "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -163,6 +173,7 @@
         "holster": true,
         "max_contains_volume": "750 ml",
         "max_contains_weight": "2 kg",
+        "max_item_length": "70 cm",
         "moves": 3,
         "flag_restriction": [ "SHEATH_KNIFE" ]
       }
@@ -194,7 +205,8 @@
         "moves": 30,
         "flag_restriction": [ "SHEATH_SPEAR" ],
         "max_contains_volume": "3500 ml",
-        "max_contains_weight": "4 kg"
+        "max_contains_weight": "4 kg",
+        "max_item_length": "200 cm"
       }
     ],
     "use_action": { "type": "holster", "holster_prompt": "Holster spear", "holster_msg": "You holster your %s." },