diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-09-08 22:24:02 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-09-08 22:24:02 -0700 |
| commit | 869df74d8d6ee494659bc9855ea1536ba5f883db (patch) | |
| tree | 62fd4dbf35e033606a5b588e726108251f9d300a /revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch | |
| parent | Updated to 2023-08-28-1640 (diff) | |
| download | cataclysm-bn-869df74d8d6ee494659bc9855ea1536ba5f883db.tar.xz | |
Updated to 2023-09-09-0205
Remove references to longguns_cop and sidearms_cop from prisoner island patch
-They were causing more trouble than they were worth
Diffstat (limited to 'revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch')
| -rw-r--r-- | revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch index 9063fe3..b4de191 100644 --- a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch +++ b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch @@ -341,21 +341,6 @@ index 5dad0377169..a3678fd4127 100644 "skill": "rifle", "ammo": "308", "clip_size": 100, -diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md -index 5a51a530d5c..2e7ef664f27 100644 ---- a/doc/GAME_BALANCE.md -+++ b/doc/GAME_BALANCE.md -@@ -253,8 +253,8 @@ Ammo ID | Description | Energy, J | Dmg | Base Brl | - ,300BLK subsonic | 220gr OTM | 675 | 26 | 16in | subsonic - 7.62x54mmR | 150gr FMJ bullet | 3629 | 60 | 28in | | - .308 Winchester | 168gr hollow point bullet | 3570 | 60 | 24in | | --7.62 NATO M80 | 147gr FMJ bullet | 3304 | 57 | 24in | | --7.62 NATO M62 | 142gr tracer bullet | 3232 | 57 | 24in | Belt with 1/5 tracer rounds | -+7.62x51mm NATO M80 | 147gr FMJ bullet | 3304 | 57 | 24in | | -+7.62x51mm NATO M62 | 142gr tracer bullet | 3232 | 57 | 24in | Belt with 1/5 tracer rounds | - .270 Winchester | 130gr soft point bullet | 3663 | 61 | 24in | | - .30-06 Springfield | 165gr soft point bullet | 3894 | 62 | 24in | damage increased by 4 | - .30-06 M2 | 165.7gr AP bullet | 3676 | 60 | 24in | damage reduced by 10 | diff --git a/tests/ranged_burst_balance_test.cpp b/tests/ranged_burst_balance_test.cpp index ec61fad0613..de55646f92d 100644 --- a/tests/ranged_burst_balance_test.cpp |