Merge pull request #44251 from Maleclypse/Fuji-Bugfix

Fuji Mil Profs MBR Bugfix
CleverRaven · Sep 19, 2020 · 9b825db · 9b825db
2 parents 987bd4b + 6cbba44
commit 9b825db
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/data/mods/Fuji_Mil_Prof/prof/army.json b/data/mods/Fuji_Mil_Prof/prof/army.json
@@ -20,12 +20,13 @@
           "elbow_pads",
           "socks",
           "boots_combat",
-          "gloves_tactical"
+          "gloves_tactical",
+          "ballistic_vest_esapi"
         ],
         "entries": [
           { "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "acog_scope", "grip" ] },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "modularvestceramic", "contents-group": "army_mags_m4" },
+          { "item": "tacvest", "contents-group": "army_mags_m4" },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }
         ]
@@ -53,12 +54,13 @@
           "elbow_pads",
           "socks",
           "boots_combat",
-          "gloves_tactical"
+          "gloves_tactical",
+          "ballistic_vest_esapi"
         ],
         "entries": [
           { "item": "m14ebr", "ammo-item": "762_51", "charges": 20, "contents-item": [ "acog_scope", "shoulder_strap", "bipod" ] },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "modularvestceramic", "contents-group": "army_mags_m14" },
+          { "item": "tacvest", "contents-group": "army_mags_m14" },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }
         ]
@@ -123,12 +125,13 @@
           "elbow_pads",
           "socks",
           "boots_combat",
-          "gloves_tactical"
+          "gloves_tactical",
+          "ballistic_vest_esapi"
         ],
         "entries": [
           { "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight", "m203" ] },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "modularvestceramic", "contents-group": "army_mags_m4" },
+          { "item": "tacvest", "contents-group": "army_mags_m4" },
           { "item": "40x46mm_m433", "charges": 4, "container-item": "grenade_pouch" },
           { "item": "knife_combat", "container-item": "sheath" },
           { "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }

diff --git a/data/mods/Fuji_Mil_Prof/prof/spc.json b/data/mods/Fuji_Mil_Prof/prof/spc.json
@@ -25,7 +25,8 @@
           "socks",
           "boots_combat",
           "gloves_tactical",
-          "diving_watch"
+          "diving_watch",
+          "ballistic_vest_esapi"
         ],
         "entries": [
           {
@@ -35,7 +36,7 @@
             "contents-item": [ "shoulder_strap", "acog_scope", "grip", "suppressor" ]
           },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "modularvestceramic", "contents-group": "army_mags_300blk" },
+          { "item": "tacvest", "contents-group": "army_mags_300blk" },
           { "item": "knife_rambo", "container-item": "scabbard" },
           { "item": "holster", "contents-group": "holster_supp_MEU" },
           { "item": "legpouch_large", "contents-group": "army_mags_1911" }
@@ -181,11 +182,20 @@
     ],
     "items": {
       "both": {
-        "items": [ "anbc_suit", "pants_cargo", "longshirt", "dump_pouch", "socks", "gloves_rubber", "diving_watch" ],
+        "items": [
+          "anbc_suit",
+          "pants_cargo",
+          "longshirt",
+          "dump_pouch",
+          "socks",
+          "gloves_rubber",
+          "diving_watch",
+          "ballistic_vest_esapi"
+        ],
         "entries": [
           { "item": "hk_mp5", "ammo-item": "9mm", "charges": 30, "contents-item": [ "shoulder_strap", "suppressor" ] },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "modularvestkevlar", "contents-group": "army_mags_mp5" },
+          { "item": "tacvest", "contents-group": "army_mags_mp5" },
           { "item": "holster", "contents-group": "holster_supp_MEU" },
           { "item": "legpouch_large", "contents-group": "army_mags_1911" }
         ]