Skip to content

Commit

Permalink
Update explosives to use corrrect explosive power, casing mass, and f…
Browse files Browse the repository at this point in the history 
…ragment mass. (#37710)

* Smaller fragments
Change fragment from nailbombs to 0.4g (half a nail)
And change to 1g from 2g for fragmenting metal bombs.
  • Loading branch information
@Brian-Otten
Brian-Otten authored Feb 21, 2020
1 parent 7cc215e commit bec1cba
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions data/json/items/tool/explosives.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"symbol": "*",
"color": "red",
"explode_in_fire": true,
"explosion": { "power": 225, "shrapnel": { "casing_mass": 12, "fragment_mass": 0.4 } },
"explosion": { "power": 225, "shrapnel": { "casing_mass": 40, "fragment_mass": 1 } },
"use_action": {
"target": "can_bomb_act",
"msg": "You light the fuse on the can bomb. Throw it before it blows in your face!",
Expand All @@ -58,7 +58,7 @@
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 225, "shrapnel": { "casing_mass": 12, "fragment_mass": 0.4 } }
"explosion": { "power": 225, "shrapnel": { "casing_mass": 40, "fragment_mass": 1 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
Expand Down Expand Up @@ -452,7 +452,7 @@
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 30, "shrapnel": { "casing_mass": 12, "fragment_mass": 0.1 } },
"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.",
Expand All @@ -479,7 +479,7 @@
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 30, "shrapnel": { "casing_mass": 12, "fragment_mass": 0.1 } }
"explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
Expand Down Expand Up @@ -843,7 +843,7 @@
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 155, "distance_factor": 0.8, "shrapnel": { "casing_mass": 162, "fragment_mass": 0.6 } },
"explosion": { "power": 175, "shrapnel": { "casing_mass": 162, "fragment_mass": 0.4 } },
"use_action": {
"target": "makeshift_grenade_act",
"msg": "You pull the pin on the makeshift grenade.",
Expand All @@ -869,7 +869,7 @@
"sound_volume": 0,
"sound_msg": "Tick.",
"no_deactivate_msg": "You've already pulled the %s's pin; try throwing it instead.",
"explosion": { "power": 155, "distance_factor": 0.8, "shrapnel": { "casing_mass": 162, "fragment_mass": 0.6 } }
"explosion": { "power": 175, "shrapnel": { "casing_mass": 162, "fragment_mass": 0.4 } }
},
"flags": [ "BOMB", "TRADER_AVOID" ]
},
Expand Down Expand Up @@ -983,7 +983,7 @@
"symbol": "*",
"color": "green",
"explode_in_fire": true,
"explosion": { "power": 30, "shrapnel": { "casing_mass": 8, "fragment_mass": 0.2, "drop": "nail", "recovery": 16 } },
"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.",
Expand All @@ -1010,7 +1010,7 @@
"no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
"sound_volume": 0,
"sound_msg": "ssss...",
"explosion": { "power": 30, "shrapnel": { "casing_mass": 8, "fragment_mass": 0.2, "drop": "nail", "recovery": 16 } }
"explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
},
Expand Down Expand Up @@ -1062,7 +1062,7 @@
"sound_volume": 0,
"sound_msg": "ssss...",
"no_deactivate_msg": "You've already lit the %s, try throwing it instead.",
"explosion": { "power": 300, "shrapnel": { "casing_mass": 100, "fragment_mass": 1 } }
"explosion": { "power": 175, "shrapnel": { "casing_mass": 400, "fragment_mass": 1 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ]
},
Expand Down Expand Up @@ -1210,15 +1210,15 @@
"category": "weapons",
"name": "black gunpowder charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, equipped with a long fuse. Use this item to light the fuse. Should explode in a few minutes…",
"weight": "5000 g",
"weight": "6500 g",
"volume": "4 L",
"price": 20000,
"to_hit": -2,
"material": [ "steel", "plastic" ],
"symbol": "*",
"color": "red",
"explode_in_fire": true,
"explosion": { "power": 250, "shrapnel": { "casing_mass": 2500, "fragment_mass": 2, "drop": "scrap", "recovery": 20 } },
"explosion": { "power": 2250, "shrapnel": { "casing_mass": 2000, "fragment_mass": 1, "drop": "scrap", "recovery": 20 } },
"use_action": {
"target": "tool_black_powder_charge_act",
"msg": "You light the fuse on the black gunpowder charge. Get rid of it quickly!",
Expand All @@ -1235,7 +1235,7 @@
"category": "weapons",
"name": "active black gunpowder charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, whose fuse has been lit, its final countdown starting.",
"weight": "5000 g",
"weight": "6500 g",
"volume": "4 L",
"price": 0,
"to_hit": -2,
Expand All @@ -1246,13 +1246,13 @@
"max_charges": 20,
"turns_per_charge": 1,
"explode_in_fire": true,
"explosion": { "power": 250, "shrapnel": { "casing_mass": 2500, "fragment_mass": 2, "drop": "scrap", "recovery": 20 } },
"explosion": { "power": 2250, "shrapnel": { "casing_mass": 2000, "fragment_mass": 1, "drop": "scrap", "recovery": 20 } },
"use_action": {
"type": "explosion",
"sound_volume": 0,
"sound_msg": "Kshhh.",
"no_deactivate_msg": "You've already lit the fuse - run!",
"explosion": { "power": 500, "shrapnel": { "casing_mass": 2500, "fragment_mass": 2, "drop": "scrap", "recovery": 20 } }
"explosion": { "power": 2250, "shrapnel": { "casing_mass": 2000, "fragment_mass": 1, "drop": "scrap", "recovery": 20 } }
},
"flags": [ "BOMB", "TRADER_AVOID" ]
},
Expand Down

0 comments on commit bec1cba

Please sign in to comment.