diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 19:59:56 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-11-08 19:59:56 -0800 |
| commit | bc92a3982826952a16ef1cd904226d582f075430 (patch) | |
| tree | de870f5c744b5ac02bb3b02ae384d6f8c4ece494 | |
| parent | Offload everything in revert 08 and 10 to ammo rebalance mod. (diff) | |
| download | cataclysm-bn-bc92a3982826952a16ef1cd904226d582f075430.tar.xz | |
Unapply counter-fixes in reverts 7 and 7.5
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch | 2 | ||||
| -rw-r--r-- | revert-07_Remove-handload-quality-distinction-1481.patch | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202310040030 _pkgver=2023-10-04-0030 -pkgrel=7 +pkgrel=8 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -162,8 +162,8 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' - '5fee4822e1b80fc831494f1fc94666ba3cb60d56273b1dbcdb169e22ae1a753d874736b4c26bd7ed8bf8fca1e5dac047fb965be29d71d171ca4695e6eef692c8' - 'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543' + '9ec37dae38c6d2591e84e8c714452b1634c42291a9ca98ff3044fa9c8753331f746528816a04d918a96a733cb2240f1e78387c467a0c47103d4b25316dca380a' + 'e2b0718a30a96c2189036be28eb04a0a964cd513f71f323fddbf37fbd80c22eabea6dd6189080ee88d7d3a1f795b86eb10d92bce31c053905df3cfd71d0186e8' 'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545' '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7' 'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff' diff --git a/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch b/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch index 124c16f..2e3c10b 100644 --- a/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch +++ b/revert-07.5_Use-bismuth-in-recipes-related-ammo-fixes-2952.patch @@ -14,7 +14,7 @@ index 048d32d35c7..fb2961ab382 100644 @@ -46,5 +46,15 @@ "price_postapoc": 400, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -2 }, "recoil": -900 } + "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 } + }, + { + "id": "reloaded_4570_bp", diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch index 38ba1d8..6b32344 100644 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ b/revert-07_Remove-handload-quality-distinction-1481.patch @@ -745,7 +745,7 @@ index 94082b3805..360afcdb1c 100644 @@ -44,45 +44,5 @@ "price_postapoc": 400, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -2 }, "recoil": -900 } + "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 } - }, - { - "id": "reloaded_4570_sp", @@ -921,9 +921,9 @@ index 67b9e40515..13b13adcf2 100644 --- a/data/json/items/ammo/545x39.json +++ b/data/json/items/ammo/545x39.json @@ -35,25 +35,5 @@ - "symbol": "=", "color": "yellow", - "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } } + "//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.", + "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } } - }, - { - "id": "reloaded_545", |