Move aftershock cbms to base game

data/json/bionics.json

@@ -1202,5 +1202,55 @@
     "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
     "occupied_bodyparts": [ [ "head", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ]
+  },
+  {
+    "id": "bn_bio_solar",
+    "type": "bionic",
+    "name": { "str": "Solar Panels" },
+    "description": "Installed on your back is a set of retractable, reinforced solar panels resembling angular butterfly wings.  When in direct sunlight, they will automatically deploy and slowly recharge your power level.",
+    "occupied_bodyparts": [ [ "torso", 10 ] ],
+    "fuel_options": [ "sunlight" ],
+    "fuel_efficiency": 1.0,
+    "time": 1,
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
+  },
+  {
+    "id": "afs_bio_missiles",
+    "type": "bionic",
+    "//": "Watch those wrist rockets!",
+    "name": { "str": "Deployable Grenade Launcher" },
+    "description": "Your right hand can fold inward to reveal a mechanism capable of igniting and firing 40mm grenades across medium distances with great accuracy due built in ballistic calculator.",
+    "occupied_bodyparts": [ [ "hand_r", 3 ] ],
+    "fake_item": "afs_bionic_rocket",
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "NO_UNWIELD" ],
+    "act_cost": 5
+  },
+  {
+    "id": "afs_bio_linguistic_coprocessor",
+    "type": "bionic",
+    "name": { "str": "Linguistic Coprocessor" },
+    "description": "The left hemisphere of your brain has been augmented with a microcomputer that moderately increases the speed that language and written words are processed, granting a 25% increase to reading speed.",
+    "occupied_bodyparts": [ [ "head", 2 ] ]
+  },
+  {
+    "id": "afs_bio_dopamine_stimulators",
+    "type": "bionic",
+    "name": { "str": "Dopamine Stimulators" },
+    "description": "Tiny cybernetic stimulators have been installed throughout your ventral tegmental area, and trigger at set intervals using bionic power.  This slowly releases a stream of reward chemicals and hormones into your brain, inducing a state of euphoria that notably elevates mood.",
+    "occupied_bodyparts": [ [ "head", 5 ] ],
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
+    "act_cost": 5,
+    "react_cost": 5,
+    "time": 200
+  },
+  {
+    "id": "bio_blaster",
+    "type": "bionic",
+    "name": { "str": "Fusion Blaster Arm" },
+    "description": "Heavy-duty fusion blaster was integrated ino your left arm!  You may use your energy banks to fire a damaging heat ray.",
+    "occupied_bodyparts": [ [ "arm_l", 20 ], [ "hand_l", 5 ] ],
+    "act_cost": 50,
+    "fake_item": "bio_blaster_gun",
+    "flags": [ "BIONIC_GUN" ]
   }
 ]

data/json/itemgroups/bionics.json

@@ -90,7 +90,12 @@
       [ "bio_jointservo", 10 ],
       [ "bio_shotgun", 10 ],
       [ "bio_taste_blocker", 10 ],
