From c16c2b4438d94bf4938515dfef9f654eeb59d796 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 12:46:19 -0700 Subject: [PATCH 01/11] Start obsoleting microreactor CBMs --- data/json/obsolete.json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/data/json/obsolete.json b/data/json/obsolete.json index 361759027fc50..8f9e4a1aa27ab 100644 --- a/data/json/obsolete.json +++ b/data/json/obsolete.json @@ -1,4 +1,42 @@ [ + { + "id": "bio_advreactor", + "type": "bionic", + "name": "Advanced Microreactor System", + "description": "This stripped down mini-reactor is more efficient and safer than the base model due to integrated radiation cleansers. There is no way to shut it down once active, but you can toggle additional fuel intake.", + "occupied_bodyparts": [ [ "TORSO", 55 ] ], + "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], + "included_bionics": [ "bio_plutdump" ], + "upgraded_bionic": "bio_reactor" + }, + { + "id": "bio_plut_filter", + "type": "bionic", + "name": "Plutonium Filter", + "description": "This set of tanks and filters allows you to extract plutonium from radioactive slurry.", + "occupied_bodyparts": [ [ "TORSO", 10 ] ], + "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], + "act_cost": 1, + "react_cost": 1, + "time": 12 + }, + { + "id": "bio_plutdump", + "type": "bionic", + "name": "Plutonium Purger", + "included": true, + "description": "Triggers an emergency reactor fuel purge that ejects all fuel from your reactor.", + "act_cost": 1 + }, + { + "id": "bio_reactor", + "type": "bionic", + "name": "Microreactor System", + "description": "This stripped down mini-reactor generates impressive amounts of bionic power. There is no way to shut it down, but you can toggle additional fuel intake. Irradiates your body when active.", + "occupied_bodyparts": [ [ "TORSO", 55 ] ], + "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], + "included_bionics": [ "bio_plutdump" ] + }, { "id": "bio_furnace", "type": "bionic", From 50b9748e20ed9a4866a648f9cec05440ef143cb3 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 12:48:44 -0700 Subject: [PATCH 02/11] Remove CBMs from original file --- data/json/bionics.json | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index 52cbcbbaa5142..557158893bc8e 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -18,16 +18,6 @@ "react_cost": 10, "time": 1 }, - { - "id": "bio_advreactor", - "type": "bionic", - "name": "Advanced Microreactor System", - "description": "This stripped down mini-reactor is more efficient and safer than the base model due to integrated radiation cleansers. There is no way to shut it down once active, but you can toggle additional fuel intake.", - "occupied_bodyparts": [ [ "TORSO", 55 ] ], - "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], - "included_bionics": [ "bio_plutdump" ], - "upgraded_bionic": "bio_reactor" - }, { "id": "bio_alarm", "type": "bionic", @@ -693,25 +683,6 @@ "occupied_bodyparts": [ [ "HEAD", 2 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ] }, - { - "id": "bio_plut_filter", - "type": "bionic", - "name": "Plutonium Filter", - "description": "This set of tanks and filters allows you to extract plutonium from radioactive slurry.", - "occupied_bodyparts": [ [ "TORSO", 10 ] ], - "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], - "act_cost": 1, - "react_cost": 1, - "time": 12 - }, - { - "id": "bio_plutdump", - "type": "bionic", - "name": "Plutonium Purger", - "included": true, - "description": "Triggers an emergency reactor fuel purge that ejects all fuel from your reactor.", - "act_cost": 1 - }, { "id": "bio_pokedeye", "type": "bionic", @@ -814,15 +785,6 @@ "fake_item": "fake_razor", "flags": [ "BIONIC_NPC_USABLE" ] }, - { - "id": "bio_reactor", - "type": "bionic", - "name": "Microreactor System", - "description": "This stripped down mini-reactor generates impressive amounts of bionic power. There is no way to shut it down, but you can toggle additional fuel intake. Irradiates your body when active.", - "occupied_bodyparts": [ [ "TORSO", 55 ] ], - "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], - "included_bionics": [ "bio_plutdump" ] - }, { "id": "bio_recycler", "type": "bionic", From dd33732ffe43135658e109690050a64cdedc77f8 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:00:11 -0700 Subject: [PATCH 03/11] Obsolete the reactor CBM uncraft recipes. --- data/json/recipes/recipe_obsolete.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 50085267eba88..e480cd808c062 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -1810,5 +1810,25 @@ "type": "recipe", "result": "years_old_newspaperuncraft", "obsolete": true + }, + { + "type": "recipe", + "result": "bio_reactoruncraft", + "obsolete": true + }, + { + "type": "recipe", + "result": "bio_plut_filteruncraft", + "obsolete": true + }, + { + "type": "recipe", + "result": "bio_reactor_upgradeuncraft", + "obsolete": true + }, + { + "type": "recipe", + "result": "bio_advreactoruncraft", + "obsolete": true } ] From 3a1ba43e087eaa603e4c688e18eb82de1fccfc59 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:00:30 -0700 Subject: [PATCH 04/11] Obsolete the reactor CBM uncraft recipes. --- data/json/uncraft/cbm/cbm.json | 42 ---------------------------------- 1 file changed, 42 deletions(-) diff --git a/data/json/uncraft/cbm/cbm.json b/data/json/uncraft/cbm/cbm.json index 09b0a4058ddb4..a3afdf0fbcf28 100644 --- a/data/json/uncraft/cbm/cbm.json +++ b/data/json/uncraft/cbm/cbm.json @@ -45,48 +45,6 @@ "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "power_supply", 2 ] ], [ [ "amplifier", 2 ] ], [ [ "burnt_out_bionic", 1 ] ] ] }, - { - "type": "uncraft", - "result": "bio_reactor", - "skill_used": "electronics", - "difficulty": 10, - "time": "500 s", - "using": [ [ "soldering_standard", 120 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "minireactor", 1 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ] - }, - { - "type": "uncraft", - "result": "bio_plut_filter", - "skill_used": "electronics", - "difficulty": 10, - "time": "500 s", - "using": [ [ "soldering_standard", 80 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "laptop", -1 ], [ "control_laptop", -1 ] ] ], - "components": [ [ [ "bio_blood_filter", 1 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "burnt_out_bionic", 1 ] ], [ [ "RAM", 1 ] ] ] - }, - { - "type": "uncraft", - "result": "bio_reactor_upgrade", - "skill_used": "electronics", - "difficulty": 10, - "time": "500 s", - "using": [ [ "soldering_standard", 120 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "laptop", -1 ], [ "control_laptop", -1 ] ] ], - "components": [ [ [ "bio_radscrubber", 1 ] ], [ [ "bio_geiger", 1 ] ], [ [ "RAM", 1 ] ] ] - }, - { - "type": "uncraft", - "result": "bio_advreactor", - "skill_used": "electronics", - "difficulty": 10, - "time": "50 s", - "using": [ [ "soldering_standard", 10 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "bio_reactor", 1 ] ], [ [ "bio_reactor_upgrade", 1 ] ] ] - }, { "type": "uncraft", "result": "bio_ups", From 71791fda40b98b98e74e2e1149325c4bf11abbd1 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:03:54 -0700 Subject: [PATCH 05/11] Move microreactor CBM items to obsolete file --- data/json/items/obsolete.json | 42 ++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 8832ba2414e19..b0dd36f544696 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -391,5 +391,45 @@ "durability": 6, "relative": { "reload": 2 }, "magazines": [ [ "flammable", [ "aux_pressurized_tank", "pressurized_tank" ] ] ] - } + }, + { + "id": "bio_advreactor", + "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": "Advanced Microreactor CBM", + "description": "This module upgrades a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.", + "price": 900000, + "difficulty": 13 + }, + { + "id": "bio_plut_filter", + "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": "Plutonium Filter CBM", + "description": "A system of tanks and filters that are connected to a microreactor to extract plutonium from radioactive slurry.", + "price": 60000, + "weight": 1000, + "difficulty": 6 + }, + { + "id": "bio_reactor", + "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": "Internal Microreactor CBM", + "description": "This stripped down mini-reactor will generate impressive amounts of bionic power, but may not be the safest thing to install. Once active, it cannot be shut down and will slowly contaminate the user's body with radiation.", + "price": 900000, + "difficulty": 11 + }, + { + "id": "bio_reactor_upgrade", + "bionic_id": "bio_advreactor", + "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": "Microreactor Upgrade CBM", + "description": "A kit for upgrading a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.", + "price": 250000, + "difficulty": 11, + "is_upgrade": true + }, + ] From cbb4e2efeae664bb858b8bb7ef1b35cae3f110f8 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:04:28 -0700 Subject: [PATCH 06/11] Move microreactor CBM items to obsolete file --- data/json/items/bionics.json | 39 ------------------------------------ 1 file changed, 39 deletions(-) diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 50e1d49da71a4..1b25f3b58bff7 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -50,15 +50,6 @@ "weight": 1000, "difficulty": 7 }, - { - "id": "bio_advreactor", - "copy-from": "bionic_general_npc_usable", - "type": "BIONIC_ITEM", - "name": "Advanced Microreactor CBM", - "description": "This module upgrades a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.", - "price": 900000, - "difficulty": 13 - }, { "id": "bio_alarm", "copy-from": "bionic_general", @@ -594,16 +585,6 @@ "weight": 300, "difficulty": 4 }, - { - "id": "bio_plut_filter", - "copy-from": "bionic_general_npc_usable", - "type": "BIONIC_ITEM", - "name": "Plutonium Filter CBM", - "description": "A system of tanks and filters that are connected to a microreactor to extract plutonium from radioactive slurry.", - "price": 60000, - "weight": 1000, - "difficulty": 6 - }, { "id": "bio_power_armor_interface", "copy-from": "bionic_general", @@ -694,26 +675,6 @@ "weight": 5, "difficulty": 4 }, - { - "id": "bio_reactor", - "copy-from": "bionic_general_npc_usable", - "type": "BIONIC_ITEM", - "name": "Internal Microreactor CBM", - "description": "This stripped down mini-reactor will generate impressive amounts of bionic power, but may not be the safest thing to install. Once active, it cannot be shut down and will slowly contaminate the user's body with radiation.", - "price": 900000, - "difficulty": 11 - }, - { - "id": "bio_reactor_upgrade", - "bionic_id": "bio_advreactor", - "copy-from": "bionic_general_npc_usable", - "type": "BIONIC_ITEM", - "name": "Microreactor Upgrade CBM", - "description": "A kit for upgrading a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.", - "price": 250000, - "difficulty": 11, - "is_upgrade": true - }, { "id": "bio_recycler", "copy-from": "bionic_general_npc_usable", From 2929824ea1b1143eff5cfa60cf84f38481f5d062 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:10:38 -0700 Subject: [PATCH 07/11] Remove mention of microreactor CBM --- data/json/npcs/TALK_ALLY_TUTORIAL.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/TALK_ALLY_TUTORIAL.json b/data/json/npcs/TALK_ALLY_TUTORIAL.json index 29eec35df2974..eea9b89e43350 100644 --- a/data/json/npcs/TALK_ALLY_TUTORIAL.json +++ b/data/json/npcs/TALK_ALLY_TUTORIAL.json @@ -111,7 +111,7 @@ { "id": "TALK_ALLY_TUTORIAL_CBMS", "type": "talk_topic", - "dynamic_line": "Bionics are augmentation packages, right? They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n Find a programmable surgical installer or autodoc, position me on the couch, and activate it, and you can install a suitable CBM to me - or if I think I'll do a better job, I'll do. I'll take over installing CBMs into you if I'm better at it.\n I can use almost all passive bionics and some active bionics. If I have any active bionics, I'll try to use them sensibly, but if we're in danger, I'm going to activate anything that might give me an edge. I'll use any weapon bionics if they're better than the weapons you gave me, but if you think I should reserve my bionic energy for my defensive and healing bionics, you can tell me how much to reserve. I'll try to keep my bionic energy topped off, but if we're running low on supplies, you can tell me to stop recharging when I'm not full.\n I'll tell you if I'm low on bionic energy and can't recharge, and what fuel I need.\n Sothere are some internal atomic reactor bionics - I can use those, but I can only recharge them with plutonium slurry. That stuff is radioactive, so do us both a favor and don't give me an internal reactor unless you really like glowing in the dark.", + "dynamic_line": "Bionics are augmentation packages, right? They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n Find a programmable surgical installer or autodoc, position me on the couch, and activate it, and you can install a suitable CBM to me - or if I think I'll do a better job, I'll do. I'll take over installing CBMs into you if I'm better at it.\n I can use almost all passive bionics and some active bionics. If I have any active bionics, I'll try to use them sensibly, but if we're in danger, I'm going to activate anything that might give me an edge. I'll use any weapon bionics if they're better than the weapons you gave me, but if you think I should reserve my bionic energy for my defensive and healing bionics, you can tell me how much to reserve. I'll try to keep my bionic energy topped off, but if we're running low on supplies, you can tell me to stop recharging when I'm not full.\n I'll tell you if I'm low on bionic energy and can't recharge, and what fuel I need.", "responses": [ { "text": "Tell me how I give you fuel for your bionics.", "topic": "TALK_ALLY_TUTORIAL_MULE" } ] }, { From 289db64e6bd0bf040c198c7bbe595b550abdf8b2 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:16:42 -0700 Subject: [PATCH 08/11] Obsolete plutonium slurry recipes too --- data/json/recipes/recipe_obsolete.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index e480cd808c062..1ff9a360b9277 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -1830,5 +1830,15 @@ "type": "recipe", "result": "bio_advreactoruncraft", "obsolete": true + }, + { + "type": "recipe", + "result": "plut_slurry_dense", + "obsolete": true + }, + { + "type": "recipe", + "result": "plut_slurry", + "obsolete": true } ] From 683c004b8bbcb18a4b51ed1793f8809a30e6278a Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 21 Aug 2019 13:16:59 -0700 Subject: [PATCH 09/11] Obsolete plutonium slurry recipes too --- data/json/recipes/recipe_ammo.json | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index f9c620cd85e7f..adf4928a41496 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -20,32 +20,6 @@ [ [ "chem_rocket_fuel", 1750 ] ] ] }, - { - "type": "recipe", - "result": "plut_slurry_dense", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_OTHER", - "skill_used": "fabrication", - "skills_required": [ "electronics", 7 ], - "difficulty": 8, - "time": "95 m", - "book_learn": [ [ "recipe_lab_elec", 10 ] ], - "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ], - "components": [ [ [ "plut_cell", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] - }, - { - "type": "recipe", - "result": "plut_slurry", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_OTHER", - "skill_used": "fabrication", - "skills_required": [ "electronics", 7 ], - "difficulty": 8, - "time": "95 m", - "book_learn": [ [ "recipe_lab_elec", 10 ] ], - "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ], - "components": [ [ [ "plut_slurry_dense", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ] - }, { "type": "recipe", "result": "pebble", From acc8d421d01d300325148572766a97e752d676fb Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Thu, 22 Aug 2019 00:16:01 +0300 Subject: [PATCH 10/11] Apply suggestions from code review --- data/json/items/obsolete.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index b0dd36f544696..fb84142b3cfa6 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -430,6 +430,6 @@ "price": 250000, "difficulty": 11, "is_upgrade": true - }, + } ] From 870f28c936ab3bb00fb5c0fe39465104ae28ed57 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Thu, 22 Aug 2019 05:15:47 +0000 Subject: [PATCH 11/11] Update obsolete.json --- data/json/items/obsolete.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index fb84142b3cfa6..189ff12890ff6 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -431,5 +431,4 @@ "difficulty": 11, "is_upgrade": true } - ]