diff --git a/data/json/bionics.json b/data/json/bionics.json index e2d7b05364e24..9651bcfe3eab3 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -438,14 +438,6 @@ "description": "You don't think that capacitor is *meant* to glow, but it does, and usually at bad times. A malfunctioning bionic randomly turns on and off, causing you to glow and making you visible in the dark without improving how much you can see in the slighest.", "flags": [ "BIONIC_FAULTY" ] }, - { - "id": "bio_furnace", - "type": "bionic", - "name": "Internal Furnace", - "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level. Some materials will burn better than others.", - "occupied_bodyparts": [ [ "TORSO", 40 ] ], - "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ] - }, { "id": "bio_geiger", "type": "bionic", diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 926c9b35d8bc5..a8d0f9bbd4eba 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -5311,7 +5311,6 @@ [ "bio_batteries", 10 ], [ "bio_metabolics", 10 ], [ "bio_ethanol", 10 ], - [ "bio_furnace", 10 ], [ "bio_torsionratchet", 10 ], [ "bio_tools", 10 ], [ "bio_ups", 10 ], @@ -5417,7 +5416,6 @@ [ "bio_batteries", 10 ], [ "bio_metabolics", 10 ], [ "bio_ethanol", 10 ], - [ "bio_furnace", 10 ], [ "bio_watch", 10 ], [ "bio_torsionratchet", 10 ], [ "bio_cable", 10 ] @@ -5727,7 +5725,6 @@ [ "bio_batteries", 10 ], [ "bio_metabolics", 10 ], [ "bio_ethanol", 10 ], - [ "bio_furnace", 10 ], [ "bio_ups", 10 ], [ "bio_torsionratchet", 10 ], [ "bio_ears", 10 ], @@ -5797,7 +5794,6 @@ [ "bio_power_storage_mkII", 10 ], [ "bio_batteries", 10 ], [ "bio_metabolics", 20 ], - [ "bio_furnace", 15 ], [ "bio_torsionratchet", 20 ], [ "bio_ups", 10 ], [ "bio_ears", 10 ], diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 4546ac1c46592..d828e643581e0 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -362,15 +362,6 @@ "price": 20000, "difficulty": 1 }, - { - "id": "bio_furnace", - "copy-from": "bionic_general", - "type": "BIONIC_ITEM", - "name": "Internal Furnace CBM", - "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level. Some materials will burn better than others.", - "price": 450000, - "difficulty": 4 - }, { "id": "bio_geiger", "copy-from": "bionic_general", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index d6e6d65642b72..1d69f183df027 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -338,5 +338,14 @@ "loudness_modifier": -1, "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ], [ "gun", 2 ] ], "flags": [ "NEVER_JAMS", "INSTALL_DIFFICULT", "IRREMOVABLE" ] + }, + { + "id": "bio_furnace", + "copy-from": "bionic_general", + "type": "BIONIC_ITEM", + "name": "Internal Furnace CBM", + "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level. Some materials will burn better than others.", + "price": 450000, + "difficulty": 4 } ] diff --git a/data/json/monsterdrops/zombie_lab.json b/data/json/monsterdrops/zombie_lab.json index 523ef26cea7ec..2b5cf77f446c9 100644 --- a/data/json/monsterdrops/zombie_lab.json +++ b/data/json/monsterdrops/zombie_lab.json @@ -36,7 +36,6 @@ [ "bio_power_storage", 30 ], [ "bio_metabolics", 5 ], [ "bio_ethanol", 5 ], - [ "bio_furnace", 5 ], [ "bio_ups", 10 ], [ "bio_torsionratchet", 30 ], [ "bio_tools", 10 ], diff --git a/data/json/obsolete.json b/data/json/obsolete.json new file mode 100644 index 0000000000000..24d92a2630023 --- /dev/null +++ b/data/json/obsolete.json @@ -0,0 +1,10 @@ +[ + { + "id": "bio_furnace", + "type": "bionic", + "name": "Internal Furnace", + "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level. Some materials will burn better than others.", + "occupied_bodyparts": [ [ "TORSO", 40 ] ], + "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ] + } +] diff --git a/data/json/professions.json b/data/json/professions.json index 5cc4fe94a8937..964fb0681ba99 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -207,7 +207,7 @@ "description": "You knew the end was coming. You augmented yourself with some basic bionics and got additional survival training. Now the end has come, and it is time to see if your efforts have paid off.", "points": 6, "CBMs": [ - "bio_furnace", + "bio_metabolics", "bio_power_storage_mkII", "bio_tools", "bio_flashlight", @@ -2187,7 +2187,7 @@ "bio_sleepy", "bio_trip", "bio_spasm", - "bio_furnace", + "bio_metabolics", "bio_power_storage_mkII", "bio_painkiller", "bio_climate" diff --git a/tests/bionics_test.cpp b/tests/bionics_test.cpp index a12572df3aa14..fc83081c22b40 100644 --- a/tests/bionics_test.cpp +++ b/tests/bionics_test.cpp @@ -140,6 +140,6 @@ TEST_CASE( "bionics", "[bionics] [item]" ) } } - // TODO: bio_cable bio_furnace bio_reactor + // TODO: bio_cable bio_reactor // TODO: (pick from stuff with power_source) }