From ba1f13edd17a4ade741d163787636f446748b274 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 14 Jun 2021 02:34:35 -0700
Subject: Updated to 2036

---
 PKGBUILD                | 12 ++++--------
 hotfix_mp3-player.patch | 44 --------------------------------------------
 2 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 hotfix_mp3-player.patch

diff --git a/PKGBUILD b/PKGBUILD
index e5afc4a..036e764 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@
 pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
-pkgver=2006
-pkgrel=1.4
+pkgver=2036
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -32,7 +32,6 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
         "0.F_backport-inhaler-mission-no-autofail.patch"
-        "hotfix_mp3-player.patch"
 
         "0001-quiverfull-house-correct-stairs.patch"
         "0002-ankle-ammo-pouch-is-not-a-backpack.patch"
@@ -69,7 +68,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "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=('e8228109ac7494ba3a5f5b42422926f116b9c0e002f89174872a26bb0bb88f540a5f83018912ee58e96083cf7d0259e35f68fa17fc8d8584ebd75b5600e9939f'
+b2sums=('7906295dde161d0a49a1f1a581dade6b73d589c1cbf1dcf0dedd646413c7915ccb7693bba0e117f26c1498cedb5d5f0e10aff366fc9517c880c4bf2ff844cae1'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -77,7 +76,6 @@ b2sums=('e8228109ac7494ba3a5f5b42422926f116b9c0e002f89174872a26bb0bb88f540a5f830
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb'
-        'b88e0ca20faa64469f3e970067b2bc77aa0f0b8b661f637c0ad701b05c3a9e4908500b81cfb5746ff6f0c83f619c463150291f462a725d6d691cc338a6cd0d34'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
         'ade420aa80816ebcf19485bb4617352a1654c8e436babc3e51290757432e44dd69da3a4403c1e9dab816b2d2d0db70a86504f707e9d3696a192ecef30622fc9b'
@@ -127,7 +125,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = the-fork|VERSION = 2006|' Makefile
+  sed -i 's|VERSION = the-fork|VERSION = 2036|' Makefile
 
 
   # gcc11 support
@@ -148,8 +146,6 @@ prepare() {
   # Fix npcs with the inhaler mission instantly dying upon mission acceptance
   patch -Np1 -i "$srcdir"/0.F_backport-inhaler-mission-no-autofail.patch
 
-  patch -Np1 -i "$srcdir"/hotfix_mp3-player.patch
-
 
   # Various other fixes for bugs I came across
   # Fix Quiverfull house to have the correct stairs that modify json
diff --git a/hotfix_mp3-player.patch b/hotfix_mp3-player.patch
deleted file mode 100644
index e6191ed..0000000
--- a/hotfix_mp3-player.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/src/monster.cpp
-+++ b/src/monster.cpp
-@@ -1507,12 +1507,7 @@
- 
-     if( total_dealt > 6 && stab_cut > 0 && has_flag( MF_BLEED ) ) {
-         // Maybe should only be if DT_CUT > 6... Balance question
--        if( target.is_player() || target.is_npc() ) {
--            target.add_effect( effect_bleed, 6_minutes, bp_hit );
--        } else {
--            target.add_effect( effect_bleed, 6_minutes, bp_hit );
--        }
--
-+        target.add_effect( effect_bleed, 6_minutes, bp_hit );
-     }
- }
-  
---- a/data/json/effects.json
-+++ b/data/json/effects.json
-@@ -373,7 +373,7 @@
-     "id": "earphones",
-     "name": [ "Wearing earphones" ],
-     "desc": [ "You are wearing earphones and can't hear much from outside world." ],
--    "permanent": true,
-+    "max_duration": "1 s",
-     "rating": "bad"
-   },
-   {
-@@ -526,6 +526,7 @@
-     "name": [ "Sleep Deprived" ],
-     "desc": [ "Your sleep debt has been steadily increasing for a while.  You should get some rest." ],
-     "rating": "bad",
-+    "permanent": true,
-     "max_intensity": 100,
-     "int_dur_factor": 480,
-     "resist_effects": [ "meth" ],
-@@ -1405,7 +1406,7 @@
-   {
-     "type": "effect_type",
-     "id": "music",
--    "permanent": true
-+    "max_duration": "1 s"
-   },
-   {
-     "type": "effect_type",
-- 
cgit v1.2.1