diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-14 13:09:59 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-14 13:09:59 -0700 |
commit | d9dd69087542c64ab20d1ab6665732d0911913f0 (patch) | |
tree | 82529919a17fc08effdddb99607d629357c6235d /json/items | |
parent | Use more real grenade names and weights. (diff) | |
download | cataclysm-dda-mod_grenade-crafting-d9dd69087542c64ab20d1ab6665732d0911913f0.tar.xz |
Port to DDA.
Diffstat (limited to 'json/items')
-rw-r--r-- | json/items/ammo/40x46mm.json | 50 | ||||
-rw-r--r-- | json/items/ammo/40x53mm.json | 25 | ||||
-rw-r--r-- | json/items/tool/explosive.json | 58 |
3 files changed, 1 insertions, 132 deletions
diff --git a/json/items/ammo/40x46mm.json b/json/items/ammo/40x46mm.json index 0a374e4..cd63290 100644 --- a/json/items/ammo/40x46mm.json +++ b/json/items/ammo/40x46mm.json @@ -50,55 +50,5 @@ }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "40x46mm_buckshot_m118", - "copy-from": "40x46mm_buckshot_m118", - "type": "AMMO", - "name": { "str": "40x46mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_buckshot_m199", - "copy-from": "40x46mm_buckshot_m199", - "type": "AMMO", - "name": { "str": "40x46mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_slug_m118", - "copy-from": "40x46mm_slug_m118", - "type": "AMMO", - "name": { "str": "40x46mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_slug_m199", - "copy-from": "40x46mm_slug_m199", - "type": "AMMO", - "name": { "str": "40x46mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_flechette_m118", - "copy-from": "40x46mm_flechette_m199", - "type": "AMMO", - "name": { "str": "40x46mm flechette" }, - "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x46mm_flechette_m199", - "copy-from": "40x46mm_flechette_m199", - "type": "AMMO", - "name": { "str": "40x46mm flechette" }, - "description": "An improvised 40x46mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/json/items/ammo/40x53mm.json b/json/items/ammo/40x53mm.json index 1bb9c28..1e0d941 100644 --- a/json/items/ammo/40x53mm.json +++ b/json/items/ammo/40x53mm.json @@ -24,30 +24,5 @@ }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "40x53mm_buckshot_m169", - "copy-from": "40x53mm_buckshot_m169", - "type": "AMMO", - "name": { "str": "40x53mm buckshot" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x53mm_slug_m169", - "copy-from": "40x53mm_slug_m169", - "type": "AMMO", - "name": { "str": "40x53mm slug" }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "40x53mm_flechette_m169", - "copy-from": "40x53mm_flechette_m169", - "type": "AMMO", - "name": { "str": "40x53mm flechette" }, - "description": "An improvised 40x53mm flechette load somewhat resembling M1001.", - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } } ] diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json index 0c8033c..09652be 100644 --- a/json/items/tool/explosive.json +++ b/json/items/tool/explosive.json @@ -1,12 +1,5 @@ [ { - "id": "can_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "can_bomb_act", - "name": { "str": "can bomb (active)", "str_pl": "can bombs (active)" } - }, - { "id": "c4", "type": "TOOL", "category": "weapons", @@ -20,7 +13,7 @@ "material": [ "plastic" ], "symbol": ";", "color": "light_gray", - "use_action": "C4" + "use_action": [ "C4" ] }, { "id": "c4armed", @@ -55,13 +48,6 @@ "description": "This stun grenade is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!" }, { - "id": "fragment_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "fragment_bomb_act", - "name": { "str": "fragment bomb (lit)", "str_pl": "fragment bombs (lit)" } - }, - { "id": "fungicidalbomb", "type": "TOOL", "category": "weapons", @@ -101,20 +87,6 @@ "description": "This fragmentation grenade is active, and will explode any second now. Better throw it!" }, { - "id": "makeshift_grenade", - "type": "TOOL", - "category": "weapons", - "copy-from": "makeshift_grenade", - "name": { "str": "makeshift fragmentation grenade" } - }, - { - "id": "makeshift_grenade_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "makeshift_grenade_act", - "name": { "str": "makeshift fragmentation grenade (active)", "str_pl": "makeshift fragmentation grenades (active)" } - }, - { "id": "grenade_emp_act", "type": "TOOL", "category": "weapons", @@ -200,13 +172,6 @@ "name": { "str": "Molotov cocktail (lit)", "str_pl": "Molotov cocktails (lit)" } }, { - "id": "nail_bomb_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "nail_bomb_act", - "name": { "str": "nail bomb (lit)", "str_pl": "nail bombs (lit)" } - }, - { "id": "pipebomb_act", "type": "TOOL", "category": "weapons", @@ -239,27 +204,6 @@ "description": "This smoke grenade has had its pin removed and is expelling thick smoke." }, { - "id": "tool_anfo_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_anfo_charge_act", - "name": { "str": "ANFO charge (lit)", "str_pl": "ANFO charges (lit)" } - }, - { - "id": "tool_black_powder_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_black_powder_charge_act", - "name": { "str": "black gunpowder charge (lit)", "str_pl": "black gunpowder charges (lit)" } - }, - { - "id": "tool_rdx_charge_act", - "type": "TOOL", - "category": "weapons", - "copy-from": "tool_rdx_charge_act", - "name": { "str": "RDX charge (lit)", "str_pl": "RDX charges (lit)" } - }, - { "id": "tool_rocket_candy_act", "type": "TOOL", "category": "weapons", |