Skip to content

Commit

Permalink
Merge pull request CleverRaven#77553 from Maarifrah/ammo-description-…
Browse files Browse the repository at this point in the history
…edits

Ammo description edits
  • Loading branch information
Night-Pryanik authored Nov 12, 2024
2 parents bb9ec00 + 68615ce commit 4025f53
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion data/json/items/ammo/10mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"copy-from": "10mm_fmj",
"type": "AMMO",
"name": { "str_sp": "10mm Auto +P" },
"description": "'Full House' 10mm Auto ammunition with a 140gr solid copper penetrator projectile, hunting of or self-defense from dangerous game. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
"description": "'Full House' 10mm Auto ammunition with a 140gr solid copper penetrator projectile, for hunting or self-defense from dangerous game. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
"price": "8 USD",
"price_postapoc": "11 USD",
"relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": 2 } },
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/303.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"copy-from": "303_fmjbt",
"type": "AMMO",
"name": { "str_sp": ".303 British OTM" },
"description": "Jacketed .303 British ammunition loaded with a 174gr open tip match bullet, for precision shooting. .303 British was the standard caliber for military rifles in the British Empire from 1888 until the 1950s. The projectile's open tip construction offers greater manufacturing precision, and a marginal amount of increased expansion over regular full metal jacket bullets.",
"description": "Jacketed .303 British ammunition loaded with a 174gr open tip match bullet, for precision shooting. .303 British was the standard caliber for military rifles in the British Empire from 1888 until the 1950s. The projectile's open tip construction offers greater manufacturing precision and a marginal amount of increased expansion over regular full metal jacket bullets.",
"relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -2 }, "dispersion": -10 }
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/30carbine.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "AMMO",
"name": { "str_sp": ".30 Carbine FMJ" },
"//": ".30 Carbine .308, 110gr Hornady FMJ 3017, 15.5 gr Hodgdon H110 ",
"description": ".30 Carbine ammunition with a 110gr full metal jacket bullet. A light rifle round developed during the Second World War for use in the M1 carbine, it remains a popular sporting round today.",
"description": ".30 Carbine ammunition with a 110gr full metal jacket bullet. A light rifle round developed during the Second World War for use in the M1 carbine; it remains a popular sporting round today.",
"ascii_picture": "30carbine",
"weight": "12 g",
"volume": "160 ml",
Expand Down Expand Up @@ -62,7 +62,7 @@
"copy-from": "30carbine",
"type": "AMMO",
"name": { "str_sp": ".30 Carbine JSP" },
"description": ".30 Carbine ammunition with a 110gr jacketed soft point bullet, which will perform better as a hunting round than FMJ. A light rifle round developed during the Second World War for use in the M1 carbine, it remains a popular sporting round today.",
"description": ".30 Carbine ammunition with a 110gr jacketed soft point bullet, which will perform better as a hunting round than FMJ. A light rifle round developed during the Second World War for use in the M1 carbine; it remains a popular sporting round today.",
"ascii_picture": "762_jhp",
"price": "1 USD",
"price_postapoc": "7 USD 50 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/338lapua.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"type": "AMMO",
"name": { "str_sp": ".338 Lapua AP485" },
"material": [ "steel", "brass", "lead", "powder" ],
"description": ".338 Lapua ammunition, loaded with a 248-grain armor-piercing bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a highly penetrative full-metal jacketed bullet, which comes at the cost of negligible expansion once the round thunders into, and likely straight through the target.",
"description": ".338 Lapua ammunition, loaded with a 248-grain armor-piercing bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. This specialized loading of .338 Lapua features a highly penetrative full-metal jacketed bullet, which comes at the cost of negligible expansion once the round thunders into, and likely straight through, the target.",
"relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/380.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"copy-from": "380_FMJ",
"type": "AMMO",
"name": { "str_sp": ".380 ACP +P" },
"description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet. This defensive loading is designed to maximize performance, and tends to be more accurate than practice ammo. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
"description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet. This defensive loading is designed to maximize performance and tends to be more accurate than practice ammo. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
"price": "1 USD 90 cent",
"price_postapoc": "15 USD",
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"price": "600 USD",
"price_postapoc": "75 USD",
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
"description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge. This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup. Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality. This rare, complicated, and expensive round is not likely to be manufactured again; use it wisely.",
"description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: The tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge. This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup. Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality. This rare, complicated, and expensive round is not likely to be manufactured again; use it wisely.",
"ascii_picture": "50_mk211",
"effects": [ "INCENDIARY", "EXPLOSIVE_RAUFOSS" ],
"//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/77mm_arisaka.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "77mm_arisaka_jsp",
"type": "AMMO",
"name": { "str_sp": "7.7x58mm Japanese JSP" },
"description": "This is a 7.7x58mm Arisaka cartridge loaded with a 174 gr soft point bullet, excellent against larger game and, now, zombies. Adopted as the Japanese empire's standard service cartridge in 1939 (though chambered in machineguns before then) to replace the less potent 6.5x50mm Arisaka round, the 7.7mm bullet was, while more deadly, never quite able to supplant the older munitions. Having acquired a following as a hunting cartridge before the Cataclysm, mainly due to the prevalence of captured or surrendered Japanese rifles, the round was more common than its older 6.5x50mm counterpart.",
"description": "This is a 7.7x58mm Arisaka cartridge loaded with a 174 gr soft point bullet, excellent against larger game and, now, zombies. Adopted as the Japanese empire's standard service cartridge in 1939 (though chambered in machine guns before then) to replace the less potent 6.5x50mm Arisaka round, the 7.7mm bullet was, while more deadly, never quite able to supplant the older munitions. Having acquired a following as a hunting cartridge before the Cataclysm, mainly due to the prevalence of captured or surrendered Japanese rifles, the round was more common than its older 6.5x50mm counterpart.",
"weight": "17 g",
"volume": "182 ml",
"longest_side": "80 mm",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/9x18.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "9x18mm",
"type": "AMMO",
"name": { "str_sp": "9x18mm 57-N-181S" },
"description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet. The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st.",
"description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet. The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st.",
"ascii_picture": "9x18mm",
"weight": "10 g",
"volume": "97 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/blank.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "22_lr",
"type": "AMMO",
"name": { "str_sp": ".22 blank" },
"description": "A powder load .22 blank used for powder actuated tools.",
"description": "A powder load .22 blank used for powder-actuated tools.",
"ascii_picture": "22_blank",
"price": "1 USD",
"price_postapoc": "10 USD",
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/ammo/exodii.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "AMMO",
"copy-from": "3006",
"name": { "str": "12.3ln round" },
"description": "In some alternate universe, the 12.3ln cartridge was introduced in Romania in the wake of the second Carpathian conflict. The PA md. 71 rifle using this ammunition rapidly gained popularity in the Eastern Union, and from there, the world. Due to this, the 12.3ln rapidly became the standard combat round in the Eurasian sphere, making it easy for the Exodii to stockpile it in large quantities when they visited that version of Earth. It looks vaguely like a rimless, .303 British cartridge loaded with a larger, non-spitzer bullet.",
"description": "In some alternate universe, the 12.3ln cartridge was introduced in Romania in the wake of the second Carpathian conflict. The PA md. 71 rifle, using this ammunition, rapidly gained popularity in the Eastern Union, and from there, the world. Due to this, the 12.3ln rapidly became the standard combat round in the Eurasian sphere, making it easy for the Exodii to stockpile it in large quantities when they visited that version of Earth. It looks vaguely like a rimless, .303 British cartridge loaded with a larger, non-spitzer bullet.",
"ammo_type": "123ln",
"damage": { "damage_type": "bullet", "amount": 57, "armor_penetration": 10 },
"casing": "123ln_casing"
Expand Down Expand Up @@ -60,7 +60,7 @@
"//": "1303 fps, 1750gr, rngmax:1829yds",
"type": "AMMO",
"name": { "str": "27.3x110 Diyua light slug" },
"description": "27.3x110 Diyua light slug loads were employed by colonists on some alternate earth to take dangerous game, and later, fend off commonwealth forces from atop palisade walls.",
"description": "27.3x110 Diyua light slug loads were employed by colonists on some alternate Earth to take dangerous game, and later, fend off commonwealth forces from atop palisade walls.",
"dispersion": 25,
"effects": [ "COOKOFF" ]
},
Expand All @@ -70,7 +70,7 @@
"//": "1903 fps, 1750gr, rngmax:1943yds",
"type": "AMMO",
"name": { "str": "27.3x110 Diyua medium slug" },
"description": "27.3x110 Diyua medium slug loads were employed by colonists on some alternate earth to take extremely dangerous game, and later, fend off commonwealth forces from atop palisade walls. Most users of the Brogyaga guns considered these shells too punishing to withstand.",
"description": "27.3x110 Diyua medium slug loads were employed by colonists on some alternate Earth to take extremely dangerous game, and later, fend off commonwealth forces from atop palisade walls. Most users of the Brogyaga guns considered these shells too punishing to withstand.",
"dispersion": 25,
"proportional": { "price": 1.1 },
"range": 14,
Expand All @@ -84,7 +84,7 @@
"//": "2624 fps, 2000gr, rngmax:2049yds",
"type": "AMMO",
"name": { "str": "27.3x110 Diyua heavy slug" },
"description": "27.3x110 Diyua slug loads similar to these were employed by colonists on some alternate earth to take extremely dangerous game. This heavy slug load however, was used almost entirely by recoil enthusiasts and braggarts, until the Exodii came upon them.",
"description": "27.3x110 Diyua slug loads similar to these were employed by colonists on some alternate Earth to take extremely dangerous game. This heavy slug load, however, was used almost entirely by recoil enthusiasts and braggarts, until the Exodii came upon them.",
"proportional": { "price": 1.3 },
"range": 15,
"recoil": 61664,
Expand All @@ -96,7 +96,7 @@
"copy-from": "273x110abstract",
"type": "AMMO",
"name": { "str_sp": "27.3x110 Diyua flockshot" },
"description": "On some alien earth, scores of flocks were decimated by loads such as this 27.3x110 Diyua shell, loaded with a ludicrous number of tiny pellets. Though it would still be devastating against more humanoid targets, flockshot like this is more typically employed by the Exodii by the occasional hunting party.",
"description": "On some alien Earth, scores of flocks were decimated by loads such as this 27.3x110 Diyua shell, loaded with a ludicrous number of tiny pellets. Though it would still be devastating against more humanoid targets, flockshot like this is more typically employed by the Exodii by the occasional hunting party.",
"proportional": { "price": 0.5, "range": 0.83 },
"projectile_count": 24155,
"shot_spread": 36000,
Expand All @@ -109,7 +109,7 @@
"copy-from": "273x110abstract",
"type": "AMMO",
"name": { "str": "27.3x110 Diyua canister" },
"description": "On some alien earth, these mini-canister loads mimicked much larger artillery shot, and were employed for anti-personnel usage against advancing waves from atop a palisade. The Exodii would load these in their Brogyeki sidearms for backup usage.",
"description": "On some alien Earth, these mini-canister loads mimicked much larger artillery shot, and were employed for anti-personnel usage against advancing waves from atop a palisade. The Exodii would load these in their Brogyeki sidearms for backup usage.",
"projectile_count": 27,
"shot_spread": 350,
"proportional": { "range": 0.95 },
Expand Down Expand Up @@ -139,7 +139,7 @@
"copy-from": "273x44abstract",
"type": "AMMO",
"name": { "str_sp": "27.3x44 Diyua star" },
"description": "These flare cartridges are for use in 27.3x44 Diyua guns, or perhaps in 27.3x110 Diyua guns. They are employed by Exodii for emergency signaling when their usual communications systems are suffering interference, breakdown, or are being jammed.",
"description": "These flare cartridges are for use in 27.3x44 Diyua guns, or perhaps in 27.3x110 Diyua guns. They are employed by the Exodii for emergency signaling when their usual communications systems are suffering interference, breakdown, or are being jammed.",
"range": 30,
"dispersion": 200,
"recoil": 100,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/ammo/sling-ready_grenade.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"type": "AMMO",
"name": { "str": "sling-ready small homemade grenade" },
"looks_like": "homemade_grenade",
"description": "An improvised explosive device cobbled together from spare parts, modified with a retaining fuse for use in a staff sling. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have 5 seconds before it explodes; throwing it would be a good idea.",
"description": "An improvised explosive device cobbled together from spare parts and modified with a retaining fuse for use in a staff sling. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have 5 seconds before it explodes; throwing it would be a good idea.",
"ascii_picture": "sling-ready_small_homemade_grenade",
"weight": "460 g",
"volume": "270 ml",
Expand Down Expand Up @@ -100,7 +100,7 @@
"copy-from": "sling-ready_grenade",
"type": "AMMO",
"name": { "str": "sling-ready homemade grenade" },
"description": "An improvised explosive device cobbled together from spare parts, modified with a retaining fuse for use in a staff sling with a modified cradle. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have 5 seconds before it explodes; throwing it would be a good idea.",
"description": "An improvised explosive device cobbled together from spare parts and modified with a retaining fuse for use in a staff sling with a modified cradle. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have 5 seconds before it explodes; throwing it would be a good idea.",
"ascii_picture": "sling-ready_homemade_grenade",
"weight": "900 g",
"price": "15 USD",
Expand All @@ -126,7 +126,7 @@
"copy-from": "sling-ready_grenade",
"type": "AMMO",
"name": { "str": "sling-ready military explosive small homemade grenade" },
"description": "An improvised explosive device cobbled together from parts, modified with a retaining fuse for use in a staff sling. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have some amount of time before it explodes; throwing it would be a good idea.",
"description": "An improvised explosive device cobbled together from parts and modified with a retaining fuse for use in a staff sling. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have some amount of time before it explodes; throwing it would be a good idea.",
"ascii_picture": "sling-ready_small_homemade_grenade_2",
"weight": "600 g",
"volume": "270 ml",
Expand Down Expand Up @@ -154,7 +154,7 @@
"copy-from": "sling-ready_grenade",
"type": "AMMO",
"name": { "str": "sling-ready military explosive homemade grenade" },
"description": "An improvised explosive device cobbled together from parts, modified with a retaining fuse for use in a staff sling with a modified cradle. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have some amount of time before it explodes; throwing it would be a good idea.",
"description": "An improvised explosive device cobbled together from parts and modified with a retaining fuse for use in a staff sling with a modified cradle. To throw this item without a sling, use it to snap the fuse and activate the grenade. You will then have some amount of time before it explodes; throwing it would be a good idea.",
"ascii_picture": "sling-ready_homemade_grenade_2",
"weight": "1200 g",
"price": "30 USD",
Expand Down

0 comments on commit 4025f53

Please sign in to comment.