Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian-Otten committed Apr 14, 2020
1 parent 72d65a4 commit 63dcd2e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions data/json/ammo_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
"aoe": { "field_type": "fd_fire", "intensity_min": 1, "intensity_max": 1, "radius": 3, "size": 4 },
"explosion": { "power": 360, "distance_factor": 0.8, "fire": true }
},
{
"id": "NAPALM_TBG7V",
"type": "ammo_effect",
"aoe": { "field_type": "fd_fire", "intensity_min": 1, "intensity_max": 1, "radius": 3, "size": 4 }
},
{
"id": "PYROPHORIC",
"type": "ammo_effect",
Expand Down Expand Up @@ -158,17 +163,17 @@
"explosion": { "power": 400, "shrapnel": { "casing_mass": 680, "fragment_mass": 0.3 } }
},
{
"id": "OG-7V_EXPLOSIVE",
"id": "OG7V_EXPLOSIVE",
"type": "ammo_effect",
"explosion": { "power": 266, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.15 } }
},
{
"id": "PG-7VL_EXPLOSIVE",
"id": "PG7VL_EXPLOSIVE",
"type": "ammo_effect",
"explosion": { "power": 598, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.3 } }
},
{
"id": "PG-7VR_EXPLOSIVE",
"id": "PG7VR_EXPLOSIVE",
"type": "ammo_effect",
"explosion": { "power": 1995, "shrapnel": { "casing_mass": 2500, "fragment_mass": 0.3 } }
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/20x66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"id": "20x66_exp",
"copy-from": "20x66_shot",
"type": "AMMO",
30 "name": { "str": "20x66mm explosive" },
"name": { "str": "20x66mm explosive" },
"description": "20x66mm caseless shotgun rounds, explosive projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
"price": 10000,
"price_postapoc": 8000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/rpg.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"range": 30,
"dispersion": 50,
"recoil": 450,
"effects": [ "COOKOFF", TBG-7V_EXPLOSIVE, "TRAIL", "NEVER_MISFIRES", "NAPALM_TBG7V" ]
"effects": [ "COOKOFF", "TBG-7V_EXPLOSIVE", "TRAIL", "NEVER_MISFIRES", "NAPALM_TBG7V" ]
},
{
"type": "AMMO",
Expand Down

0 comments on commit 63dcd2e

Please sign in to comment.