-      [ "bio_soporific", 10 ]
+      [ "bio_soporific", 10 ],
+      [ "bn_bio_solar", 10 ],
+      [ "afs_bio_missiles", 10 ],
+      [ "afs_bio_linguistic_coprocessor", 10 ],
+      [ "afs_bio_dopamine_stimulators", 10 ],
+      [ "bio_blaster", 5 ]
     ]
   },
   {
@@ -110,7 +115,9 @@
       [ "bio_ethanol", 10 ],
       [ "bio_watch", 10 ],
       [ "bio_torsionratchet", 10 ],
-      [ "bio_cable", 10 ]
+      [ "bio_cable", 10 ],
+      [ "bn_bio_solar", 10 ],
+      [ "afs_bio_linguistic_coprocessor", 10 ]
     ]
   },
   {
@@ -176,7 +183,9 @@
       [ "bio_cable", 10 ],
       [ "bio_weight", 10 ],
       [ "bio_jointservo", 10 ],
-      [ "bio_shotgun", 10 ]
+      [ "bio_shotgun", 10 ],
+      [ "bio_blaster", 5 ],
+      [ "afs_bio_dopamine_stimulators", 10 ]
     ]
   },
   {
@@ -240,7 +249,10 @@
       [ "bio_meteorologist", 10 ],
       [ "bio_cable", 10 ],
       [ "bio_jointservo", 20 ],
-      [ "bio_shotgun", 10 ]
+      [ "bio_shotgun", 10 ],
+      [ "bn_bio_solar", 15 ],
+      [ "afs_bio_missiles", 10 ],
+      [ "afs_bio_dopamine_stimulators", 10 ]
     ]
   },
   {
@@ -261,7 +273,9 @@
       [ "bio_railgun", 10 ],
       [ "bio_shotgun", 10 ],
       [ "bio_shock", 10 ],
-      [ "bio_targeting", 10 ]
+      [ "bio_targeting", 10 ],
+      [ "bio_blaster", 10 ],
+      [ "afs_bio_missiles", 10 ]
     ]
   },
   {
@@ -282,7 +296,8 @@
       [ "bio_nanobots", 10 ],
       [ "bio_ods", 10 ],
       [ "bio_shock_absorber", 10 ],
-      [ "bio_uncanny_dodge", 10 ]
+      [ "bio_uncanny_dodge", 10 ],
+      [ "afs_bio_dopamine_stimulators", 10 ]
     ]
   },
   {
@@ -341,7 +356,9 @@
       [ "bio_chain_lightning", 15 ],
       [ "bio_adrenaline", 20 ],
       [ "bio_ods", 10 ],
-      [ "bio_weight", 15 ]
+      [ "bio_weight", 15 ],
+      [ "afs_bio_missiles", 10 ],
+      [ "afs_bio_dopamine_stimulators", 15 ]
     ]
   },
   {
@@ -399,7 +416,9 @@
       [ "bio_painkiller", 10 ],
       [ "bio_time_freeze", 4 ],
       [ "bio_teleport", 4 ],
-      [ "bio_probability_travel", 4 ]
+      [ "bio_probability_travel", 4 ],
+      [ "afs_bio_linguistic_coprocessor", 10 ],
+      [ "afs_bio_dopamine_stimulators", 10 ]
     ]
   },
   {

data/json/items/bionics.json

@@ -1219,5 +1219,52 @@
     "description": "Part of the autodoc's 'Cyborg Identity Package', this bionic gives the user a creepy robot voice.",
     "weight": "100 g",
     "difficulty": 5
+  },
+  {
+    "id": "bn_bio_solar",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Solar Panels CBM" },
+    "description": "Installed on your back is a set of retractable solar panels.  When in direct sunlight, they will automatically deploy and slowly recharge your power level.",
+    "price": 350000,
+    "difficulty": 4
+  },
+  {
+    "id": "afs_bio_missiles",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Deployable Grenade Launcher CBM" },
+    "description": "Your right hand can fold inward to reveal a mechanism capable of igniting and firing 40mm grenades across medium distances with great accuracy due built in ballistic calculator.",
+    "price": 100000,
+    "difficulty": 5
+  },
+  {
+    "id": "afs_bio_linguistic_coprocessor",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Linguistic Coprocessor CBM" },
+    "description": "A microcomputer installed into the left hemisphere of your brain to increase the speed that it processes language.  When installed, it provides a passive boost to reading speed.",
+    "price": 100000,
+    "price_postapoc": 50000,
+    "difficulty": 5
+  },
+  {
+    "id": "afs_bio_dopamine_stimulators",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Dopamine Stimulators CBM" },
+    "description": "A set of tiny bionic nerve stimulators that install into the reward center of your brain.  When run with bionic power, it periodically releases a hit of dopamine and other reward chemicals, inducing a state of euphoria and suppressing fear.",
+    "price": 1000000,
+    "price_postapoc": 100000,
+    "difficulty": 8
+  },
+  {
+    "id": "bio_blaster",
+    "copy-from": "bionic_general",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Fusion Blaster Arm CBM" },
+    "description": "Heavy-duty fusion blaster was integrated into your left arm!  You may use your energy banks to fire a damaging heat ray.",
+    "price": 220000,
+    "difficulty": 3
   }
 ]

