Merge pull request #82105 from ehughsbaird/variant-copy-from

Allow copy-from to copy for some itype members

Author: Maleclypse

data/json/artifact/artifact_item_types.json

@@ -234,7 +234,9 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "coat_fur",
     "name": { "str": "ornate fur coat" },
-    "description": "A heavy, finely crafted coat made of the fur of an unidentifiable creature.  It is the only one of its kind.\nIt may have unknown powers; try activating them."
+    "description": "A heavy, finely crafted coat made of the fur of an unidentifiable creature.  It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "//": "remove fur coat variants",
+    "variants": [  ]
   },
   {
     "id": "art_mask",

data/json/items/armor/ammo_pouch.json

@@ -208,6 +208,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "chestrig",
     "name": { "str": "chest rig" },
+    "//": "delete chest rig variants",
+    "variants": [  ],
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
   },
@@ -217,6 +219,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "chestrig",
     "name": { "str": "chest rig" },
+    "//": "delete chest rig variants",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },

data/json/items/armor/ballistic_armor.json

@@ -1262,6 +1262,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "soft_3a_vest",
     "name": { "str": "FBI ballistic vest" },
+    "//variants": "delete security vest variants",
+    "variants": [  ],
     "//": "Based on the exact model; https://www.tyrtactical.com/shop/tyr-tactical-male-epic-federal-outer-carrier/",
     "description": "A ranger green soft ballistic vest with MOLLE rigging used by federal law enforcement agencies.  Soft armor plates inside the vest provide solid defense against shrapnel and small-caliber rounds.  \"FBI\" is emblazoned across the front and back in large, yellow lettering, and it includes a pocket for storing evidence.  Use it to attach or detach pouches.",
     "use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ]

data/json/items/armor/coats.json

@@ -213,6 +213,8 @@
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
     "name": { "str": "fur coat" },
+    "//": "delete fur coat variants, this is survivor made",
+    "variants": [  ],
     "copy-from": "coat_fur",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -223,6 +225,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "coat_fur",
     "name": { "str": "fur coat" },
+    "//": "delete fur coat variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },
@@ -234,6 +238,8 @@
     "looks_like": "coat_fur",
     "name": { "str": "faux fur coat" },
     "description": "A garishly-colored faux fur coat with a couple small pockets.  Although not as warm as natural fur, it gives you some of that unique flair.",
+    "//": "delete fur coat variants",
+    "variants": [  ],
     "material": [ "faux_fur", "cotton" ],
     "color": "pink",
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ],

data/json/items/armor/legs_clothes.json

@@ -365,6 +365,8 @@
     "proportional": { "weight": 2.2 },
     "name": { "str_sp": "leather hot pants" },
     "description": "A simple pair of leather short shorts.",
+    "//": "delete hot pants variants",
+    "variants": [  ],
     "material": [ "leather" ],
     "looks_like": "hot_pants",
     "color": "brown",
@@ -379,6 +381,8 @@
     "proportional": { "weight": 2.2 },
     "name": { "str_sp": "fur hot pants" },
     "description": "A simple pair of fur short shorts.",
+    "//": "delete hot pants variants",
+    "variants": [  ],
     "material": [ "fur" ],
     "looks_like": "hot_pants_leather",
     "color": "brown",

data/json/items/armor/masks.json

@@ -41,6 +41,8 @@
     "category": "armor",
     "name": { "str": "cut-resistant balaclava" },
     "description": "A face covering that helps protect from slashes and cuts, in addition to the cold.",
+    "//": "delete balclava :) variants",
+    "variants": [  ],
     "copy-from": "balclava",
     "price": "76 USD",
     "material": [ "kevlar" ]

data/json/items/armor/suits_clothes.json

@@ -261,6 +261,8 @@
     "subtypes": [ "ARMOR" ],
     "name": { "str": "flag jumpsuit" },
     "description": "A jumpsuit embroidered with a pattern of the American flag.  Provides decent storage and is not very encumbering.",
+    "//": "delete jumpsuit variants",
+    "variants": [  ],
     "color": "light_red"
   },
   {
@@ -424,6 +426,8 @@
     "copy-from": "jumpsuit",
     "name": { "str": "jumpsuit" },
     "description": "A thin, short-sleeved jumpsuit; similar to those worn by prisoners.  Provides decent storage and is not very encumbering.",
+    "//": "delete jumpsuit variants",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },
@@ -434,6 +438,8 @@
     "copy-from": "jumpsuit",
     "name": { "str": "skeleton jumpsuit" },
     "description": "A black jumpsuit with a skeleton pattern printed on it.  It can be zipped all the way up to cover your head and face in a skull pattern too.  Use it to zip the head portion closed.",
+    "//": "delete jumpsuit variants",
+    "variants": [  ],
     "weight": "939 g",
     "volume": "3500 ml",
     "price": "95 USD",

data/json/items/armor/torso_clothes.json

@@ -775,6 +775,8 @@
     "subtypes": [ "ARMOR" ],
     "name": { "str": "pocket shirt" },
     "description": "A white button-down shirt with long sleeves and a pocket on the front.  Looks professional!",
+    "//": "delete button shirt variants",
+    "variants": [  ],
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",

data/json/items/armor/undergarment.json

@@ -305,6 +305,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "binder_top",
     "name": { "str": "binder" },
+    "//": "delete binder variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 1.5, "volume": 1.5, "price": 1.25 },
     "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
   },
@@ -314,6 +316,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "binder_top",
     "name": { "str": "binder" },
+    "//": "delete binder variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },
@@ -378,6 +382,8 @@
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
     "name": { "str": "boxer briefs", "str_pl": "pairs of boxer briefs" },
+    "//": "delete boxer variants, this is survivor made",
+    "variants": [  ],
     "weight": "50 g",
     "volume": "350 ml",
     "copy-from": "boxer_briefs",
@@ -389,6 +395,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "boxer_briefs",
     "name": { "str": "boxer briefs", "str_pl": "pairs of boxer briefs" },
+    "//": "delete boxer variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },
@@ -484,6 +492,8 @@
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
     "name": { "str": "boxer shorts", "str_pl": "pairs of boxer shorts" },
+    "//": "delete boxer variants, this is survivor made",
+    "variants": [  ],
     "weight": "72 g",
     "volume": "500 ml",
     "copy-from": "boxer_shorts",
@@ -495,6 +505,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "boxer_shorts",
     "name": { "str": "boxer shorts", "str_pl": "pairs of boxer shorts" },
+    "//": "delete boxer variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },
@@ -540,6 +552,8 @@
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
     "name": { "str": "boy shorts", "str_pl": "pairs of boy shorts" },
+    "//": "delete boy shorts variants, this is survivor made",
+    "variants": [  ],
     "weight": "72 g",
     "volume": "500 ml",
     "copy-from": "boy_shorts",
@@ -551,6 +565,8 @@
     "subtypes": [ "ARMOR" ],
     "copy-from": "boy_shorts",
     "name": { "str": "boy shorts", "str_pl": "pairs of boy shorts" },
+    "//": "delete boy shorts variants, this is survivor made",
+    "variants": [  ],
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
   },

data/json/items/containers/ammo_boxes.json

@@ -13,6 +13,7 @@
     "color": "brown",
     "looks_like": "box_small",
     "variant_type": "generic",
+    "//": "These variants must remain 0 weight, as most ammo boxes copy from this and inherit variants",
     "variants": [
       {
         "id": "22lr_ammo_box_50",