Skip to content

Commit

Permalink
feat(content): thermoblade (#4500)
Browse files Browse the repository at this point in the history
* Added thermoblade

Added in thermoblade, a utility knife that heats itself using an atomic battery. It can show up almost anywhere a hunting knife can (at a lower chance), except on police since it's legally questionable. It can be crafted yourself using a knife, electronics supplies, and a plutonium cell if you have 6 electronics and a lab recipe book or 8 electronics otherwise.

* Removed durable flag

The thermoblade is no longer durable, since this version is a handmade grey-market variety while the Subnautica one is 3D printed.

* style(autofix.ci): automated formatting

* Removed technique, added FLAMING

Removed the thermal stab technique and the bonus damage and gave the thermoblade the FLAMING flag instead.

* Fixed recipebook learn level

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
yay855 and autofix-ci[bot] authored Apr 21, 2024
1 parent b61f53e commit 60ab65d
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 1 deletion.
1 change: 1 addition & 0 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
[ "knife_rm42", 1 ],
[ "kukri", 2 ],
[ "knife_hunting", 8 ],
[ "knife_heat", 4 ],
[ "knife_rambo", 16 ],
[ "throwing_knife", 7 ],
[ "throwing_axe", 4 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
[ "knife_combat", 14 ],
[ "kukri", 2 ],
[ "knife_hunting", 4 ],
[ "knife_heat", 4 ],
[ "knife_rambo", 16 ],
[ "knife_rm42", 2 ],
[ "throwing_knife", 7 ],
Expand Down Expand Up @@ -146,6 +147,7 @@
[ "binoculars", 30 ],
[ "firecracker_pack", 20 ],
[ "knife_hunting", 50 ],
[ "knife_heat", 30 ],
[ "glock_19", 5 ],
[ "backpack", 100 ],
[ "backpack_leather", 50 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
[ "knife_trench", 7 ],
[ "switchblade", 20 ],
[ "knife_hunting", 20 ],
[ "knife_heat", 5 ],
[ "knife_rambo", 5 ]
]
},
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
[ "knife_combat", 14 ],
[ "kukri", 2 ],
[ "knife_hunting", 4 ],
[ "knife_heat", 2 ],
[ "knife_rambo", 8 ],
[ "knife_rm42", 2 ],
[ "throwing_knife", 7 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/activities_hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
{ "group": "tinware", "prob": 10 },
[ "kukri", 4 ],
[ "knife_hunting", 18 ],
[ "knife_heat", 10 ],
[ "knife_rambo", 20 ],
[ "machete", 5 ],
[ "machete_gimmick", 5 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down Expand Up @@ -327,6 +328,7 @@
[ "hatchet", 10 ],
[ "knife_hunting", 10 ],
[ "knife_rambo", 10 ],
[ "knife_heat", 10 ],
[ "knife_swissarmy", 5 ],
[ "knife_trench", 10 ],
[ "mess_kit", 20 ],
Expand Down
12 changes: 12 additions & 0 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
1 change: 1 addition & 0 deletions data/json/mapgen/ws_survivor_camp.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
[ "book_archery", 20 ],
[ "canteen", 20 ],
[ "knife_hunting", 30 ],
[ "knife_heat", 20 ],
[ "binoculars", 20 ],
[ "ref_lighter", 30 ],
[ "backpack", 30 ],
Expand Down
30 changes: 30 additions & 0 deletions data/json/recipes/weapon/piercing.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
]
]
}
]
11 changes: 10 additions & 1 deletion data/json/requirements/cooking_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Aftershock/recipes/requirements.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
[ "char_smoker", 1 ],
[ "toolset", 1 ],
[ "afs_atompot", -1 ],
[ "knife_heat", -1 ],
[ "fire", -1 ]
]
]
Expand Down

0 comments on commit 60ab65d

Please sign in to comment.