data/json/items/gun/40x46mm.json

@@ -177,5 +177,26 @@
     "modes": [ [ "DEFAULT", "semi", 1, "NPC_AVOID" ] ],
     "clip_size": 6,
     "flags": [ "MOUNTED_GUN" ]
+  },
+  {
+    "id": "afs_bionic_rocket",
+    "type": "GUN",
+    "name": { "str": "deployed grenade launcher" },
+    "description": "A grenade launcher mounted onto your right-hand wrist.  It contains integrated ballistic calculator and quick load mechanism.  Adaptive caliber allow to load most types grenades.",
+    "volume": "2250 ml",
+    "price": 0,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "looks_like": "bio_int_enhancer",
+    "color": "magenta",
+    "skill": "launcher",
+    "ammo": [ "40x46mm", "40x53mm" ],
+    "dispersion": 80,
+    "durability": 6,
+    "clip_size": 3,
+    "reload": 150,
+    "flags": [ "NEVER_JAMS", "NO_UNWIELD", "TRADER_AVOID", "RELOAD_ONE" ]
   }
 ]

data/json/items/gun/bio.json

@@ -103,5 +103,27 @@
     "loudness": 5,
     "ammo_effects": [ "SHOT" ],
     "flags": [ "NEVER_JAMS", "TRADER_AVOID" ]
+  },
+  {
+    "id": "bio_blaster_gun",
+    "type": "GUN",
+    "name": { "str": "fusion blaster" },
+    "description": "this a pseudo item",
+    "volume": "3 L",
+    "price": 0,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "skill": "rifle",
+    "range": 30,
+    "ranged_damage": { "damage_type": "heat", "amount": 22, "armor_penetration": 30 },
+    "dispersion": 30,
+    "durability": 10,
+    "loudness": 12,
+    "modes": [ [ "DEFAULT", "single shot", 1 ], [ "burst", "triple shot", 3 ] ],
+    "reload": 500,
+    "built_in_mods": [ "bio_powershot" ],
+    "ammo_effects": [ "PLASMA" ],
+    "flags": [ "NEVER_JAMS", "TRADER_AVOID" ]
   }
 ]

data/json/items/gunmod/bionicmods.json

@@ -15,7 +15,7 @@
     "gun_data": {
       "skill": "rifle",
       "range": 30,
-      "ranged_damage": { "damage_type": "bullet", "amount": 1 },
+      "ranged_damage": { "damage_type": "heat", "amount": 22 },
       "ammo_effects": [ "PLASMA", "EXPLOSIVE", "FLAME" ],
       "durability": 10
     },

data/json/not_really_obsolete.json

@@ -7,16 +7,6 @@
     "occupied_bodyparts": [ [ "torso", 40 ] ],
     "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
   },
-  {
-    "id": "bio_blaster",
-    "type": "bionic",
-    "name": { "str": "Fusion Blaster Arm" },
-    "description": "Your left arm has been surgically replaced by a heavy-duty fusion blaster!  You may use your energy banks to fire a damaging heat ray.  However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand.",
-    "occupied_bodyparts": [ [ "arm_l", 20 ], [ "hand_l", 5 ] ],
-    "act_cost": 50,
-    "fake_item": "bio_blaster_gun",
-    "flags": [ "BIONIC_GUN" ]
-  },
   {
     "id": "fertilizer_bomb",
     "type": "TOOL",
@@ -134,28 +124,6 @@
       "removal": { "skills": [ [ "mechanics", 4 ] ] }
     }
   },
