diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 5fc863f7bee0..0d5749ff5e1f 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1450,6 +1450,7 @@ { "item": "knife_rm42", "prob": 2 }, { "item": "kukri", "prob": 2 }, { "item": "knife_hunting", "prob": 4 }, + { "item": "knife_heat", "prob": 2 }, { "item": "knife_rambo", "prob": 20 }, { "item": "tanto", "prob": 3 }, { "item": "throwing_knife", "prob": 7 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 00eab0fe0895..8c6424d2a9fa 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -291,6 +291,7 @@ [ "knife_rm42", 1 ], [ "kukri", 2 ], [ "knife_hunting", 8 ], + [ "knife_heat", 4 ], [ "knife_rambo", 16 ], [ "throwing_knife", 7 ], [ "throwing_axe", 4 ], diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json index 84c7503a0432..0e62dfdd1111 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json @@ -41,6 +41,7 @@ [ "knife_combat", 14 ], [ "kukri", 2 ], [ "knife_hunting", 4 ], + [ "knife_heat", 4 ], [ "knife_rambo", 16 ], [ "knife_rm42", 2 ], [ "throwing_knife", 7 ], @@ -146,6 +147,7 @@ [ "binoculars", 30 ], [ "firecracker_pack", 20 ], [ "knife_hunting", 50 ], + [ "knife_heat", 30 ], [ "glock_19", 5 ], [ "backpack", 100 ], [ "backpack_leather", 50 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index 031e545771ad..8dbccdd8a8fc 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -152,6 +152,7 @@ [ "knife_trench", 7 ], [ "switchblade", 20 ], [ "knife_hunting", 20 ], + [ "knife_heat", 5 ], [ "knife_rambo", 5 ] ] }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json b/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json index b236ec8da1ec..12319ed08aa5 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json @@ -14,6 +14,7 @@ [ "knife_combat", 14 ], [ "kukri", 2 ], [ "knife_hunting", 4 ], + [ "knife_heat", 2 ], [ "knife_rambo", 8 ], [ "knife_rm42", 2 ], [ "throwing_knife", 7 ], diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index a6745c4cc5d7..77dbdae30949 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -184,6 +184,7 @@ { "group": "tinware", "prob": 10 }, [ "kukri", 4 ], [ "knife_hunting", 18 ], + [ "knife_heat", 10 ], [ "knife_rambo", 20 ], [ "machete", 5 ], [ "machete_gimmick", 5 ], diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 44218b3dbe75..9bce7e2c8b7b 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -121,6 +121,7 @@ [ "heavy_flashlight", 15 ], [ "knife_folding", 25 ], [ "knife_hunting", 10 ], + [ "knife_heat", 10 ], [ "knife_rambo", 10 ], [ "knife_swissarmy", 10 ], [ "mess_kit", 20 ], @@ -327,6 +328,7 @@ [ "hatchet", 10 ], [ "knife_hunting", 10 ], [ "knife_rambo", 10 ], + [ "knife_heat", 10 ], [ "knife_swissarmy", 5 ], [ "knife_trench", 10 ], [ "mess_kit", 20 ], diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 94e0e948f182..533e2df29e8f 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1666,5 +1666,17 @@ "cutting": 16, "material": [ "bronze" ], "color": "yellow" + }, + { + "type": "TOOL", + "id": "knife_heat", + "copy-from": "knife_combat", + "name": { "str": "thermoblade" }, + "description": "This is a knife or dagger with an aftermarket modification to heat the blade. The makeshift atomic battery means it will effectively never run out of power, but it can irradiate the wielder when damaged.", + "weight": "588 g", + "price_postapoc": "1550 cent", + "use_action": "HOTPLATE", + "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 30 ] ], + "flags": [ "STAB", "SHEATH_KNIFE", "LEAK_DAM", "RADIOACTIVE", "FLAMING" ] } ] diff --git a/data/json/mapgen/ws_survivor_camp.json b/data/json/mapgen/ws_survivor_camp.json index e025933e14e9..ec61603da752 100644 --- a/data/json/mapgen/ws_survivor_camp.json +++ b/data/json/mapgen/ws_survivor_camp.json @@ -54,6 +54,7 @@ [ "book_archery", 20 ], [ "canteen", 20 ], [ "knife_hunting", 30 ], + [ "knife_heat", 20 ], [ "binoculars", 20 ], [ "ref_lighter", 30 ], [ "backpack", 30 ], diff --git a/data/json/recipes/weapon/piercing.json b/data/json/recipes/weapon/piercing.json index c500ff48b9fb..15132b37200b 100644 --- a/data/json/recipes/weapon/piercing.json +++ b/data/json/recipes/weapon/piercing.json @@ -812,5 +812,35 @@ "autolearn": true, "using": [ [ "forging_standard", 4 ], [ "bronzesmithing_tools", 1 ] ], "components": [ [ [ "wood_structural_small", 1, "LIST" ] ], [ [ "fabric_hides_any", 2, "LIST" ] ], [ [ "scrap_bronze", 2 ] ] ] + }, + { + "type": "recipe", + "result": "knife_heat", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "electronics", + "difficulty": 6, + "time": "45 m", + "reversible": true, + "autolearn": [ [ "electronics", 8 ] ], + "book_learn": [ [ "recipe_caseless", 6 ], [ "textbook_atomic_lab", 6 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "using": [ [ "soldering_standard", 10 ] ], + "components": [ + [ [ "adhesive", 1, "LIST" ] ], + [ [ "power_supply", 1 ] ], + [ [ "element", 1 ] ], + [ [ "scrap", 2 ] ], + [ [ "plut_cell", 1 ] ], + [ + [ "dagger_medieval", 1 ], + [ "tanto", 1 ], + [ "kukri", 1 ], + [ "knife_trench", 1 ], + [ "knife_combat", 1 ], + [ "knife_combat_mod", 1 ], + [ "knife_hunting", 1 ] + ] + ] } ] diff --git a/data/json/requirements/cooking_tools.json b/data/json/requirements/cooking_tools.json index a77c0231f07b..c5bd2d3b16e9 100644 --- a/data/json/requirements/cooking_tools.json +++ b/data/json/requirements/cooking_tools.json @@ -20,7 +20,16 @@ "id": "surface_heat", "type": "requirement", "//": "Heat usable for heating a surface - for example a pot or frying pan.", - "tools": [ [ [ "hotplate", 1 ], [ "multi_cooker", 1 ], [ "char_smoker", 1 ], [ "toolset", 1 ], [ "fire", -1 ] ] ] + "tools": [ + [ + [ "hotplate", 1 ], + [ "multi_cooker", 1 ], + [ "char_smoker", 1 ], + [ "toolset", 1 ], + [ "fire", -1 ], + [ "knife_heat", -1 ] + ] + ] }, { "id": "frying_oil", diff --git a/data/mods/Aftershock/recipes/requirements.json b/data/mods/Aftershock/recipes/requirements.json index cf55088b25a5..630b4a080d5e 100644 --- a/data/mods/Aftershock/recipes/requirements.json +++ b/data/mods/Aftershock/recipes/requirements.json @@ -9,6 +9,7 @@ [ "char_smoker", 1 ], [ "toolset", 1 ], [ "afs_atompot", -1 ], + [ "knife_heat", -1 ], [ "fire", -1 ] ] ]