fix CleverRaven#33364 and more trouble related to profressions with f…

…lashlight
pierredavidbelanger · Aug 19, 2019 · 9144924 · 9144924
1 parent cf4ce7d
commit 9144924
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/data/json/professions.json b/data/json/professions.json
@@ -19,6 +19,14 @@
     "magazine": 100,
     "entries": [ { "item": "cell_phone" } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "charged_flashlight",
+    "ammo": 100,
+    "magazine": 100,
+    "entries": [ { "item": "flashlight" } ]
+  },
   {
     "type": "item_group",
     "subtype": "collection",
@@ -768,7 +776,6 @@
           "pants",
           "socks",
           "boots_combat",
-          "flashlight",
           "longshirt",
           "jacket_light",
           "baton",
@@ -778,6 +785,7 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "group": "charged_flashlight" },
           { "item": "m9", "ammo-item": "9mm", "charges": 15, "container-item": "holster" },
           { "item": "9mm", "charges": 35 }
         ]
@@ -847,7 +855,6 @@
     "items": {
       "both": {
         "items": [
-          "flashlight",
           "pants_cargo",
           "boots",
           "hat_boonie",
@@ -862,6 +869,7 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
+          { "group": "charged_flashlight" },
           { "item": "lighter", "charges": 100 },
           { "item": "knife_rambo", "container-item": "scabbard" }
         ]
@@ -3101,7 +3109,6 @@
           "pants",
           "socks",
           "boots",
-          "flashlight",
           "longshirt",
           "jacket_light",
           "baton",
@@ -3110,7 +3117,10 @@
           "pockknife",
           "wristwatch"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [
+          { "group": "charged_cell_phone" },
+          { "group": "charged_flashlight" }
+        ]
       },
       "male": [ "boxer_shorts" ],
       "female": [ "bra", "boy_shorts" ]
@@ -3386,12 +3396,14 @@
           "water_clean",
           "scissors",
           "magnifying_glass",
-          "flashlight",
           "1st_aid",
           "wristwatch",
           "whistle"
         ],
-        "entries": [ { "group": "charged_cell_phone" } ]
+        "entries": [
+          { "group": "charged_cell_phone" },
+          { "group": "charged_flashlight" }
+        ]
       },
       "male": [ "briefs" ],
       "female": [ "boy_shorts" ]