Merge pull request #33831 from Noctifer-de-Mortem/changes_prof_scen

Minor changes to bionic professions and scenarios based on recent changes

data/json/professions.json

@@ -1585,13 +1585,13 @@
     "name": "Industrial Cyborg",
     "description": "For better or for worse, bionic augmentation has turned you into a walking power tool.  Upgraded with a standard industrial-grade manual labor surgery and training package, you are augmented with bionic muscles and an integrated toolset, both powered by standard batteries.",
     "points": 6,
-    "skills": [ { "level": 3, "name": "fabrication" }, { "level": 3, "name": "mechanics" } ],
+    "skills": [ { "level": 4, "name": "fabrication" }, { "level": 2, "name": "mechanics" } ],
     "CBMs": [
       "bio_tools",
       "bio_sunglasses",
       "bio_flashlight",
       "bio_hydraulics",
-      "bio_batteries",
+      "bio_cable",
       "bio_power_storage_mkII",
       "bio_power_storage_mkII"
     ],
@@ -1895,7 +1895,6 @@
     "CBMs": [
       "bio_cqb",
       "bio_blade",
-      "bio_shotgun",
       "bio_shock",
       "bio_carbon",
       "bio_adrenaline",
@@ -1911,6 +1910,44 @@
       "female": [ "bra", "panties", "stockings", "skirt" ]
     }
   },
+  {
+    "type": "profession",
+    "ident": "bio_gangster",
+    "name": "Bionic Gangster",
+    "description": "You were the boss' favorite, their protege; they always counted on you to get the toughest jobs done. Seeing your potential, they invested in \"basic\" augments and the best gear on the market to better aid you in your job. After enjoying some period of freedom to do as you wanted, now you find yourself needing those skills to survive. ",
+    "points": 8,
+    "CBMs": [
+      "bio_targeting",
+      "bio_shotgun",
+      "bio_carbon",
+      "bio_adrenaline",
+      "bio_night_vision",
+      "bio_face_mask",
+      "bio_metabolics",
+      "bio_power_storage_mkII"
+    ],
+    "skills": [
+      { "level": 1, "name": "melee" },
+      { "level": 1, "name": "unarmed" },
+      { "level": 1, "name": "stabbing" },
+      { "level": 1, "name": "gun" },
+      { "level": 1, "name": "pistol" },
+      { "level": 1, "name": "shotgun" },
+      { "level": 1, "name": "driving" }
+    ],
+    "items": {
+      "both": {
+        "items": [ "suit", "bowhat", "socks", "dress_shoes", "knit_scarf", "cig", "switchblade", "mag_porn", "sunglasses", "shot_00" ],
+        "entries": [
+          { "item": "glock_19", "ammo-item": "9mm", "container-item": "sholster", "charges": 15 },
+          { "item": "glockmag", "ammo-item": "9mm", "charges": 15 },
+          { "item": "ref_lighter", "charges": 100 }
+        ]
+      },
+      "male": [ "boxer_shorts" ],
+      "female": [ "bra", "panties" ]
+    }
+  },
   {
     "type": "profession",
     "ident": "faulty_bionic",
@@ -1940,7 +1977,7 @@
     "ident": "bionic_customer",
     "name": "Commercial Cyborg",
     "description": "You always had to have the latest and best gadgets and gizmos, so is it any wonder that you upgraded your flesh along with your smart phone?  Only time will tell if your passion for electronics and your status as a marvel of bionic technology will be enough to ensure your survival after the apocalypse.",
-    "points": 8,
+    "points": 6,
     "CBMs": [ "bio_flashlight", "bio_tools", "bio_ups", "bio_watch", "bio_batteries", "bio_power_storage_mkII" ],
     "skills": [ { "level": 4, "name": "electronics" }, { "level": 2, "name": "fabrication" } ],
     "items": {

data/mods/more_classes_scenarios/cs_classes.json

@@ -305,43 +305,6 @@
       "female": [ "panties" ]
     }
   },
