From 864e71f364885899d0f525a5ccd2d7f41e41b226 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 4 Oct 2023 16:42:25 -0500 Subject: [PATCH 1/2] Updates for homemade explosive/flame ammo --- data/json/items/ranged/archery.json | 10 +-- data/json/items/tool/misc.json | 4 +- data/json/recipes/ammo/arrows.json | 85 +++++++++++++------------- data/json/recipes/ammo/components.json | 3 +- data/json/recipes/ammo/other.json | 10 ++- 5 files changed, 61 insertions(+), 51 deletions(-) diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index dac2b586a9c0..64cc5cc27545 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -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", diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 18a9ffdb187a..b1cb432201f0 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -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" }, diff --git a/data/json/recipes/ammo/arrows.json b/data/json/recipes/ammo/arrows.json index def56e5a3487..40bdfca0d0ce 100644 --- a/data/json/recipes/ammo/arrows.json +++ b/data/json/recipes/ammo/arrows.json @@ -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,24 @@ "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" ] + [ "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 ] + ] + ] }, { "type": "recipe", diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json index c1c88080114c..2a0db3a060e3 100644 --- a/data/json/recipes/ammo/components.json +++ b/data/json/recipes/ammo/components.json @@ -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" ] diff --git a/data/json/recipes/ammo/other.json b/data/json/recipes/ammo/other.json index fd0d2f2774b6..86e52b66ae6b 100644 --- a/data/json/recipes/ammo/other.json +++ b/data/json/recipes/ammo/other.json @@ -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", From b1e326bbd01681c5fe699052af1d009b8f0cf3ed Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 4 Oct 2023 16:47:55 -0500 Subject: [PATCH 2/2] Fix a whoops --- data/json/recipes/ammo/arrows.json | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/ammo/arrows.json b/data/json/recipes/ammo/arrows.json index 40bdfca0d0ce..c791b5343566 100644 --- a/data/json/recipes/ammo/arrows.json +++ b/data/json/recipes/ammo/arrows.json @@ -424,13 +424,17 @@ "components": [ [ [ "exploding_arrow_warhead", 1 ] ], [ - [ "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 ] + [ "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 ] ] ] },