-  {
-    "id": "bio_blaster_gun",
-    "type": "GUN",
-    "name": { "str": "fusion blaster" },
-    "description": "this a pseudo item",
-    "volume": "3 L",
-    "price": 0,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "magenta",
-    "skill": "rifle",
-    "range": 30,
-    "ranged_damage": { "damage_type": "stab", "amount": 22, "armor_penetration": 15 },
-    "dispersion": 30,
-    "durability": 10,
-    "loudness": 12,
-    "modes": [ [ "DEFAULT", "single shot", 1 ], [ "burst", "triple shot", 3 ] ],
-    "reload": 500,
-    "built_in_mods": [ "bio_powershot" ],
-    "ammo_effects": [ "PLASMA" ],
-    "flags": [ "NEVER_JAMS", "TRADER_AVOID" ]
-  },
   {
     "id": "unbio_blaster_gun",
     "type": "GUN",

data/json/obsoletion/items.json

@@ -387,15 +387,6 @@
     "desc": [ "You took some magnesium supplements.  These will help with sleep deprivation." ],
     "rating": "good"
   },
-  {
-    "id": "bio_blaster",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": { "str": "Fusion Blaster Arm CBM" },
-    "description": "Your left arm has been replaced by a heavy-duty fusion blaster!  You may use your energy banks to fire a damaging heat ray.  However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand.",
-    "price": 220000,
-    "difficulty": 3
-  },
   {
     "id": "bio_furnace",
     "copy-from": "bionic_general",

data/mods/Aftershock/itemgroups/bionics_groups.json

@@ -2,41 +2,27 @@
   {
     "id": "bionics",
     "type": "item_group",
-    "items": [
-      [ "bn_bio_solar", 10 ],
-      [ "afs_bio_wind_turbine", 5 ],
-      [ "afs_bio_missiles", 10 ],
-      [ "afs_bio_linguistic_coprocessor", 10 ],
-      [ "afs_bio_dopamine_stimulators", 10 ],
-      [ "afs_bio_skullgun", 5 ],
-      [ "bio_blaster", 5 ]
-    ]
+    "items": [ [ "afs_bio_wind_turbine", 5 ], [ "afs_bio_skullgun", 5 ] ]
   },
   {
     "id": "bionics_common",
     "type": "item_group",
-    "items": [ [ "bn_bio_solar", 10 ], [ "afs_bio_wind_turbine", 5 ], [ "afs_bio_linguistic_coprocessor", 8 ] ]
+    "items": [ [ "afs_bio_wind_turbine", 5 ] ]
   },
   {
     "id": "bionics_mil",
     "type": "item_group",
-    "items": [ [ "bio_blaster", 5 ], [ "afs_bio_skullgun", 2 ] ]
+    "items": [ [ "afs_bio_skullgun", 2 ] ]
   },
   {
     "id": "bionics_sci",
     "type": "item_group",
-    "items": [ [ "bn_bio_solar", 5 ], [ "afs_bio_wind_turbine", 2 ] ]
+    "items": [ [ "afs_bio_wind_turbine", 2 ] ]
   },
   {
     "id": "bionics_op",
     "type": "item_group",
-    "items": [
-      [ "bn_bio_solar", 15 ],
-      [ "afs_bio_wind_turbine", 10 ],
-      [ "afs_bio_missiles", 10 ],
-      [ "afs_bio_dopamine_stimulators", 10 ],
-      [ "afs_bio_skullgun", 2 ]
-    ]
+    "items": [ [ "afs_bio_wind_turbine", 10 ], [ "afs_bio_skullgun", 2 ] ]
   },
   {
     "id": "afs_bionics_power",
@@ -47,10 +33,5 @@
     "id": "afs_bionic_toolkit",
     "type": "item_group",
     "items": [ [ "afs_complete_bionic_toolkit", 1 ], [ "bionic_maintenance_toolkit", 14 ] ]
-  },
-  {
-    "id": "bionics_subs",
-    "type": "item_group",
-    "items": [ [ "afs_bio_missiles", 10 ], [ "afs_bio_dopamine_stimulators", 15 ] ]
   }
 ]