Skip to content

Commit

Permalink
feat(balance): add blackpowder loads for more ammotypes (cataclysmbnt…
Browse files Browse the repository at this point in the history 
…eam#4891)

* feat(balance): add blackpowder loads for more ammotypes

* smolfix
  • Loading branch information
@chaosvolt
chaosvolt authored Jun 26, 2024
1 parent 3f3796b commit 5dba7cc
Show file tree
Hide file tree
Showing 12 changed files with 454 additions and 8 deletions.
24 changes: 16 additions & 8 deletions data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
{ "item": "32_acp", "prob": 50, "charges": [ 1, 100 ] },
{ "item": "38_fmj", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "38_special", "prob": 80, "charges": [ 1, 100 ] },
{ "item": "38super_fmj", "prob": 40, "charges": [ 1, 100 ] },
{ "item": "38_super", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "38super_fmj", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "357mag_fmj", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "357mag_jhp", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "380_JHP", "prob": 10, "charges": [ 1, 100 ] },
Expand Down Expand Up @@ -140,10 +141,14 @@
{ "item": "bp_32_acp", "prob": 50, "charges": [ 1, 100 ] },
{ "item": "bp_38_fmj", "prob": 55, "charges": [ 1, 100 ] },
{ "item": "bp_38_special", "prob": 105, "charges": [ 1, 100 ] },
{ "item": "bp_38_super", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "bp_38super_fmj", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "bp_357mag_fmj", "prob": 55, "charges": [ 1, 100 ] },
{ "item": "bp_357mag_jhp", "prob": 55, "charges": [ 1, 100 ] },
{ "item": "bp_380_JHP", "prob": 10, "charges": [ 1, 100 ] },
{ "item": "bp_380_FMJ", "prob": 15, "charges": [ 1, 100 ] },
{ "item": "bp_357sig_fmj", "prob": 70, "charges": [ 1, 100 ] },
{ "item": "bp_357sig_jhp", "prob": 70, "charges": [ 1, 100 ] },
{ "item": "bp_40fmj", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "bp_40sw", "prob": 50, "charges": [ 1, 100 ] },
{ "item": "bp_44magnum", "prob": 85, "charges": [ 1, 100 ] },
Expand Down Expand Up @@ -325,6 +330,8 @@
{ "item": "reloaded_4570_bp", "prob": 60, "charges": [ 1, 100 ] },
{ "item": "bp_762_51", "prob": 35, "charges": [ 1, 100 ] },
{ "item": "bp_762_51_incendiary", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "bp_762_54R", "prob": 60, "charges": [ 1, 100 ] },
{ "item": "bp_762_m43", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "bp_300blk", "prob": 10, "charges": [ 1, 100 ] }
]
},
Expand All @@ -338,9 +345,9 @@
{ "item": "shot_bird", "prob": 70, "charges": [ 1, 100 ] },
{ "item": "shot_slug", "prob": 70, "charges": [ 1, 100 ] },
{ "item": "410shot_000", "prob": 50, "charges": [ 1, 100 ] },
{ "item": "shot_paper_00", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "shot_paper_bird", "prob": 30, "charges": [ 1, 100 ] },
{ "item": "shot_paper_slug", "prob": 10, "charges": [ 1, 100 ] }
{ "item": "shot_paper_00", "prob": 15, "charges": [ 1, 100 ] },
{ "item": "shot_paper_bird", "prob": 15, "charges": [ 1, 100 ] },
{ "item": "shot_paper_slug", "prob": 5, "charges": [ 1, 100 ] }
]
},
{
Expand Down Expand Up @@ -414,8 +421,9 @@
{ "item": "bp_shot_dragon", "prob": 20, "charges": [ 1, 100 ] },
{ "item": "bp_shot_flechette", "prob": 5, "charges": [ 1, 100 ] },
{ "item": "bp_shot_slug", "prob": 55, "charges": [ 1, 100 ] },
{ "item": "bp_410shot_000", "prob": 25, "charges": [ 1, 100 ] },
{ "item": "shot_paper_00", "prob": 15, "charges": [ 1, 100 ] },
{ "item": "shot_paper_bird", "prob": 10, "charges": [ 1, 100 ] },
{ "item": "shot_paper_bird", "prob": 15, "charges": [ 1, 100 ] },
{ "item": "shot_paper_slug", "prob": 5, "charges": [ 1, 100 ] }
]
},
Expand Down Expand Up @@ -631,9 +639,9 @@
{ "item": "shot_bird", "prob": 70 },
{ "item": "shot_slug", "prob": 70 },
{ "item": "410shot_000", "prob": 50 },
{ "item": "shot_paper_00", "prob": 30 },
{ "item": "shot_paper_bird", "prob": 30 },
{ "item": "shot_paper_slug", "prob": 10 }
{ "item": "shot_paper_00", "prob": 15 },
{ "item": "shot_paper_bird", "prob": 15 },
{ "item": "shot_paper_slug", "prob": 5 }
]
},
{
Expand Down
28 changes: 28 additions & 0 deletions data/json/items/ammo/357sig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,33 @@
"name": { "str": ".357 SIG JHP" },
"description": "Jacketed hollow point .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.",
"damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 0 }
},
{
"id": "bp_357sig_fmj",
"copy-from": "357sig_fmj",
"type": "AMMO",
"name": { "str": ".357 SIG FMJ, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
},
{
"id": "bp_357sig_jhp",
"copy-from": "357sig_jhp",
"type": "AMMO",
"name": { "str": ".357 SIG JHP, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
28 changes: 28 additions & 0 deletions data/json/items/ammo/38super.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,33 @@
"count": 20,
"//": "Hollowpoint damage increase of 25%.",
"damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 0 }
},
{
"id": "bp_38super_fmj",
"copy-from": "38super_fmj",
"type": "AMMO",
"name": { "str": ".38 Super, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
},
{
"id": "bp_38_super",
"copy-from": "38_super",
"type": "AMMO",
"name": { "str": ".38 Super, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
14 changes: 14 additions & 0 deletions data/json/items/ammo/410shot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,19 @@
"recoil": 1350,
"loudness": 90,
"effects": [ "COOKOFF", "SHOT" ]
},
{
"id": "bp_410shot_000",
"copy-from": "410shot_000",
"type": "AMMO",
"name": { "str": ".410 000 shot, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
45 changes: 45 additions & 0 deletions data/json/items/ammo/50.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,50 @@
"//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",
"relative": { "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 25 } },
"dispersion": 100
},
{
"id": "bp_50_incendiary",
"copy-from": "50_incendiary",
"type": "AMMO",
"name": { "str": ".50 BMG M17 tracer, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
"id": "bp_50bmg",
"copy-from": "50bmg",
"type": "AMMO",
"name": { "str": ".50 BMG M33 Ball, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
"id": "bp_50ss",
"copy-from": "50ss",
"type": "AMMO",
"name": { "str": ".50 BMG M2 AP, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
]
28 changes: 28 additions & 0 deletions data/json/items/ammo/545x39.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,33 @@
"color": "yellow",
"//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.",
"relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } }
},
{
"id": "bp_545",
"copy-from": "545",
"type": "AMMO",
"name": { "str": "5.45x39mm 7N10, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
},
{
"id": "bp_545_ap",
"copy-from": "545_ap",
"type": "AMMO",
"name": { "str": "5.45x39mm 7N22, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
15 changes: 15 additions & 0 deletions data/json/items/ammo/700nx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,20 @@
"dispersion": 15,
"recoil": 12100,
"effects": [ "COOKOFF" ]
},
{
"id": "bp_700nx",
"copy-from": "700nx",
"type": "AMMO",
"name": { "str": ".700 NX, black powder" },
"description": "The .700 Nitro Express is a very powerful rifle round designed for long-range use. The \"Nitro\" in the name isn't very applicable to this blackpowder load, but it still has plenty of Express.",
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
30 changes: 30 additions & 0 deletions data/json/items/ammo/762.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,35 @@
"price": "150 cent",
"price_postapoc": "68 USD",
"relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 2 } }
},
{
"id": "bp_762_m43",
"copy-from": "762_m43",
"type": "AMMO",
"name": { "str": "7.62x39mm 57-N-231, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
{
"id": "bp_762_m87",
"copy-from": "762_m87",
"type": "AMMO",
"name": { "str": "7.62x39mm M67, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
]
14 changes: 14 additions & 0 deletions data/json/items/ammo/762R.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,19 @@
"dispersion": 15,
"recoil": 2650,
"effects": [ "COOKOFF" ]
},
{
"id": "bp_762_54R",
"copy-from": "762_54R",
"type": "AMMO",
"name": { "str": "7.62x54mmR, black powder" },
"proportional": {
"price": 0.5,
"price_postapoc": 0.5,
"damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }
}
]
64 changes: 64 additions & 0 deletions data/json/recipes/ammo/pistol.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,38 @@
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ],
"components": [ [ [ "chem_black_powder", 8 ] ] ]
},
{
"result": "bp_357sig_fmj",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_PISTOL",
"skill_used": "fabrication",
"difficulty": 3,
"skills_required": [ "gun", 1 ],
"time": "2 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
"charges": 1,
"reversible": true,
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357sig", 1 ] ],
"components": [ [ [ "chem_black_powder", 7 ] ], [ [ "copper", 1 ] ] ]
},
{
"result": "bp_357sig_jhp",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_PISTOL",
"skill_used": "fabrication",
"difficulty": 3,
"skills_required": [ "gun", 1 ],
"time": "2 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ],
"charges": 1,
"reversible": true,
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357sig", 1 ] ],
"components": [ [ [ "chem_black_powder", 8 ] ] ]
},
{
"result": "bp_38_special",
"type": "recipe",
Expand All @@ -520,6 +552,38 @@
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
"components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ] ]
},
{
"result": "bp_38_super",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_PISTOL",
"skill_used": "fabrication",
"difficulty": 4,
"skills_required": [ "gun", 3 ],
"time": "2 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "manual_pistol", 3 ] ],
"charges": 1,
"reversible": true,
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ],
"components": [ [ [ "chem_black_powder", 5 ] ] ]
},
{
"result": "bp_38super_fmj",
"type": "recipe",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_PISTOL",
"skill_used": "fabrication",
"difficulty": 3,
"skills_required": [ "gun", 1 ],
"time": "2 m",
"batch_time_factors": [ 60, 5 ],
"book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ],
"charges": 1,
"reversible": true,
"using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ],
"components": [ [ [ "chem_black_powder", 5 ] ], [ [ "copper", 1 ] ] ]
},
{
"result": "40fmj",
"type": "recipe",
Expand Down
Loading

0 comments on commit 5dba7cc

Please sign in to comment.