Skip to content

Commit

Permalink
Updates for homemade explosive/flame ammo (#3360)
Browse files Browse the repository at this point in the history
* Updates for homemade explosive/flame ammo

* Fix a whoops
chaosvolt authored Oct 4, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent af6a459 commit cd755c2
Showing 5 changed files with 65 additions and 51 deletions.
10 changes: 6 additions & 4 deletions data/json/items/ranged/archery.json
Original file line number Diff line number Diff line change
@@ -304,23 +304,25 @@
"dispersion": 285,
"loudness": 0,
"count": 5,
"effects": [ "EXPLOSIVE_SMALL" ]
"effects": [ "COOKOFF", "EXPLOSIVE_SMALL" ]
},
{
"type": "GENERIC",
"type": "TOOL",
"id": "exploding_arrow_warhead",
"category": "spare_parts",
"symbol": "=",
"color": "green",
"name": { "str": "explosive arrowhead" },
"description": "This simple IED is designed to be attached to an arrow and detonate on impact.",
"description": "This simple IED is designed to be attached to an arrow or crossbow bolt, and detonate on impact.",
"price": 2000,
"price_postapoc": 250,
"material": "steel",
"weight": "562 g",
"volume": "250 ml",
"bashing": 10,
"to_hit": -1
"to_hit": -1,
"explosion": { "damage": 40, "radius": 2 },
"explode_in_fire": true
},
{
"type": "AMMO",
4 changes: 2 additions & 2 deletions data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
@@ -287,8 +287,8 @@
"material": "wood",
"symbol": "=",
"color": "brown",
"initial_charges": 5,
"max_charges": 5,
"initial_charges": 1,
"max_charges": 1,
"charges_per_use": 1,
"use_action": "ARROW_FLAMABLE"
},
89 changes: 46 additions & 43 deletions data/json/recipes/ammo/arrows.json
Original file line number Diff line number Diff line change
@@ -355,29 +355,29 @@
"skill_used": "fabrication",
"skills_required": [ "archery", 3 ],
"difficulty": 3,
"time": "5 m",
"time": "1 m",
"reversible": true,
"book_learn": [ [ "recipe_arrows", 5 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[
[ "arrow_field_point_fletched", 5 ],
[ "arrow_fire_hardened_fletched", 5 ],
[ "arrow_wood", 5 ],
[ "arrow_heavy_fire_hardened_fletched", 5 ],
[ "arrow_heavy_field_point_fletched", 5 ],
[ "arrow_wood_heavy", 5 ],
[ "arrow_metal", 5 ]
[ "arrow_field_point_fletched", 1 ],
[ "arrow_fire_hardened_fletched", 1 ],
[ "arrow_wood", 1 ],
[ "arrow_heavy_fire_hardened_fletched", 1 ],
[ "arrow_heavy_field_point_fletched", 1 ],
[ "arrow_wood_heavy", 1 ],
[ "arrow_metal", 1 ]
],
[ [ "rag", 1, "NO_RECOVER" ] ],
[
[ "lamp_oil", 50, "NO_RECOVER" ],
[ "motor_oil", 50, "NO_RECOVER" ],
[ "chem_ethanol", 100, "NO_RECOVER" ],
[ "denat_alcohol", 100, "NO_RECOVER" ],
[ "gasoline", 250, "NO_RECOVER" ],
[ "diesel", 250, "NO_RECOVER" ],
[ "biodiesel", 250, "NO_RECOVER" ]
[ "lamp_oil", 10, "NO_RECOVER" ],
[ "motor_oil", 10, "NO_RECOVER" ],
[ "chem_ethanol", 20, "NO_RECOVER" ],
[ "denat_alcohol", 20, "NO_RECOVER" ],
[ "gasoline", 50, "NO_RECOVER" ],
[ "diesel", 50, "NO_RECOVER" ],
[ "biodiesel", 50, "NO_RECOVER" ]
]
],
"delete_flags": [ "FILTHY" ],
@@ -391,19 +391,21 @@
"skill_used": "fabrication",
"skills_required": [ [ "archery", 4 ] ],
"difficulty": 4,
"time": "7 m",
"time": "90 s",
"charges": 1,
"reversible": true,
"book_learn": [ [ "recipe_arrows", 6 ], [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ],
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "exploding_arrow_warhead", 5 ] ],
[ [ "exploding_arrow_warhead", 1 ] ],
[
[ "arrow_field_point_fletched", 5 ],
[ "arrow_fire_hardened_fletched", 5 ],
[ "arrow_wood", 5 ],
[ "arrow_heavy_fire_hardened_fletched", 5 ],
[ "arrow_heavy_field_point_fletched", 5 ],
[ "arrow_wood_heavy", 5 ],
[ "arrow_metal", 5 ]
[ "arrow_field_point_fletched", 1 ],
[ "arrow_fire_hardened_fletched", 1 ],
[ "arrow_wood", 1 ],
[ "arrow_heavy_fire_hardened_fletched", 1 ],
[ "arrow_heavy_field_point_fletched", 1 ],
[ "arrow_wood_heavy", 1 ],
[ "arrow_metal", 1 ]
]
]
},
@@ -413,27 +415,28 @@
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_ARROWS",
"skill_used": "fabrication",
"skills_required": [ [ "mechanics", 3 ] ],
"difficulty": 5,
"time": "10 m",
"book_learn": [ [ "recipe_arrows", 7 ], [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ],
"using": [ [ "soldering_standard", 10 ] ],
"qualities": [ { "id": "SAW_M", "level": 1 } ],
"skills_required": [ [ "archery", 4 ] ],
"difficulty": 4,
"time": "90 s",
"reversible": true,
"book_learn": [ [ "recipe_arrows", 6 ], [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ],
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "bolt_metal", 1 ], [ "bolt_steel", 1 ] ],
[ [ "can_food_unsealed", 1 ], [ "can_drink_unsealed", 1 ], [ "canister_empty", 1 ] ],
[ [ "superglue", 1 ], [ "cordage", 1, "LIST" ] ],
[ [ "exploding_arrow_warhead", 1 ] ],
[
[ "smpistol_primer", 1 ],
[ "lgpistol_primer", 1 ],
[ "smrifle_primer", 1 ],
[ "lgrifle_primer", 1 ],
[ "shotgun_primer", 1 ]
],
[ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ]
],
"delete_flags": [ "FILTHY" ],
"flags": [ "ALLOW_FILTHY" ]
[ "bolt_simple_wood", 1 ],
[ "bolt_simple_small_game", 1 ],
[ "bolt_makeshift", 1 ],
[ "bolt_wood", 1 ],
[ "bolt_wood_bodkin", 1 ],
[ "bolt_wood_small_game", 1 ],
[ "bolt_metal", 1 ],
[ "bolt_steel", 1 ],
[ "bolt_steel_bodkin", 1 ],
[ "bolt_steel_target", 1 ],
[ "bolt_cf", 1 ]
]
]
},
{
"type": "recipe",
3 changes: 2 additions & 1 deletion data/json/recipes/ammo/components.json
Original file line number Diff line number Diff line change
@@ -60,13 +60,14 @@
[ [ "can_food_unsealed", 1 ], [ "can_drink_unsealed", 1 ], [ "canister_empty", 1 ] ],
[ [ "superglue", 1 ], [ "cordage", 1, "LIST" ] ],
[
[ "impact_fuze", 1 ],
[ "smpistol_primer", 1 ],
[ "lgpistol_primer", 1 ],
[ "smrifle_primer", 1 ],
[ "lgrifle_primer", 1 ],
[ "shotgun_primer", 1 ]
],
[ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ]
[ [ "volatile_explosive", 2, "LIST" ], [ "stable_explosive", 2, "LIST" ], [ "military_explosive", 2, "LIST" ] ]
],
"delete_flags": [ "FILTHY" ],
"flags": [ "ALLOW_FILTHY" ]
10 changes: 9 additions & 1 deletion data/json/recipes/ammo/other.json
Original file line number Diff line number Diff line change
@@ -201,7 +201,15 @@
"book_learn": [ [ "manual_launcher", 5 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 1 } ],
"tools": [ [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
"components": [ [ [ "pipe", 2 ] ], [ [ "chem_black_powder", 150 ] ], [ [ "tool_rocket_candy", 2 ], [ "chem_rocket_fuel", 10 ] ] ]
"components": [
[ [ "pipe", 2 ] ],
[
[ "volatile_explosive", 25, "LIST" ],
[ "stable_explosive", 25, "LIST" ],
[ "military_explosive", 25, "LIST" ]
],
[ [ "tool_rocket_candy", 2 ], [ "chem_rocket_fuel", 10 ] ]
]
},
{
"type": "recipe",

0 comments on commit cd755c2

Please sign in to comment.