From 494617328172830648f68227ccb9e1737f4d3bb0 Mon Sep 17 00:00:00 2001 From: 1n17 <59138068+1n17@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:30:41 +0100 Subject: [PATCH 1/5] Update recipe_electronics.json --- data/json/recipes/recipe_electronics.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 938417cc885e3..edc92e413b27e 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -1035,6 +1035,7 @@ "components": [ [ [ "frame", 1 ] ], [ [ "chemistry_set", 1 ] ], + [ [ "electrolysis_kit", 1 ] ], [ [ "water_faucet", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "cable", 5 ] ] From 5619b172826fb605c91651539a591f204d8e047b Mon Sep 17 00:00:00 2001 From: 1n17 <59138068+1n17@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:34:43 +0100 Subject: [PATCH 2/5] Update vehicle_parts.json --- data/json/vehicleparts/vehicle_parts.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 0f254e78fbc28..68237b33ff771 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -2283,7 +2283,7 @@ "broken_symbol": "x", "broken_color": "light_gray", "damage_modifier": 10, - "description": "A small chemistry station, including a hotplate powered by the vehicle's batteries. 'e'xamine the tile with the chemistry lab to access the water faucet or to heat up food with the hotplate. If you attempt craft an item that needs one of the chemistry lab's functions, it will automatically be selected as a tool.", + "description": "A small chemistry station, including a hotplate and electrolysis setup powered by the vehicle's batteries. 'e'xamine the tile with the chemistry lab to access the water faucet or to heat up food with the hotplate. If you attempt craft an item that needs one of the chemistry lab's functions, it will automatically be selected as a tool.", "durability": 80, "size": 200, "item": "chemlab", @@ -2298,6 +2298,7 @@ { "item": "steel_lump", "count": [ 4, 7 ] }, { "item": "steel_chunk", "count": [ 4, 7 ] }, { "item": "scrap", "count": [ 4, 7 ] }, + { "item": "cable", "charges": [ 30, 50 ] }, { "item": "chemistry_set", "charges": 0, "prob": 50 }, { "item": "hotplate", "charges": 0, "prob": 50 } ], From c9182b8f135fb62e70c50e1d05b9ca7394698674 Mon Sep 17 00:00:00 2001 From: 1n17 <59138068+1n17@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:37:22 +0100 Subject: [PATCH 3/5] Update inventory.cpp --- src/inventory.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/inventory.cpp b/src/inventory.cpp index b31fef831305f..902e18f9764df 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -596,6 +596,11 @@ void inventory::form_from_map( map &m, std::vector pts, const Characte chemistry_set.charges = veh->fuel_left( "battery", true ); chemistry_set.item_tags.insert( "PSEUDO" ); add_item( chemistry_set ); + + item electrolysis_kit( "electrolysis_kit", 0 ); + electrolysis_kit.charges = veh->fuel_left( "battery", true ); + electrolysis_kit.item_tags.insert( "PSEUDO" ); + add_item( electrolysis_kit ); } } pts.clear(); From c39a23b96bd2134cfe34903ad3136adf56de3355 Mon Sep 17 00:00:00 2001 From: 1n17 <59138068+1n17@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:39:09 +0100 Subject: [PATCH 4/5] Update map.cpp --- src/map.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/map.cpp b/src/map.cpp index ce14c70389466..a3e9d738ba389 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -4852,6 +4852,8 @@ std::list map::use_charges( const tripoint &origin, const int range, ftype = "battery"; } else if( type == "hotplate" ) { ftype = "battery"; + } else if( type == "electrolysis_kit" ) { + ftype = "battery"; } // TODO: add a sane birthday arg From 39f463f101727a41e8ab09eb327b70a0915c886e Mon Sep 17 00:00:00 2001 From: 1n17 <59138068+1n17@users.noreply.github.com> Date: Thu, 9 Jan 2020 15:44:52 +0100 Subject: [PATCH 5/5] Update inventory.cpp --- src/inventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inventory.cpp b/src/inventory.cpp index 902e18f9764df..33a367dd5e759 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -596,7 +596,7 @@ void inventory::form_from_map( map &m, std::vector pts, const Characte chemistry_set.charges = veh->fuel_left( "battery", true ); chemistry_set.item_tags.insert( "PSEUDO" ); add_item( chemistry_set ); - + item electrolysis_kit( "electrolysis_kit", 0 ); electrolysis_kit.charges = veh->fuel_left( "battery", true ); electrolysis_kit.item_tags.insert( "PSEUDO" );