From 222ac35b339ff02f98bb82e91b6b92cce4ddbcd2 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 16 Mar 2023 09:56:12 -0700
Subject: Add a patch to remove the UCP from the vanilla migration list.

---
 PKGBUILD                      | 15 +++++++++++++--
 migration-01_remove-ucp.patch | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 migration-01_remove-ucp.patch

diff --git a/PKGBUILD b/PKGBUILD
index 143358a..40b4917 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202303140758
 _pkgver=2023-03-14-0758
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -73,6 +73,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "meds-01_antibiotics-unhealthy.patch"
 
+        "migration-01_remove-ucp.patch"
+
         "mission-01_typos.patch"
 
         "monsters-01_medical-zombies-called-zombies.patch"
@@ -172,6 +174,7 @@ b2sums=('1341a6ed74789497cf785d2986be877dd1deef9c24e50938c3ccb1d01ef456b156852e5
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
         '931ac85c657c1c504de1ea629205b19f79a11acdd7c62cf71b909323ec1588610b1f575bc58ab01c3fbcd334fca8fbc114316570732f55a3f7fb3dd2984cd442'
+        'b9bf63ed06aee848fa70adceaf9674e842343e6f92e9a2e57be372814b481d54bdfee602eac9e3c05dc5c8e35ec36146f28491de39b7ea2c8c3a8b9ac80c0354'
         '536c59b274923d36fbfc6dc39ef373a0d1e497422dea6fcdc16cfacb6b9ba421f14c5d7c4db31bab083199d859ff57ae5b19842f95367cfa39059e7156e96093'
         'e466392190e0aa58c02acda287bc8ac6fef30160207d08805ca9acd42b7f024d0680c0a76fcb4f29a7d7ca884920bba3a6714b5ad40f64dd1b40bcf0e2621d26'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
@@ -220,7 +223,7 @@ b2sums=('1341a6ed74789497cf785d2986be877dd1deef9c24e50938c3ccb1d01ef456b156852e5
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        'fc326dcf07b768add5b5f600855b3786594c2e3d810a87224cdc1a535e3871fed113958ff3a5678cae43d3634dda0d1798f94b22fefbfc17f9265ac60791bb28'
+        'f36757d6803f760eee3e537399e571623d5b65b2d82babf5bd7ab5ce24b05eb7fbdef5bd59330a11bcfe7e589e531822e1be53f48ec3b117c52113f7e2f38ad4'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '14ef4cc6b05f8d9b0d6196c4b6f35cc8083bdf4820c19c320551158b47b570ee6b385f3d6b9888f614fb9d5325265feae810a2c5fff4a0deb42b01612bad6517'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -401,6 +404,14 @@ prepare() {
   patch -Np1 -i "$srcdir"/meds-01_antibiotics-unhealthy.patch
 
 
+  # # missions fixes
+  echo "Applying migration fixes"
+  # Remove UCP from migration list:
+  # I can hack around this in my mod, but better to remove it here.
+  # It has been gone so long, no save old enough is likely to even load.
+  patch -Np1 -i "$srcdir"/migration-01_remove-ucp.patch
+
+
   # # missions fixes
   echo "Applying mission fixes"
   # Fix Typos:
diff --git a/migration-01_remove-ucp.patch b/migration-01_remove-ucp.patch
new file mode 100644
index 0000000..f2488cb
--- /dev/null
+++ b/migration-01_remove-ucp.patch
@@ -0,0 +1,14 @@
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
+@@ -784,11 +784,6 @@
+     "flags": [ "HIDDEN_HALLU" ]
+   },
+   {
+-    "id": "hk_ucp",
+-    "type": "MIGRATION",
+-    "replace": "hk_mp7"
+-  },
+-  {
+     "id": "rechargable_battery",
+     "type": "MIGRATION",
+     "replace": "heavy_battery_cell"
-- 
cgit v1.2.1