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

Port ballistic damage type and preserve commit authorship info #1458

Merged
merged 13 commits into from
Apr 21, 2022
Merged

Port ballistic damage type and preserve commit authorship info #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
24c3617
Damage loading code
anothersimulacrum Mar 20, 2020
a38805d
Update logic for bullet resistance
anothersimulacrum Mar 20, 2020
973505c
Bullet damage UI bits
anothersimulacrum Mar 20, 2020
c78968c
Update materials for bullet damage
anothersimulacrum Mar 20, 2020
cd9a39c
Update guns to use bullet damage
anothersimulacrum Mar 20, 2020
dfbbc9f
Update ammo to bullet damage
anothersimulacrum Mar 20, 2020
e5cc556
Miscellaneous damage JSON changes
anothersimulacrum Apr 12, 2020
4417d45
Update monster bullet damage
anothersimulacrum Mar 20, 2020
378c896
Add documentation
anothersimulacrum Mar 20, 2020
b6a13a4
Update mods
anothersimulacrum Mar 21, 2020
962b8ed
Made bio_ads behavior match its description
Nov 13, 2020
da10b3e
Fix display of ammo using relative/proportional
anothersimulacrum Nov 10, 2020
250703c
Port over ballistic damage type
chaosvolt Apr 12, 2022
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
5 changes: 5 additions & 0 deletions data/json/flags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,11 @@
"context": [ ],
"type": "json_flag"
},
{
"id": "EFFECT_BULLET_IMMUNE",
"context": [ ],
"type": "json_flag"
},
{
"id": "EFFECT_ACID_IMMUNE",
"context": [ ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"volume": "200ml",
"weight": "1 g",
"ammo_type": "BB",
"damage": { "damage_type": "stab", "amount": 2 },
"damage": { "damage_type": "bullet", "amount": 2 },
"dispersion": 100,
"count": 500,
"stack_size": 200,
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/ammo/10mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"casing": "10mm_casing",
"range": 14,
"//": "Base damage of 31, balance increase of one-nineth.",
"damage": { "damage_type": "stab", "amount": 34, "armor_penetration": 19 },
"damage": { "damage_type": "bullet", "amount": 34, "armor_penetration": 19 },
"dispersion": 50,
"recoil": 750,
"effects": [ "COOKOFF" ]
Expand All @@ -30,7 +30,7 @@
"name": { "str": "10mm Auto FMJ, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
Expand All @@ -42,7 +42,7 @@
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": { "str": "10mm Auto FMJ, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/12mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"count": 20,
"stack_size": 40,
"ammo_type": "12mm",
"damage": { "damage_type": "stab", "amount": 50, "armor_penetration": 40 },
"damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 40 },
"dispersion": 45,
"recoil": 100
}
Expand Down
20 changes: 10 additions & 10 deletions data/json/items/ammo/20x66mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"price_postapoc": 1000,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
"proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
"proportional": { "damage": { "damage_type": "bullet", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
"extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
},
{
Expand All @@ -18,7 +18,7 @@
"type": "AMMO",
"name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -28,7 +28,7 @@
"type": "AMMO",
"name": { "str": "20x66mm buckshot, handmade" },
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -38,7 +38,7 @@
"type": "AMMO",
"name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
"description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -52,7 +52,7 @@
"price_postapoc": 8000,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"range": 20,
"damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 4 },
"damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
"dispersion": 120,
"effects": [ "COOKOFF", "EXPLOSIVE_TINY", "NEVER_MISFIRES" ]
},
Expand All @@ -67,7 +67,7 @@
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
"range": 20,
"damage": { "damage_type": "stab", "amount": 16 },
"damage": { "damage_type": "bullet", "amount": 16 },
"dispersion": 200,
"recoil": 100,
"drop": "handflare_lit",
Expand All @@ -83,7 +83,7 @@
"price_postapoc": 4000,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 10,
"relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
"relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
},
{
"id": "20x66_frag",
Expand All @@ -95,7 +95,7 @@
"price_postapoc": 5000,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"count": 5,
"proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
"proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } },
"extend": { "effects": [ "FRAG_SMALL" ] }
},
{
Expand Down Expand Up @@ -128,7 +128,7 @@
"stack_size": 20,
"ammo_type": "20x66mm",
"range": 12,
"damage": { "damage_type": "stab", "amount": 60 },
"damage": { "damage_type": "bullet", "amount": 60 },
"recoil": 2500,
"effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
},
Expand All @@ -141,7 +141,7 @@
"price": 1500,
"price_postapoc": 4000,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
"damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
"relative": { "range": 12 },
"proportional": { "dispersion": 1.3 },
"delete": { "effects": [ "SHOT" ] }
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/ammo/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": { "str": ".22 CPHP" },
"description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
"//": "Hollowpoint damage increase of 25%",
"damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 },
"damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 },
"relative": { "range": 3 },
"proportional": { "recoil": 1.5 }
},
Expand All @@ -29,7 +29,7 @@
"casing": "22_casing",
"range": 13,
"//": "Base damage of 12, balance increase of one-third.",
"damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 9 },
"damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 9 },
"dispersion": 60,
"recoil": 150,
"effects": [ "COOKOFF" ]
Expand All @@ -52,7 +52,7 @@
"copy-from": "22_cphp",
"type": "AMMO",
"name": { "str": ".22 LR CPHP, black powder" },
"proportional": { "price": 0.3, "damage": { "damage_type": "stab", "amount": 0.57 }, "recoil": 0.57, "dispersion": 1.2 },
"proportional": { "price": 0.3, "damage": { "damage_type": "bullet", "amount": 0.57 }, "recoil": 0.57, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -63,7 +63,7 @@
"name": { "str": ".22 LR, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
"recoil": 0.57,
"dispersion": 1.2
},
Expand All @@ -75,7 +75,7 @@
"copy-from": "22_lr",
"type": "AMMO",
"name": { "str": ".22 LR, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -84,7 +84,7 @@
"copy-from": "22_cphp",
"type": "AMMO",
"name": { "str": ".22 CPHP, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/ammo/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ammo_type": "223",
"casing": "223_casing",
"range": 36,
"damage": { "damage_type": "stab", "amount": 44, "armor_penetration": 2 },
"damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 },
"dispersion": 30,
"recoil": 1500,
"effects": [ "COOKOFF" ]
Expand All @@ -31,7 +31,7 @@
"price": 290,
"price_postapoc": 900,
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"relative": { "damage": { "damage_type": "stab", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
"relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
"proportional": { "recoil": 1.1 },
"extend": { "effects": [ "NEVER_MISFIRES" ] }
},
Expand All @@ -50,7 +50,7 @@
"name": { "str": ".223 Remington, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
"recoil": 0.57,
"dispersion": 1.2
},
Expand All @@ -64,7 +64,7 @@
"name": { "str": "5.56 NATO, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
"recoil": 0.57,
"dispersion": 1.2
},
Expand All @@ -78,7 +78,7 @@
"name": { "str": "5.56 NATO tracer, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
"recoil": 0.57,
"dispersion": 1.2
},
Expand All @@ -90,7 +90,7 @@
"copy-from": "223",
"type": "AMMO",
"name": { "str": ".223 Remington, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -99,7 +99,7 @@
"copy-from": "556",
"type": "AMMO",
"name": { "str": "5.56 NATO, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -108,7 +108,7 @@
"copy-from": "556_incendiary",
"type": "AMMO",
"name": { "str": "5.56 NATO tracer, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/ammo/270win.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ammo_type": "270win",
"casing": "270win_casing",
"range": 65,
"damage": { "damage_type": "stab", "amount": 64, "armor_penetration": 4 },
"damage": { "damage_type": "bullet", "amount": 64, "armor_penetration": 4 },
"dispersion": 10,
"recoil": 3800,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
Expand All @@ -29,7 +29,7 @@
"name": { "str": ".270 Winchester JSP, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.7, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 },
"recoil": 0.7,
"dispersion": 1.2
},
Expand All @@ -41,7 +41,7 @@
"copy-from": "270win_jsp",
"type": "AMMO",
"name": { "str": ".270 Winchester JSP, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/ammo/300.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ammo_type": "300",
"casing": "300_casing",
"range": 65,
"damage": { "damage_type": "stab", "amount": 70, "armor_penetration": 8 },
"damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 },
"dispersion": 15,
"recoil": 4000,
"effects": [ "COOKOFF" ]
Expand All @@ -29,7 +29,7 @@
"name": { "str": ".300 Winchester Magnum, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
Expand All @@ -42,7 +42,7 @@
"type": "AMMO",
"name": { "str": ".300 Winchester Magnum, reloaded" },
"description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines. The cartridge has found use by hunters, military units, and law enforcement departments. This one has been hand-reloaded.",
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
16 changes: 8 additions & 8 deletions data/json/items/ammo/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"ammo_type": "3006",
"casing": "3006_casing",
"range": 61,
"damage": { "damage_type": "stab", "amount": 62, "armor_penetration": 10 },
"damage": { "damage_type": "bullet", "amount": 62, "armor_penetration": 10 },
"dispersion": 20,
"recoil": 3800,
"effects": [ "COOKOFF" ]
Expand All @@ -36,7 +36,7 @@
"type": "AMMO",
"name": { "str": ".30-06 M2 AP" },
"description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets. It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
"relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } }
"relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
},
{
"id": "bp_3006",
Expand All @@ -45,7 +45,7 @@
"name": { "str": ".30-06 Springfield, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
Expand All @@ -59,7 +59,7 @@
"name": { "str": ".30-06 Springfield tracer, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
Expand All @@ -73,7 +73,7 @@
"name": { "str": ".30-06 M2 AP, black powder" },
"proportional": {
"price": 0.3,
"damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
Expand All @@ -85,7 +85,7 @@
"copy-from": "3006",
"type": "AMMO",
"name": { "str": ".30-06 Springfield, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -94,7 +94,7 @@
"copy-from": "3006_incendiary",
"type": "AMMO",
"name": { "str": ".30-06 incendiary, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand All @@ -103,7 +103,7 @@
"copy-from": "3006fmj",
"type": "AMMO",
"name": { "str": ".30-06 M2 AP, reloaded" },
"proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
Expand Down
Loading