From 2f95c181b7b0c5f3549d5f7560278d0a5189b63d Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 8 Nov 2023 18:14:56 -0800
Subject: Port 270win changes out to ammo rebalance mod.

---
 PKGBUILD                                         |  6 +++---
 revert-08_undo-rifle-balance-pass.patch          | 14 --------------
 revert-10_still-another-ammo-patch-to-undo.patch | 14 --------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 9b5ec6c..c2d23a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202310040030
 _pkgver=2023-10-04-0030
-pkgrel=6
+pkgrel=7
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -166,9 +166,9 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         '5fee4822e1b80fc831494f1fc94666ba3cb60d56273b1dbcdb169e22ae1a753d874736b4c26bd7ed8bf8fca1e5dac047fb965be29d71d171ca4695e6eef692c8'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
-        'f52685186ddec48e21a49d75913a4d8d65c43a28164ec7c7c3beb89a2551b6aa6a91a221c0b3dd03e3f18339f94197fff2ec78d481a7267d75f7c27a0c1f587a'
+        '09721232b65ca5fcc562bce0cf4529e878612cbe670f9a1b51cf092060a20e9a5b77edc0ab6aac477370d6c85264737175fd335092b245a0ec9e554c1e01d118'
         'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545'
-        'ec8b918bc644b51c63246b33adc512a7c7eb1f1c5c72da043a4c6e9b548199d4ae28b634d002931663fdc4e3026ac455ec8fbf6b49246b99eed325dd9d1c231b'
+        'd8f985de0f80175c233787d04c055b31520adfa86a1f10ee9ee1067b4618d171ab89aa1430e0580d99e71b64865fa1038217e5eac2443bd43894cd16ec8594bd'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff'
         '63d334661bfe5270910de1c9689892aadfabbc5ee1a14508caccfd0639404f337900906fe91dab453ee5036290e485231d9072b977970d438c938ce55f8d2bf3'
diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch
index 7f2eb7f..e37efb5 100644
--- a/revert-08_undo-rifle-balance-pass.patch
+++ b/revert-08_undo-rifle-balance-pass.patch
@@ -4,7 +4,6 @@ Date: Sun, 30 Oct 2022 11:00:10 -0500
 Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
 
 ---
- data/json/items/ammo/270win.json  | 2 +-
  data/json/items/ammo/300.json     | 2 +-
  data/json/items/ammo/3006.json    | 4 ++--
  data/json/items/ammo/300blk.json  | 2 +-
@@ -17,19 +16,6 @@ Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851)
  data/json/items/ammo/762R.json    | 2 +-
  14 files changed, 32 insertions(+), 23 deletions(-)
 
-diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
-index bc2f5e826e9..6ca0814d2e2 100644
---- a/data/json/items/ammo/270win.json
-+++ b/data/json/items/ammo/270win.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "270win",
-     "casing": "270win_casing",
-     "range": 65,
--    "damage": { "damage_type": "bullet", "amount": 64, "armor_penetration": 4 },
-+    "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 34 },
-     "dispersion": 10,
-     "recoil": 3800,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
 diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
 index 95fcb846f5e..2f4335daa40 100644
 --- a/data/json/items/ammo/300.json
diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch
index 0cd3b51..d95d998 100644
--- a/revert-10_still-another-ammo-patch-to-undo.patch
+++ b/revert-10_still-another-ammo-patch-to-undo.patch
@@ -7,7 +7,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
 
 * Doi I forgot .50 at first
 ---
- data/json/items/ammo/270win.json |  2 +-
  data/json/items/ammo/300.json    |  2 +-
  data/json/items/ammo/3006.json   |  2 +-
  data/json/items/ammo/300blk.json |  2 +-
@@ -18,19 +17,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258)
  data/json/items/ammo/762R.json   |  2 +-
  12 files changed, 21 insertions(+), 21 deletions(-)
 
-diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
-index 6ca0814d2e2..8a9139df52c 100644
---- a/data/json/items/ammo/270win.json
-+++ b/data/json/items/ammo/270win.json
-@@ -17,7 +17,7 @@
-     "ammo_type": "270win",
-     "casing": "270win_casing",
-     "range": 65,
--    "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 34 },
-+    "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 26 },
-     "dispersion": 10,
-     "recoil": 3800,
-     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
 diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
 index 2f4335daa40..be8462b330c 100644
 --- a/data/json/items/ammo/300.json
-- 
cgit v1.2.1