Clean up what the npcs wear by default

2 files changed, 56 insertions, 288 deletions

diff --git a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
index c407b54..a4800e9 100644
--- a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
+++ b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
@@ -2,11 +2,7 @@
   {
     "type": "item_group",
     "id": "VAMP_UNDERTRADER_sell",
-    "entries": [ { "group": "VAMP_UNDERTRADER_sell_items", "count": [ 5, 10 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "VAMP_UNDERTRADER_sell_items",
+    "subtype": "collection",
     "items": [
       [ "sword_dive", 50 ],
       [ "sword_sip", 50 ],
@@ -24,11 +20,7 @@
   {
     "type": "item_group",
     "id": "VAMP_GUNSHOP_sell",
-    "entries": [ { "group": "VAMP_GUNSHOP_sell_items", "count": [ 2, 5 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "VAMP_GUNSHOP_sell_items",
+    "subtype": "collection",
     "items": [
       [ "b11_striker", 20 ],
       [ "bloodshot_00", 50 ],
@@ -42,12 +34,35 @@
   {
     "type": "item_group",
     "id": "HUMAN_JUNKSHOP_sell",
-    "entries": [ { "group": "HUMAN_JUNKSHOP_sell_items", "count": [ 20, 30 ] } ]
-  },
-  {
-    "type": "item_group",
-    "id": "HUMAN_JUNKSHOP_sell_items",
+    "subtype": "collection",
     "items": [
+      { "item": "RobofacCoin", "count-min": 5, "count-max": 30, "prob": 30 },
+      { "item": "FlatCoin", "count-min": 50, "count-max": 300, "prob": 30 },
+      { "group": "tools_general", "prob": 80, "count": [ 1, 3 ] },
+      { "group": "tools_home", "prob": 80, "count": [ 1, 3 ] },
+      { "group": "tools_construction", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "tools_carpentry", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "tools_earthworking", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "tools_electronics", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "tools_lighting_industrial", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "tools_mechanic", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "tools_plumbing", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_electronics", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_plumbing", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_hardware", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_fuel", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_metal", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "supplies_mechanics", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "ammo_any_batteries_full", "prob": 20, "count": [ 1, 3 ] },
+      { "group": "magazines", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "book_gunref", "prob": 15 },
+      { "group": "hardware_books", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "religious_books", "prob": 30, "count": [ 1, 3 ] },
+      { "group": "homebooks", "prob": 40, "count": [ 1, 3 ] },
+      { "group": "manuals", "prob": 30 },
+      { "group": "book_survival", "prob": 15 },
+      { "group": "novels", "prob": 50, "count": [ 1, 3 ] },
+      { "group": "textbooks", "prob": 30 },
       [ "vest", 40 ],
       [ "kevlar", 15 ],
       [ "jacket_army", 30 ],
@@ -55,10 +70,8 @@
       [ "trenchcoat_leather", 20 ],
       [ "trenchcoat_fur", 10 ],
       [ "vest_leather", 15 ],
-      [ "vest_leather_mod", 5 ],
       [ "football_armor", 30 ],
       [ "jacket_leather", 25 ],
-      [ "jacket_leather_mod", 10 ],
       [ "jacket_jean", 15 ],
       [ "jacket_flannel", 15 ],
       [ "pants_cargo", 40 ],
@@ -66,11 +79,11 @@
       [ "pants_army", 30 ],
       [ "pants_leather", 15 ],
       [ "gloves_fingerless", 30 ],
-      [ "gloves_fingerless_mod", 10 ],
       [ "gloves_tactical", 15 ],
       [ "gauntlets_larmor", 25 ],
       [ "gloves_fur", 5 ],
       [ "gloves_leather", 35 ],
+      [ "gloves_work", 20 ],
       [ "boots", 20 ],
       [ "boots_steel", 20 ],
       [ "boots_hiking", 30 ],
@@ -100,7 +113,7 @@
       [ "sunglasses", 15 ],
       [ "glasses_safety", 15 ],
       [ "goggles_ski", 5 ],
-      [ "chestrig", 20 ],
+      [ "tacvest", 20 ],
       [ "legrig", 15 ],
       [ "tool_belt", 15 ],
       [ "fanny", 5 ],
@@ -121,20 +134,20 @@
       [ "makeshift_machete", 15 ],
       [ "flamethrower_crude", 20 ],
       [ "fungicide", 20 ],
+      [ "insecticide", 20 ],
       [ "antifungal", 20 ],
       [ "antiparasitic", 20 ],
       [ "diazepam", 15 ],
       [ "small_repairkit", 20 ],
       [ "grapnel", 5 ],
       [ "misc_repairkit", 15 ],
-      [ "flamethrower_simple", 15 ],
       [ "toolbox", 20 ],
       [ "crowbar", 25 ],
       [ "machete", 25 ],
       [ "ax", 25 ],
       [ "spear_knife", 30 ],
       [ "22_lr", 25 ],
-      [ "22_fmj", 1 ],
+      [ "22_cphp", 1 ],
       [ "223", 15 ],
       [ "308", 10 ],
       [ "3006", 10 ],
@@ -165,9 +178,8 @@
       [ "remington_870", 10 ],
       [ "mossberg_500", 5 ],
       [ "shotgun_d", 5 ],
-      [ "pipebomb", 10 ],
+      [ "improvised_pipebomb", 10 ],
       [ "molotov", 10 ],
-      [ "matchbomb", 10 ],
       [ "longbow", 5 ],
       [ "compositebow", 15 ],
       [ "shortbow", 10 ],
@@ -178,257 +190,7 @@
       [ "rifle_scope", 20 ],
       [ "pistol_scope", 10 ],
       [ "improve_sights", 20 ],
-      [ "combatsaw_off", 5 ],
-      [ "firemachete_off", 5 ],
-      [ "shishkebab_off", 5 ],
-      [ "helsing", 5 ],
-      [ "tihar", 5 ],
-      [ "ashot", 5 ],
-      [ "polisher", 10 ],
-      [ "jumper_cable", 3 ],
-      [ "superglue", 30 ],
-      [ "string_6", 2 ],
-      [ "string_36", 40 ],
-      [ "screwdriver", 40 ],
-      [ "wrench", 30 ],
-      [ "hacksaw", 17 ],
-      [ "xacto", 10 ],
-      [ "gloves_leather", 45 ],
-      [ "gloves_work", 30 ],
-      [ "cordless_drill", 10 ],
-      [ "mask_dust", 65 ],
-      [ "glasses_safety", 40 ],
-      [ "battery", 50 ],
-      [ "nail", 35 ],
-      [ "nailgun", 12 ],
-      [ "hand_drill", 10 ],
-      [ "solar_cell", 5 ],
-      [ "manual_mechanics", 35 ],
-      [ "manual_fabrication", 20 ],
-      [ "recipe_bows", 10 ],
-      [ "recipe_arrows", 10 ],
-      [ "hammer", 35 ],
-      [ "saw", 35 ],
-      [ "flashlight", 40 ],
-      [ "soldering_iron", 30 ],
-      [ "solder_wire", 30 ],
-      [ "bubblewrap", 50 ],
-      [ "binoculars", 20 ],
-      [ "roller_blades", 20 ],
-      [ "duct_tape", 70 ],
-      [ "lawnmower", 25 ],
-      [ "floodlight", 10 ],
-      [ "minifridge", 5 ],
-      [ "char_smoker", 25 ],
-      [ "lawn_dart", 10 ],
-      [ "dehydrator", 15 ],
-      [ "foot_crank", 10 ],
-      [ "boltcutters", 5 ],
-      [ "spray_can", 50 ],
-      [ "jar_glass_sealed", 50 ],
-      [ "jar_3l_glass_sealed", 40 ],
-      [ "flotation_vest", 1 ],
-      [ "fishing_rod_professional", 2 ],
-      [ "bearing", 1 ],
-      [ "atomic_light", 1 ],
-      [ "atomic_lamp", 1 ],
-      [ "alarmclock", 10 ],
-      [ "fungicide", 10 ],
-      [ "oil_lamp", 10 ],
-      [ "lamp_oil", 10 ],
-      [ "grapnel", 1 ],
-      [ "misc_repairkit", 15 ],
-      [ "charcoal", 20 ],
-      [ "toolbox", 2 ],
-      [ "knitting_needles", 10 ],
-      [ "sheath", 15 ],
-      [ "peephole", 2 ],
-      [ "magnifying_glass", 5 ],
-      [ "thermometer", 3 ],
-      [ "hygrometer", 3 ],
-      [ "barometer", 3 ],
-      [ "polisher", 15 ],
-      [ "jumper_cable", 10 ],
-      [ "jumper_cable_heavy", 2 ],
-      [ "concrete", 20 ],
-      [ "metal_smoother", 10 ],
-      [ "brick_kiln", 5 ],
-      [ "brick", 20 ],
-      [ "con_mix", 5 ],
-      [ "rebar", 20 ],
-      [ "superglue", 30 ],
-      [ "chain", 20 ],
-      [ "rope_6", 4 ],
-      [ "rope_30", 35 ],
-      [ "cordless_drill", 30 ],
-      [ "circsaw_off", 10 ],
-      [ "circsaw_blade", 8 ],
-      [ "glass_sheet", 5 ],
-      [ "pipe", 20 ],
-      [ "nail", 35 ],
-      [ "hose", 15 ],
-      [ "string_36", 40 ],
-      [ "frame", 20 ],
-      [ "hdframe", 10 ],
-      [ "metal_tank", 10 ],
-      [ "metal_tank_little", 10 ],
-      [ "water_faucet", 10 ],
-      [ "wire", 50 ],
-      [ "wire_barbed", 20 ],
-      [ "duct_tape", 60 ],
-      [ "jerrycan", 10 ],
-      [ "lawnmower", 25 ],
-      [ "trimmer_off", 20 ],
-      [ "floodlight", 20 ],
-      [ "minifridge", 10 ],
-      [ "char_smoker", 25 ],
-      [ "dehydrator", 15 ],
-      [ "foot_crank", 10 ],
-      [ "spray_can", 50 ],
-      [ "ax", 8 ],
-      [ "g_shovel", 20 ],
-      [ "jerrycan_big", 10 ],
-      [ "funnel", 50 ],
-      [ "bearing", 1 ],
-      [ "jack", 10 ],
-      [ "permanent_marker", 20 ],
-      [ "forge", 1 ],
-      [ "char_forge", 1 ],
-      [ "char_kiln", 1 ],
-      [ "crucible", 1 ],
-      [ "tongs", 1 ],
-      [ "chisel", 2 ],
-      [ "swage", 1 ],
-      [ "anvil", 2 ],
-      [ "apron_leather", 10 ],
-      [ "tool_belt", 30 ],
-      [ "knee_pads", 20 ],
-      [ "cu_pipe", 50 ],
-      [ "fungicide", 5 ],
-      [ "charcoal", 5 ],
-      [ "sheath", 10 ],
-      [ "multitool", 6 ],
-      [ "survnote", 1 ],
-      [ "fertilizer_commercial", 30 ],
-      [ "peephole", 25 ],
-      [ "magnifying_glass", 5 ],
-      [ "chem_chromium_oxide", 5 ],
-      [ "chem_thermite", 10 ],
-      [ "polisher", 20 ],
-      [ "screwdriver", 40 ],
-      [ "hammer", 35 ],
-      [ "wrench", 30 ],
-      [ "con_mix", 10 ],
-      [ "brick_kiln", 10 ],
-      [ "g_shovel", 20 ],
-      [ "saw", 15 ],
-      [ "circsaw_off", 5 ],
-      [ "hacksaw", 17 ],
-      [ "hammer_sledge", 6 ],
-      [ "xacto", 10 ],
-      [ "flashlight", 40 ],
-      [ "crowbar", 18 ],
-      [ "halligan", 1 ],
-      [ "fire_ax", 3 ],
-      [ "nailgun", 12 ],
-      [ "carver_off", 4 ],
-      [ "bullwhip", 1 ],
-      [ "press", 5 ],
-      [ "puller", 5 ],
-      [ "boltcutters", 5 ],
-      [ "ax", 8 ],
-      [ "tongs", 3 ],
-      [ "chisel", 2 ],
-      [ "swage", 1 ],
-      [ "misc_repairkit", 5 ],
-      [ "tool_belt", 5 ],
-      [ "sheath", 5 ],
-      [ "jumper_cable", 4 ],
-      [ "2x4", 60 ],
-      [ "machete", 5 ],
-      [ "concrete", 30 ],
-      [ "brick", 25 ],
-      [ "rebar", 25 ],
-      [ "boots_steel", 50 ],
-      [ "boots_combat", 20 ],
-      [ "boots_hiking", 10 ],
-      [ "runner_bag", 5 ],
-      [ "hat_hard", 50 ],
-      [ "wearable_light", 10 ],
-      [ "ear_plugs", 50 ],
-      [ "mask_filter", 30 ],
-      [ "glasses_safety", 40 ],
-      [ "bb", 8 ],
-      [ "bbgun", 10 ],
-      [ "beartrap", 5 ],
-      [ "radio", 20 ],
-      [ "hotplate", 10 ],
-      [ "extinguisher", 20 ],
-      [ "nailgun", 12 ],
-      [ "manual_mechanics", 35 ],
-      [ "manual_carpentry", 10 ],
-      [ "carpentry_book", 5 ],
-      [ "manual_fabrication", 20 ],
-      [ "mag_carpentry", 30 ],
-      [ "101_carpentry", 20 ],
-      [ "mag_mechanics", 35 ],
-      [ "mag_fabrication", 12 ],
-      [ "duct_tape", 60 ],
-      [ "lawnmower", 25 ],
-      [ "floodlight", 10 ],
-      [ "minifridge", 5 ],
-      [ "boltcutters", 8 ],
-      [ "foot_crank", 10 ],
-      [ "cable", 60 ],
-      [ "textbook_mechanics", 12 ],
-      [ "book_icef", 8 ],
-      [ "textbook_fabrication", 12 ],
-      [ "vac_sealer", 10 ],
-      [ "sm_extinguisher", 10 ],
-      [ "fungicide", 5 ],
-      [ "miner_hat", 1 ],
-      [ "grapnel", 1 ],
-      [ "misc_repairkit", 5 ],
-      [ "tool_belt", 30 ],
-      [ "knitting_needles", 1 ],
-      [ "survnote", 1 ],
-      [ "material_quicklime", 10 ],
-      [ "amplifier", 8 ],
-      [ "mag_electronics", 15 ],
-      [ "antenna", 18 ],
-      [ "battery", 50 ],
-      [ "soldering_iron", 70 ],
-      [ "solder_wire", 70 ],
-      [ "solar_cell", 5 ],
-      [ "screwdriver", 40 ],
-      [ "processor", 15 ],
-      [ "RAM", 22 ],
-      [ "mp3", 18 ],
-      [ "portable_game", 12 ],
-      [ "vibrator", 10 ],
-      [ "flashlight", 40 ],
-      [ "radio", 20 ],
-      [ "mess_kit", 5 ],
-      [ "hotplate", 10 ],
-      [ "coffeemaker", 10 ],
-      [ "receiver", 10 ],
-      [ "transponder", 5 ],
-      [ "tazer", 3 ],
-      [ "usb_drive", 5 ],
-      [ "manual_electronics", 20 ],
-      [ "recipe_augs", 4 ],
-      [ "cable", 60 ],
-      [ "vac_sealer", 10 ],
-      [ "cell_phone", 50 ],
-      [ "eink_tablet_pc", 15 ],
-      [ "mobile_memory_card", 40 ],
-      [ "camera", 15 ],
-      [ "camera_pro", 5 ],
-      [ "wristwatch", 15 ],
-      [ "radio_car_box", 3 ],
-      [ "radiocontrol", 15 ],
-      [ "magnifying_glass", 4 ],
-      [ "omnicamera", 2 ]
+      [ "ashot", 5 ]
     ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_worn.json b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_worn.json
index c040d88..47b2a9b 100644
--- a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_worn.json
+++ b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_worn.json
@@ -22,14 +22,16 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "blood_gloves" },
+      { "item": "under_armor" },
+      { "item": "under_armor_shorts" },
+      { "item": "socks" },
       { "item": "blood_hood" },
-      { "item": "blood_pants" },
       { "item": "blood_duster" },
-      { "item": "socks" },
+      { "item": "blood_gloves" },
+      { "item": "blood_pants" },
       { "item": "blood_boots" },
-      { "group": "VAMP_bags_worn" },
-      { "group": "VAMP_sheath_worn", "contents-group": "VAMP_knife_worn" }
+      { "group": "VAMP_sheath_worn", "contents-group": "VAMP_knife_worn" },
+      { "group": "VAMP_bags_worn" }
     ]
   },
   {
@@ -37,14 +39,16 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "bloodinfused_survivorgloves" },
+      { "item": "under_armor" },
+      { "item": "under_armor_shorts" },
+      { "item": "socks" },
       { "item": "bloodinfused_survivorhood" },
       { "item": "bloodinfused_survivortrenchcoat" },
-      { "item": "socks" },
+      { "item": "bloodinfused_survivorgloves" },
       { "item": "bloodinfused_survivorpants" },
       { "item": "bloodinfused_survivorboots" },
-      { "group": "VAMP_bags_worn" },
-      { "group": "VAMP_sheath_worn", "contents-group": "VAMP_knife_worn" }
+      { "group": "VAMP_sheath_worn", "contents-group": "VAMP_knife_worn" },
+      { "group": "VAMP_bags_worn" }
     ]
   },
   {
@@ -52,13 +56,15 @@
     "id": "HUMAN_JUNKSHOP_worn",
     "subtype": "collection",
     "items": [
-      { "item": "pants_cargo" },
-      { "item": "armor_nomad" },
-      { "item": "helmet_nomad" },
-      { "item": "rucksack" },
+      { "item": "under_armor" },
+      { "item": "under_armor_shorts" },
       { "item": "socks" },
+      { "item": "helmet_nomad" },
+      { "item": "armor_nomad" },
+      { "item": "gloves_fingerless" },
+      { "item": "pants_cargo" },
       { "item": "boots_larmor" },
-      { "item": "gloves_fingerless" }
+      { "item": "rucksack" }
     ]
   }
 ]