Updates for DDA version

chaosvolt · Apr 10, 2022 · d03d710 · d03d710
1 parent af2907f
commit d03d710
Showing 7 changed files with 62 additions and 28 deletions.
diff --git a/MST_Extra/item_groups.json b/MST_Extra/item_groups.json
@@ -1,91 +1,111 @@
 [
   {
     "id": "medieval",
+    "copy-from": "medieval",
     "type": "item_group",
-    "items": [ [ "crossbow_makeshift", 1 ] ]
+    "extend": { "items": [ [ "crossbow_makeshift", 1 ] ] }
   },
   {
     "id": "survivorzed_extra",
+    "copy-from": "survivorzed_extra",
     "type": "item_group",
-    "items": [ [ "hat_hooded", 1 ] ]
+    "extend": { "items": [ [ "hat_hooded", 1 ] ] }
   },
   {
     "id": "tools_survival",
+    "copy-from": "tools_survival",
     "type": "item_group",
-    "items": [ [ "hobo_stove", 3 ], [ "tinder", 3 ], [ "canteen_wood", 2 ] ]
+    "extend": { "items": [ [ "hobo_stove", 3 ], [ "tinder", 3 ], [ "canteen_wood", 2 ] ] }
   },
   {
     "id": "museum_primitive",
+    "copy-from": "museum_primitive",
     "type": "item_group",
-    "items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ]
+    "extend": {
+      "items": [ [ "atlatl", 50 ], [ "javelin", 30 ], [ "primitive_hoe", 10 ], [ "pitch_wood", 5 ], [ "makeshift_sled_item", 1 ] ]
+    }
   },
   {
     "id": "hive",
+    "copy-from": "hive",
     "type": "item_group",
-    "items": [ [ "beehive_empty", 1 ] ]
+    "extend": { "items": [ [ "beehive_empty", 1 ] ] }
   },
   {
     "id": "museum_misc",
+    "copy-from": "museum_misc",
     "type": "item_group",
-    "items": [ [ "jar_clay", 20 ], [ "oil_lamp_clay", 20 ], [ "tinderbox_clay", 5 ], [ "hobo_stove_clay", 10 ] ]
+    "extend": { "items": [ [ "jar_clay", 20 ], [ "oil_lamp_clay", 20 ], [ "tinderbox_clay", 5 ], [ "hobo_stove_clay", 10 ] ] }
   },
   {
     "id": "antique",
+    "copy-from": "antique",
     "type": "item_group",
-    "items": [ [ "oil_lamp_clay", 10 ] ]
+    "extend": { "items": [ [ "oil_lamp_clay", 10 ] ] }
   },
   {
     "id": "church",
+    "copy-from": "church",
     "type": "item_group",
-    "items": [ [ "oil_lamp_clay", 20 ] ]
+    "extend": { "items": [ [ "oil_lamp_clay", 20 ] ] }
   },
   {
     "id": "reading_lights",
+    "copy-from": "reading_lights",
     "type": "item_group",
-    "items": [ [ "oil_lamp_clay", 20 ] ]
+    "extend": { "items": [ [ "oil_lamp_clay", 20 ] ] }
   },
   {
     "id": "kitchen",
+    "copy-from": "kitchen",
     "type": "item_group",
     "ammo": 75,
     "magazine": 100,
     "subtype": "distribution",
-    "entries": [
-      { "item": "bread_garlic", "prob": 7 },
-      { "item": "meat_canned", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
-    ]
+    "extend": {
+      "entries": [
+        { "item": "bread_garlic", "prob": 7 },
+        { "item": "potted_meat", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
+      ]
+    }
   },
   {
     "id": "groce_bread",
+    "copy-from": "groce_bread",
     "type": "item_group",
-    "items": [ [ "bread_garlic", 20 ] ]
+    "extend": { "items": [ [ "bread_garlic", 20 ] ] }
   },
   {
     "id": "restaur_kitchen",
+    "copy-from": "restaur_kitchen",
     "type": "item_group",
-    "items": [ [ "bread_garlic", 14 ] ]
+    "extend": { "items": [ [ "bread_garlic", 14 ] ] }
   },
   {
     "id": "vet_utility",
+    "copy-from": "vet_utility",
     "type": "item_group",
-    "items": [ [ "jerky_offal", 20 ] ]
+    "extend": { "items": [ [ "jerky_offal", 20 ] ] }
   },
   {
     "type": "item_group",
     "id": "preserved_food",
+    "copy-from": "preserved_food",
     "subtype": "distribution",
-    "entries": [ { "item": "potted_meat", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" } ]
+    "extend": { "entries": [ { "item": "potted_meat", "prob": 20, "charges": 12, "container-item": "jar_3l_glass_sealed" } ] }
   },
   {
     "type": "item_group",
     "id": "foodintincan",
+    "copy-from": "foodintincan",
     "subtype": "distribution",
-    "entries": [ { "item": "potted_meat", "prob": 1 } ]
+    "extend": { "entries": [ { "item": "potted_meat", "prob": 1 } ] }
   },
   {
     "type": "item_group",
     "id": "cannedfood",
+    "copy-from": "cannedfood",
     "subtype": "distribution",
-    "entries": [ { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" } ]
+    "extend": { "entries": [ { "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" } ] }
   }
 ]
diff --git a/MST_Extra/items/armor.json b/MST_Extra/items/armor.json
@@ -149,7 +149,14 @@
     "volume": "1 L",
     "material": [ "leather" ],
     "pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ],
-    "armor": [ { "encumbrance": 5, "coverage": 15, "covers": [ "leg_l", "leg_r" ] } ]
+    "armor": [
+      {
+        "encumbrance": 5,
+        "coverage": 15,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_upper_l", "leg_upper_r" ]
+      }
+    ]
   },
   {
     "id": "quiver_birchbark_atlatl",
@@ -161,6 +168,13 @@
     "volume": "1 L",
     "material": [ "wood" ],
     "pocket_data": [ { "ammo_restriction": { "atlatl": 10 }, "moves": 30 } ],
-    "armor": [ { "encumbrance": 15, "coverage": 15, "covers": [ "leg_l", "leg_r" ] } ]
+    "armor": [
+      {
+        "encumbrance": 15,
+        "coverage": 15,
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_upper_l", "leg_upper_r" ]
+      }
+    ]
   }
 ]
diff --git a/MST_Extra/items/containers.json b/MST_Extra/items/containers.json
@@ -33,7 +33,7 @@
         }
       ]
     },
-    "flags": [ "WAIST" ]
+    "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
     "id": "jar_clay",

diff --git a/MST_Extra/items/tool_armor.json b/MST_Extra/items/tool_armor.json
@@ -30,9 +30,9 @@
     "material": [ "wood", "leather" ],
     "volume": "2500 ml",
     "bashing": 4,
-    "flags": [ "WAIST" ],
+    "flags": [ "BELTED" ],
     "material_thickness": 2,
-    "armor": [ { "encumbrance": 10, "coverage": 10, "covers": [ "torso" ] } ]
+    "armor": [ { "encumbrance": 10, "coverage": 10, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]
   },
   {
     "id": "mask_gas_makeshift",

diff --git a/MST_Extra/modinfo.json b/MST_Extra/modinfo.json
@@ -5,7 +5,7 @@
     "name": "MST Extra",
     "authors": [ "Chaosvolt" ],
     "description": "The sequel to CDDA's old More Survival Tools mod, adding additional useful innawoods content.",
-    "version": "DDA version, update 2/14/2022",
+    "version": "DDA version, update 4/10/2022",
     "category": "items",
     "dependencies": [ "dda" ]
   }

diff --git a/MST_Extra_BN/item_groups.json b/MST_Extra_BN/item_groups.json
@@ -52,7 +52,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "bread_garlic", "prob": 7 },
-      { "item": "meat_canned", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
+      { "item": "potted_meat", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
     ]
   },
   {
@@ -92,6 +92,6 @@
     "type": "item_group",
     "id": "cannedfood",
     "subtype": "distribution",
-    "entries": [ { "item": "meat_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" } ]
+    "entries": [ { "item": "potted_meat", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" } ]
   }
 ]
diff --git a/MST_Extra_BN/items/containers.json b/MST_Extra_BN/items/containers.json
@@ -17,7 +17,7 @@
     "seals": true,
     "watertight": true,
     "armor_data": { "covers": [ "leg_either" ], "coverage": 5, "encumbrance": 5, "material_thickness": 1 },
-    "flags": [ "WAIST" ]
+    "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
     "id": "jar_clay",