diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-31 15:24:27 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-03-31 15:24:27 -0700 |
| commit | dfba5ebe5b6e93c54964b757419779d8b89e4322 (patch) | |
| tree | 8f95344c4651b57a11796bf06cef0fb587b81017 /revert-09_undo-yet-more-ammo-balancing.patch | |
| parent | More npc dialogue fixes. (diff) | |
| download | cataclysm-bn-dfba5ebe5b6e93c54964b757419779d8b89e4322.tar.xz | |
Updated to 2023-03-31-1439
Add v29 copy-from fix.
Add more reverts.
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
| -rw-r--r-- | revert-09_undo-yet-more-ammo-balancing.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch index f071311..4cfd0ce 100644 --- a/revert-09_undo-yet-more-ammo-balancing.patch +++ b/revert-09_undo-yet-more-ammo-balancing.patch @@ -243,7 +243,7 @@ diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.js index 4541de0dab2..aeb0d2e732e 100644 --- a/data/json/items/ammo/40x53mm.json +++ b/data/json/items/ammo/40x53mm.json -@@ -22,11 +22,12 @@ +@@ -22,10 +22,11 @@ "id": "40x53mm_m1001", "copy-from": "40x53mm_grenade", "type": "AMMO", @@ -251,14 +251,13 @@ index 4541de0dab2..aeb0d2e732e 100644 + "name": { "str": "40x53mm M1001 flechette" }, "description": "40x53mm canister shot loaded with 17 grain flechettes.", "weight": "340 g", - "volume": "137 ml", - "damage": { "damage_type": "bullet", "amount": 150, "armor_penetration": 10 }, + "//": "Balanced as AP.", + "damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 }, "recoil": 1000, "casing": "40x53mm_m169_casing", "extend": { "effects": [ "SHOT" ] } -@@ -35,7 +36,7 @@ +@@ -35,6 +36,6 @@ "id": "40x53mm_m430a1", "copy-from": "40x53mm_grenade", "type": "AMMO", @@ -266,7 +265,6 @@ index 4541de0dab2..aeb0d2e732e 100644 + "name": { "str": "40x53mm M430A1 HEDP" }, "description": "A high velocity 40x53mm HEDP grenade. It can penetrate 3 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.", "weight": "340 g", - "volume": "132 ml", @@ -47,11 +48,11 @@ "id": "40x53mm_buckshot_m169", "copy-from": "40x53mm_grenade", |