-  {
-    "type": "profession",
-    "ident": "bio_gangster",
-    "name": "Bionic Gangster",
-    "description": "You were the boss' favorite, their protege; they always counted on you to get the toughest jobs done. Seeing your potential, they invested in \"basic\" augments and the best gear on the market to better aid you in your job. After enjoying some period of freedom to do as you wanted, now you find yourself needing those skills to survive. ",
-    "points": 8,
-    "CBMs": [
-      "bio_targeting",
-      "bio_shock",
-      "bio_carbon",
-      "bio_adrenaline",
-      "bio_night_vision",
-      "bio_face_mask",
-      "bio_metabolics",
-      "bio_power_storage_mkII"
-    ],
-    "skills": [
-      { "level": 1, "name": "melee" },
-      { "level": 1, "name": "unarmed" },
-      { "level": 1, "name": "stabbing" },
-      { "level": 1, "name": "gun" },
-      { "level": 1, "name": "pistol" },
-      { "level": 1, "name": "driving" }
-    ],
-    "items": {
-      "both": {
-        "items": [ "suit", "bowhat", "socks", "dress_shoes", "knit_scarf", "cig", "switchblade", "mag_porn", "sunglasses" ],
-        "entries": [
-          { "item": "glock_19", "ammo-item": "9mm", "container-item": "sholster", "charges": 15 },
-          { "item": "glockmag", "ammo-item": "9mm", "charges": 15 },
-          { "item": "ref_lighter", "charges": 100 }
-        ]
-      },
-      "male": [ "boxer_shorts" ],
-      "female": [ "bra", "panties" ]
-    }
-  },
   {
     "type": "profession",
     "ident": "waken",

data/mods/more_classes_scenarios/cs_scenarios.json

@@ -1,27 +1,4 @@
 [
-  {
-    "type": "scenario",
-    "name": "Bunker Evacuee",
-    "description": "You had connections, or intel somehow...and because of it, you found this LMOE Shelter. It's summer now, and you somehow survived.  Now things get a little bit easier.",
-    "flags": [ "SUR_START", "SUM_START" ],
-    "ident": "bunker",
-    "points": 2,
-    "start_name": "LMOE Shelter",
-    "allowed_locs": [ "lmoe" ],
-    "professions": [
-      "senior",
-      "hacker",
-      "lawyer",
-      "labtech",
-      "bionic_spy",
-      "soldier",
-      "national_guard",
-      "specops",
-      "bio_soldier",
-      "bio_sniper",
-      "bio_specops"
-    ]
-  },
   {
     "type": "scenario",
     "ident": "fema_help",
@@ -56,17 +33,6 @@
     "start_name": "Mansion",
     "flags": [ "SUR_START" ]
   },
-  {
-    "type": "scenario",
-    "ident": "last_crime",
-    "name": "The Last Gig",
-    "points": -6,
-    "description": "You were on your way to another routine job.  It might have been a target to kill, an item to steal or intel to gather.  Whatever it was doesn't matter anymore; you did your best to avoid the horde and when you arrived, the place was surrounded.  Not by cops, as you might have expected, but by the dead. Worse, you got a cut somewhere along the way and it's looking infected.",
-    "allowed_locs": [ "house", "bank", "pawn", "s_gun", "s_gas_s" ],
-    "professions": [ "convict", "scoundrel", "gangster", "burglar", "bionic_thief", "razorgirl", "bionic_hitman", "bio_gangster" ],
-    "start_name": "Intended Crime Scene",
-    "flags": [ "SUR_START", "INFECTED" ]
-  },
   {
     "type": "scenario",
     "ident": "summer_advanced_start",
@@ -84,24 +50,24 @@
     "ident": "cyberpunk",
     "copy-from": "cyberpunk",
     "add_professions": true,
-    "extend": { "professions": [ "bio_gangster", "wasteland_cyborg" ] }
+    "extend": { "professions": [ "bio_gangster", "bionic_hitman" ] }
+  },
+  {
+    "type": "scenario",
+    "ident": "missed",
+    "copy-from": "missed",
+    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s", "bank", "pawn", "s_gun", "s_gas_s" ] }
   },
   {
     "type": "scenario",
     "ident": "infected",
     "copy-from": "infected",
-    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s" ] }
+    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s", "bank", "pawn", "s_gun", "s_gas_s" ] }
   },
   {
     "type": "scenario",
     "ident": "fire",
     "copy-from": "fire",
-    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s" ] }
-  },
-  {
-    "type": "scenario",
-    "ident": "evacuee",
-    "copy-from": "evacuee",
-    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s" ] }
+    "extend": { "allowed_locs": [ "s_electronics_s", "s_clothes_s", "bank", "pawn", "s_gun", "s_gas_s" ] }
   }
 ]