Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Obsolete nail bomb and fragment bomb explosives. #39922

Merged
merged 1 commit into from
Apr 27, 2020
Merged

Obsolete nail bomb and fragment bomb explosives. #39922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 0 additions & 96 deletions data/json/items/tool/explosives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,54 +514,6 @@
},
"flags": [ "TRADER_AVOID" ]
},
{
"id": "fragment_bomb",
"type": "TOOL",
"name": { "str": "fragment bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. Use this item to light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
"category": "weapons",
"weight": "470 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": 1,
"price": 900,
"price_postapoc": 750,
"material": [ "aluminum", "iron" ],
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } },
"use_action": {
"target": "fragment_bomb_act",
"msg": "You light the fuse on the %s.",
"target_charges": 5,
"active": true,
"need_fire": 1,
"menu_text": "Light fuse",
"type": "transform"
},
"flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
},
{
"id": "fragment_bomb_act",
"copy-from": "fragment_bomb",
"type": "TOOL",
"name": { "str": "active fragment bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"price_postapoc": 0,
"initial_charges": 5,
"max_charges": 5,
"turns_per_charge": 1,
"use_action": {
"type": "explosion",
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "fungicidalbomb",
"copy-from": "grenade_canister",
Expand Down Expand Up @@ -1154,54 +1106,6 @@
"use_action": "MOLOTOV_LIT",
"flags": [ "LIGHT_15", "TRADER_AVOID", "NPC_THROW_NOW", "NO_REPAIR", "WATER_EXTINGUISH" ]
},
{
"id": "nail_bomb",
"type": "TOOL",
"name": { "str": "nail bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. Use this item to light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
"category": "weapons",
"weight": "470 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": 1,
"price": 900,
"price_postapoc": 500,
"material": [ "aluminum", "iron" ],
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } },
"use_action": {
"target": "nail_bomb_act",
"msg": "You light the fuse on the %s.",
"target_charges": 5,
"active": true,
"need_fire": 1,
"menu_text": "Light fuse",
"type": "transform"
},
"flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
},
{
"id": "nail_bomb_act",
"copy-from": "nail_bomb",
"type": "TOOL",
"name": { "str": "active nail bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"price_postapoc": 0,
"initial_charges": 5,
"max_charges": 5,
"turns_per_charge": 1,
"use_action": {
"type": "explosion",
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "bootleg_pipebomb",
"type": "TOOL",
Expand Down
96 changes: 96 additions & 0 deletions data/json/obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,102 @@
},
"flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB" ]
},
{
"id": "nail_bomb",
"type": "TOOL",
"name": { "str": "nail bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. Use this item to light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
"category": "weapons",
"weight": "470 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": 1,
"price": 900,
"price_postapoc": 500,
"material": [ "aluminum", "iron" ],
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } },
"use_action": {
"target": "nail_bomb_act",
"msg": "You light the fuse on the %s.",
"target_charges": 5,
"active": true,
"need_fire": 1,
"menu_text": "Light fuse",
"type": "transform"
},
"flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
},
{
"id": "nail_bomb_act",
"copy-from": "nail_bomb",
"type": "TOOL",
"name": { "str": "active nail bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"price_postapoc": 0,
"initial_charges": 5,
"max_charges": 5,
"turns_per_charge": 1,
"use_action": {
"type": "explosion",
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "fragment_bomb",
"type": "TOOL",
"name": { "str": "fragment bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. Use this item to light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
"category": "weapons",
"weight": "470 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": 1,
"price": 900,
"price_postapoc": 750,
"material": [ "aluminum", "iron" ],
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } },
"use_action": {
"target": "fragment_bomb_act",
"msg": "You light the fuse on the %s.",
"target_charges": 5,
"active": true,
"need_fire": 1,
"menu_text": "Light fuse",
"type": "transform"
},
"flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
},
{
"id": "fragment_bomb_act",
"copy-from": "fragment_bomb",
"type": "TOOL",
"name": { "str": "active fragment bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"price_postapoc": 0,
"initial_charges": 5,
"max_charges": 5,
"turns_per_charge": 1,
"use_action": {
"type": "explosion",
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "tool_rdx_charge_act",
"type": "TOOL",
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/recipe_obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,21 @@
"result": "offal_cooked",
"obsolete": true
},
{
"result": "tool_rdx_charge",
"type": "recipe",
"obsolete": true
},
{
"result": "nail_bomb",
"type": "recipe",
"obsolete": true
},
{
"result": "fragment_bomb",
"type": "recipe",
"obsolete": true
},
{
"type": "recipe",
"result": "30gal_drum",
Expand Down
53 changes: 0 additions & 53 deletions data/json/recipes/weapon/explosive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,45 +262,6 @@
"using": [ [ "accelerant_liquid", 500 ] ],
"components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "clay_canister", 1 ] ] ]
},
{
"result": "nail_bomb",
"type": "recipe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_EXPLOSIVE",
"skill_used": "fabrication",
"skills_required": [ "mechanics", 0 ],
"difficulty": 1,
"time": "8 m",
"reversible": true,
"autolearn": true,
"using": [ [ "volatile_explosive", 18 ] ],
"components": [
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_drink_unsealed", 1 ] ],
[ [ "nail", 40 ] ],
[ [ "fuse", 1 ] ],
[ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ]
]
},
{
"result": "fragment_bomb",
"type": "recipe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_EXPLOSIVE",
"skill_used": "fabrication",
"skills_required": [ "mechanics", 0 ],
"difficulty": 1,
"time": "12 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "SAW_M", "level": 1 } ],
"using": [ [ "volatile_explosive", 18 ] ],
"components": [
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_drink_unsealed", 1 ] ],
[ [ "nail", 50 ], [ "scrap", 4 ] ],
[ [ "fuse", 1 ] ],
[ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ]
]
},
{
"result": "dynamite_bomb",
"type": "recipe",
Expand Down Expand Up @@ -458,19 +419,5 @@
"qualities": [ { "id": "SAW_M", "level": 1 } ],
"using": [ [ "volatile_explosive", 250 ] ],
"components": [ [ [ "jug_plastic", 1 ] ], [ [ "scrap", 20 ] ], [ [ "fuse", 1 ] ] ]
},
{
"result": "tool_rdx_charge",
"type": "recipe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_EXPLOSIVE",
"skill_used": "fabrication",
"difficulty": 9,
"time": "5 h",
"reversible": true,
"using": [ [ "cordage", 5 ] ],
"book_learn": [ [ "manual_launcher", 9 ] ],
"qualities": [ { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "keg", 1 ], [ "keg_steel", 1 ] ], [ [ "chem_rdx", 6000 ] ], [ [ "chem_hmtd", 4000 ] ], [ [ "scrap", 50 ] ] ]
}
]