Updated to 2023-03-13-1611.

Fix PKGBUILD sed indenting.

4 files changed, 30 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b8ec18d..c94a262 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=202302260055
-_pkgver=2023-02-26-0055
+pkgver=202303131611
+_pkgver=2023-03-13-1611
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -137,7 +137,7 @@ 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=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859ef3777723d1361d19d4db219b9c57ea15156de65af2251208a573ad5d9'
+b2sums=('2d5847b04b4d2a0a863de8222889a5a4594f1f2dd51d0bbe09c783e6a1a9036a2143dc0b3db6b8c08bb2b36446563e1e750395d22736ddfbc8a4429413a47a0f'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -146,9 +146,9 @@ b2sums=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859e
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
-        'bc9cf261c2ed1e154470cce0a8756e6ab468a1800f472c10cd2843ca8113eb36eda811e9db5b58e8db0470025e36510d8de521cd1a2893b0e1530292d9085fb6'
+        'd6ab568373c3bae4d99e7ef1c80e1c8b1c0e4256610919d3d060d71c202dd40597ea1230b4c00c6ef04960a0da2aa436970943b94e6276725be0bb9d865508f7'
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
-        'dfe62238bd92dccb9d05c92fa92fcc1490ba7e927f3fbfd130b89674fabca4f1d8b25099762f2c6f1e987387886d54ded576fba527dd22afe7ce645fa01fb761'
+        '419447e88cf9860383d14b7f80c6ef8ca4a8ab0421d84b06794c57711ae919e5e3b82aeb15ad33a5a997f9e06aa6389a1887aacfd74036043f7e4f7526ab3658'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
@@ -208,7 +208,7 @@ b2sums=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859e
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        '989a8c00cba128496272e1f4aedd7a88099c93e8ac4ba7aebe2100907d3223affbcb21ba6290a50d9c0b3afb0a38d059774bebc63aeb7d0d337afdae2466ec27'
+        'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         '9fb6d2945184347e5b4f56f022d9b1b40559c1210edd91cb984d2c69e711dd297eab2a06d1e7d4008052fad658a9574ebd933083e7f8f3b3600b271593cbde15'
@@ -220,7 +220,7 @@ b2sums=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859e
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        '975c8c138489ddd650bf12320692b7ee830abaf77f5b964d5e11d4d77c8ebd9856276ca6bdc6ecef8fd6a9d986a7ac9d2ec42c4b122d64abad21e460606f40c4'
+        'fc326dcf07b768add5b5f600855b3786594c2e3d810a87224cdc1a535e3871fed113958ff3a5678cae43d3634dda0d1798f94b22fefbfc17f9265ac60791bb28'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -228,25 +228,25 @@ b2sums=('6bb584f8e848d7d06d85a51ce4af2c85149f4bd2e79c6887a9ee0cc53bddee39ea6859e
 prepare() {
   cd "${_pkgname}-${_pkgver}"
   sed \
-  -e 's/-Werror//' \
-  -e 's/ncursesw5-config/ncursesw6-config/' \
-  -e 's/shell git/shell false/' \
-  -i Makefile
+    -e 's/-Werror//' \
+    -e 's/ncursesw5-config/ncursesw6-config/' \
+    -e 's/shell git/shell false/' \
+    -i Makefile
 
   # Disable default optimizations
   sed \
-  -e 's/-Os/-O3/' \
-  -e 's/-O0/-O3/' \
-  -e 's/-Og/-O3/' \
-  -e 's/CXXFLAGS += -ffast-math/#CXXFLAGS += -ffast-math/' \
-  -i Makefile
+    -e 's/-Os/-O3/' \
+    -e 's/-O0/-O3/' \
+    -e 's/-Og/-O3/' \
+    -e 's/CXXFLAGS += -ffast-math/#CXXFLAGS += -ffast-math/' \
+    -i Makefile
 
   # Remove non-existent flags generating warnings
   sed \
-  -e 's/-Wzero-as-null-pointer-constant \\/-Wzero-as-null-pointer-constant/' \
-  -e 's/-Wno-range-loop-analysis/#-Wno-range-loop-analysis/' \
-  -e 's/-Wno-unknown-warning-option/#-Wno-unknown-warning-option/' \
-  -i Makefile
+    -e 's/-Wzero-as-null-pointer-constant \\/-Wzero-as-null-pointer-constant/' \
+    -e 's/-Wno-range-loop-analysis/#-Wno-range-loop-analysis/' \
+    -e 's/-Wno-unknown-warning-option/#-Wno-unknown-warning-option/' \
+    -i Makefile
 
   # Fix filenames and paths
   sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
@@ -256,7 +256,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-02-26-0055"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-03-13-1611"|' Makefile
 
 
   # # # Hotfixes
diff --git a/etc-02_add-missing-price-postapoc.patch b/etc-02_add-missing-price-postapoc.patch
index 5945346..f5f3bbd 100644
--- a/etc-02_add-missing-price-postapoc.patch
+++ b/etc-02_add-missing-price-postapoc.patch
@@ -1,9 +1,9 @@
 --- a/data/json/items/gun/223.json
 +++ b/data/json/items/gun/223.json
 @@ -118,7 +118,8 @@
-     "description": "A bullpup assault rifle that was used by French armed forces only until recently.  While the FAMAS was famous for its high fire rate, the MAS .223 is a semi-auto only variation imported to the US in the late eighties.  It retains the integral bipod, though.",
      "weight": "3800 g",
      "volume": "4162 ml",
+     "barrel_length": "250 ml",
 -    "price": 2800000,
 +    "price": 240000,
 +    "price_postapoc": 5000,
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch
index 7323ff7..3bc6080 100644
--- a/revert-07_Remove-handload-quality-distinction-1481.patch
+++ b/revert-07_Remove-handload-quality-distinction-1481.patch
@@ -1245,8 +1245,8 @@ index 50f6c09d56..619ab4ab64 100644
      "copy-from": "shot_bird",
 diff --git a/data/json/items/migration.json b/data/json/items/migration.json
 index 13f75ba5ed..ccda62af14 100644
---- a/data/json/items/migration.json
-+++ b/data/json/items/migration.json
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
 @@ -387,7 +387,7 @@
    {
      "id": "shot_scrapslug",
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index 5fdff85..f071311 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -542,9 +542,9 @@ index 1d6da22013b..937239328dd 100644
      "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
 diff --git a/data/json/items/migration.json b/data/json/items/migration.json
 index ed67da394f0..31158a8187c 100644
---- a/data/json/items/migration.json
-+++ b/data/json/items/migration.json
-@@ -1740,5 +1740,20 @@
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
+@@ -1740,6 +1740,21 @@
      "id": "rubber_armor_horse",
      "type": "MIGRATION",
      "replace": "rubber_armor_medium_quadruped"
@@ -563,8 +563,9 @@ index ed67da394f0..31158a8187c 100644
 +    "id": "8mm_fmj",
 +    "type": "MIGRATION",
 +    "replace": "8mm_caseless"
-   }
- ]
+   },
+   {
+     "id": "chem_zinc_powder",
 diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
 index c0c56cead36..8e1335380e2 100644
 --- a/data/json/obsoletion/recipes.json