Merge pull request CleverRaven#15395 from Darkyhard/baldric

Move baldric from Medieval Stuff mod
Bejofo · Feb 17, 2016 · 9bca3bd · 9bca3bd
2 parents 69b4400 + d78a6cf
commit 9bca3bd
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 61 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -4826,6 +4826,7 @@
       ["huge_crossbow", 2],
       ["quiver", 2],
       ["quiver_large", 1],
+      ["baldric", 4],
       ["nodachi", 1],
       ["armor_lightplate", 1],
       ["armor_samurai", 1],
@@ -5145,6 +5146,7 @@
       ["grapnel", 1],
       ["razor_blade", 6],
       ["scabbard", 4],
+      ["baldric", 4],
       ["bscabbard", 4],
       ["sheath", 6],
       ["bootsheath", 6],

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -6522,9 +6522,9 @@
         "covers" : ["FOOT_EITHER"],
         "coverage" : 5,
         "warmth" : 0,
-        "encumbrance" : 2,
+        "encumbrance" : 1,
         "material_thickness" : 1,
-        "flags" : ["VARSIZE", "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS"],
+        "flags" : ["BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS"],
         "use_action" : {
             "type": "holster",
             "holster_prompt": "Sheath knife",
@@ -6546,7 +6546,7 @@
         "price" : 3500,
         "material" : ["leather", "null"],
         "covers" : ["LEG_EITHER"],
-        "flags" : ["VARSIZE", "WAIST", "OVERSIZE"],
+        "flags" : ["WAIST", "OVERSIZE"],
         "volume" : 2,
         "warmth" : 0,
         "encumbrance" : 0,
@@ -6660,17 +6660,43 @@
         "cutting" : -4,
         "bashing" : 4,
         "warmth" : 0,
-        "encumbrance" : 7,
+        "encumbrance" : 3,
         "coverage" : 15,
         "material_thickness" : 1,
-        "flags" : ["VARSIZE", "WAIST", "OVERSIZE"],
+        "flags" : ["WAIST", "OVERSIZE"],
         "use_action" : {
             "type": "holster",
             "holster_prompt": "Sheath sword",
             "holster_msg": "You sheath your %s",
             "max_volume": 8,
             "flags": ["SHEATH_SWORD"]
         }
+    },{
+        "type" : "ARMOR",
+        "id" : "baldric",
+        "name" : "baldric",
+        "weight" : 1625,
+        "color" : "brown",
+        "covers" : ["TORSO"],
+        "symbol" : "[",
+        "description" : "A leather scabbard, big enough for anything up to a longsword, or even a bit larger than that.  Designed to be worn at the waist, secured by a shoulder belt.  Activate to sheath/draw a sword.",
+        "price" : 7500,
+        "material" : ["leather", "wood"],
+        "volume" : 8,
+        "bashing" : 4,
+        "warmth" : 0,
+        "encumbrance" : 3,
+        "coverage" : 10,
+        "material_thickness" : 1,
+        "flags" : ["WAIST", "OVERSIZE"],
+        "use_action" : {
+            "type": "holster",
+            "holster_prompt": "Sheath sword",
+            "holster_msg": "You sheath your %s",
+            "max_volume": 12,
+            "draw_cost": 10,
+            "flags": ["SHEATH_SWORD"]
+        }
     },
     {
         "type" : "ARMOR",
@@ -6687,10 +6713,10 @@
         "cutting" : -4,
         "bashing" : 4,
         "warmth" : 0,
-        "encumbrance" : 7,
+        "encumbrance" : 3,
         "coverage" : 10,
         "material_thickness" : 1,
-        "flags" : ["VARSIZE", "BELTED", "OVERSIZE"],
+        "flags" : ["BELTED", "OVERSIZE"],
         "use_action" : {
             "type": "holster",
             "holster_prompt": "Sheath sword",

diff --git a/data/json/recipes/recipe_armor.json b/data/json/recipes/recipe_armor.json
@@ -7135,6 +7135,27 @@
         [ ["2x4", 2] ],
         [ ["nail", 5] ]
     ]
+},{
+    "type" : "recipe",
+    "result": "baldric",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_STORAGE",
+    "skill_used": "tailor",
+    "skills_required": [ "cutting", 1 ],
+    "difficulty": 5,
+    "time": 40000,
+    "reversible": false,
+    "autolearn": true,
+    "qualities":[
+        {"id":"HAMMER","level":1,"amount":1},
+        {"id":"CUT","level":1,"amount":1}
+    ],
+    "components": [
+        [ [ "leather", 12 ], [ "tanned_hide", 2 ] ],
+        [ ["superglue", 1] ],
+        [ ["2x4", 2] ],
+        [ ["nail", 8] ]
+    ]
 },{
     "type" : "recipe",
     "result": "bscabbard",

diff --git a/data/mods/Medieval_Stuff/armor.json b/data/mods/Medieval_Stuff/armor.json
@@ -267,35 +267,5 @@
         "flags" : ["VARSIZE", "STURDY"],
         "coverage" : 80,
         "material_thickness" : 6
-    },
-    {
-        "type" : "ARMOR",
-        "id" : "baldric",
-        "name" : "baldric",
-        "weight" : 1625,
-        "color" : "brown",
-        "covers" : ["TORSO"],
-        "to_hit" : 0,
-        "symbol" : "[",
-        "description" : "A leather scabbard, big enough for anything up to a longsword, or even a bit larger than that.  Designed to be worn at the waist, secured by a shoulder belt.  Activate to sheath/draw a sword.",
-        "price" : 7500,
-        "material" : ["leather", "wood"],
-        "volume" : 8,
-        "cutting" : -4,
-        "bashing" : 4,
-        "warmth" : 0,
-        "phase" : "solid",
-        "encumbrance" : 7,
-        "coverage" : 10,
-        "material_thickness" : 1,
-        "flags" : ["VARSIZE", "WAIST", "OVERSIZE"],
-        "use_action" : {
-            "type": "holster",
-            "holster_prompt": "Sheath sword",
-            "holster_msg": "You sheath your %s",
-            "max_volume": 12,
-            "draw_cost": 10,
-            "flags": ["SHEATH_SWORD"]
-        }
     }
 ]
