Updated to 2022-12-17-1221

1 files changed, 14 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a8bf879..50304be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202212090202
-_pkgver=2022-12-09-0202
+pkgver=202212171221
+_pkgver=2022-12-17-1221
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -41,6 +41,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-06_Obsolete-useless-hub01-basement-1457.patch"
         "revert-07_Remove-handload-quality-distinction-1481.patch"
         "revert-08_undo-rifle-balance-pass.patch"
+        "revert-09_undo-yet-more-ammo-balancing.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -132,17 +133,18 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('fbbf0ce6509f51a2673aed479b56edd86f56b60019fddd185109fc91f66dee5cc6859e82d80141bda19c99712ab1f0cfd26d97f5a9253b652c21112ed75f5c54'
+b2sums=('bfd55c6268b988a32d50f3704011c492c54ea0f9088186d438767392296b6fa95919f197cb1ca9c2d4624701d41840ab07f63f59b246e07c478dd1593f551cf3'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
+        '1de2211ce631a43e343de2c630e525cc46f30be4983737a5c046e2e7bd4d2d67a5b31a57ba78f58c980d1ed6d26f90683fc4fa91530ceddf6b8d5012a31e8e9b'
         'f3549372dec640f5fc51d2c7e2c439e34dc5e9b0cbabfc689d6d449814cfd997413360a363ace85835aec5a1fc2dd8e4bb2c54135fb63f617efdb00565d1616e'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
         'b31b1899cb4d42e1c748be93ac164f8492339683695a34df30c15b734e3fa800b3cfcd1e95bd381501b427e20e45bdca9e9501fa81377d505f22d5549be947e4'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
+        '52cbb536e1c25d28f76d9e5aa63aec29c2ee9219c8f4ab820bdf437d748b6c8a0382edf826fccee8088fef90d75125698a603f19f5b3f1ac78f1dd1dbd52e347'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -167,7 +169,7 @@ b2sums=('fbbf0ce6509f51a2673aed479b56edd86f56b60019fddd185109fc91f66dee5cc6859e8
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         '0793bb7aa67d3989ef093cc17e6d9dd6d2e3999562fe1039b44f0fb9297623bda49271cb7b17d7fab4dc14299e0e5f13eb8f3711dbffc10bf7ffa68838f0585b'
         '24c5f9ee5553b66ac937785b3312378adbca096888b05da8b0cdc9c0586ee51e9a3754615cc03a659cfe70ba2f48f7ce0359025c816c887c7691424c685f5f96'
-        '6b822bae693a2e8043db5a2c2ea8fe5d164d81461b62c11d04b78959d2a43ebbd0a73967a1dd60afa33eb0cc5df2cb2e0e0818fac9a9691edd3d1d97b537d6f6'
+        '3bc022d32238400b88a56bc77123fffabd41633394232f3e1db22bd143fc5646bb03bcd0f91629688ddcc8e5cd6d23630a28bfbcebd0db0f676781b385a584ca'
         '613a9d7a7a512cdf7dc1f1121ecaec7272efe740f5494ce425c3781d41a0ec92e044142d82a28c6445416e84699131745c6872c9b33cb5b93528d0197745455a'
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
@@ -199,15 +201,15 @@ b2sums=('fbbf0ce6509f51a2673aed479b56edd86f56b60019fddd185109fc91f66dee5cc6859e8
         '3f65bf65f730101b215a38101e2a01b4be85746ec5e691d0f1e0f43f1ea1fd47de203299fe7c505160fe831987bd091879243878d91b88ed9ab14712837bd786'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
         'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
-        'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
+        '0cb9f39fd0b87e40bbce50ec7e834803bd0d28ff3c5ad25d2542498cfc5b625e7fc20880e34d325e05c51f411cf91721fe6b5a03565686be6cd6fe88772f80d0'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        '8c94ebe48348cd861d4d0efe4ac77ff9f7183689ac16a44203e5260459ed9838dbae53f5f8d68c601bd23b8e0e7cf6596ee48d5d3b2e29a8ddbb474f5830aec1'
+        'cd63e596c9de88c23690a778372e5d68f03d7f9595cb9d20b644a7da95a70155aa3ad1e58cf68cf9a22cd76acdf5673662b2bfaa46961d0279bda32bf6b44308'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
-        'f03bc29b1c01fe152cc1fe85a5eb375f82474ff5f7da8c7476533243253cac564ff0d7465b3f8ad2d2c1e13208d6c35750244782cfbcdfe2df73f6fcbdaf370a'
+        '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -241,7 +243,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-12-09-0202"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-12-17-1221"|' Makefile
 
 
   # # # Hotfixes
@@ -250,6 +252,9 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # Revert yet more ammo rebalancing
+  patch -NREp1 -i "$srcdir"/revert-09_undo-yet-more-ammo-balancing.patch
+
   # Revert balance pass of rifle ammunition.
   patch -NREp1 -i "$srcdir"/revert-08_undo-rifle-balance-pass.patch