diff --git a/data/mods/Medieval_Stuff/item_groups.json b/data/mods/Medieval_Stuff/item_groups.json
@@ -9,7 +9,6 @@
       ["gambeson", 3],
       ["armor_lamellar", 2],
       ["tunic", 1],
-      ["baldric", 4],
       ["shield_kite", 5],
       ["shield_heater", 10],
       ["shield_buckler", 1]
@@ -20,7 +19,6 @@
     "items":[
       ["armor_lamellar", 2],
       ["helmet_conical", 1],
-      ["baldric", 4],
       ["shield_hoplon", 1],
       ["shield_scutum", 1],
       ["shield_round", 3],

diff --git a/data/mods/Medieval_Stuff/recipe_armor.json b/data/mods/Medieval_Stuff/recipe_armor.json
@@ -350,27 +350,5 @@
       [ "tanned_pelt", 1 ]
     ]
   ]
-},{
-    "type" : "recipe",
-    "result": "baldric",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_STORAGE",
-    "skill_used": "tailor",
-    "skills_required": [ "cutting", 1 ],
-    "difficulty": 5,
-    "time": 40000,
-    "reversible": false,
-    "autolearn": true,
-    "qualities":[
-        {"id":"HAMMER","level":1,"amount":1},
-        {"id":"CUT","level":1,"amount":1}
-    ],
-    "components": [
-        [ [ "leather", 3 ] ],
-        [ [ "leather", 10 ], [ "tanned_hide", 2 ] ],
-        [ ["superglue", 1] ],
-        [ ["2x4", 2] ],
-        [ ["nail", 8] ]
-    ]
 }
 ]