From 5c4749bc89816254de70626810ba8ee9949851e4 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 31 Jul 2020 00:58:25 -0700 Subject: Convert the bug fix mods into patches --- PKGBUILD | 41 ++++++++++++++++++++++++----------------- ammo_pouch.diff | 11 +++++++++++ emit.diff | 20 ++++++++++++++++++++ house_quiverfull.diff | 11 +++++++++++ 4 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 ammo_pouch.diff create mode 100644 emit.diff create mode 100644 house_quiverfull.diff diff --git a/PKGBUILD b/PKGBUILD index ce1a596..00b4820 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # # I maintain this because: # Arch version lacks additional optimization and hardening flags # Arch version has non-functional desktop file -# Arch version lacks the MSX++UnDeadPeopleEdition tileset +# Arch version lacks the MSX++UnDeadPeopleEdition Legacy tileset # Arch version lacks the @ soundpack # Arch version lacks the CO.AG musicpack # Arch version lacks my custom mods @@ -14,7 +14,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles) pkgname=cataclysm-dda pkgver=0.E.2 _pkgver=0.E-2 -pkgrel=1.28 +pkgrel=1.31 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -27,11 +27,12 @@ makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle') source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$_pkgver.tar.gz" "cataclysm-dda.desktop" "cataclysm-dda-tiles.desktop" - "cataclysm-dda-tileset_msx-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_msx-tileset.git/snapshot/cataclysm-dda-tileset_msx-tileset-master.tar.xz" - "cataclysm-dda-mod_msx-tileset-fix.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_msx-tileset-fix.git/snapshot/cataclysm-dda-mod_msx-tileset-fix-master.tar.xz" + "emit.diff" + "house_quiverfull.diff" + "ammo_pouch.diff" + "cataclysm-dda-tileset_undeadpeople-legacy.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople-legacy.git/snapshot/cataclysm-dda-tileset_undeadpeople-legacy-master.tar.xz" "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" - "cataclysm-dda-mod_backport_heatercooler-fix.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_backport_heatercooler-fix.git/snapshot/cataclysm-dda-mod_backport_heatercooler-fix-master.tar.xz" "cataclysm-dda-mod_hack-fix.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_hack-fix.git/snapshot/cataclysm-dda-mod_hack-fix-master.tar.xz" "cataclysm-dda-mod_faction-camp-recipe-expansion.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_faction-camp-recipe-expansion.git/snapshot/cataclysm-dda-mod_faction-camp-recipe-expansion-master.tar.xz" "cataclysm-dda-mod_recipe-fixes.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_recipe-fixes.git/snapshot/cataclysm-dda-mod_recipe-fixes-master.tar.xz" @@ -43,18 +44,19 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5565c86a4efc528f8b6a429a2e9ca6b3a905d5877a3edb4cd150c50638' '8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1' '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8' - 'f60449d33535b3b9fc4f9f5ff9fc2e1dae76af81965e1f12bac1e2e8408501bdec1f47a79131a88626103deaf34ba9b0edc360e363e074b4036f86f8d13dae1c' - '6a941cd69fc34ea30acbff5cec9184e696012d05f4c60e9fc8d4f59d2b0ac9122df234d6006a90863503a54568a168c1ad92c0a7c544a23015f9c0465073fead' + '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67' + '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' + 'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b' + '98051211d71f887f230252638c49bde3f293072c0c21ea7f97c34a92837debc24d70f6579a1acf57f3d4dc6c6a815fa9ddd2e0572c0d9fee3e302fcad4762522' 'f2260095156b10136aad79df6155ce3f78b5ab94be5f394bec9f11925921d4a1505ae7dc0a32e7434b28a1bea2c489206c62450af9027574ba882ac9356f6620' '353fed5883383063b2b2d3a81f3a5d5364a0351d037f5456e9d89d4eeee3b20b3e1f9c74c3d458193deb8ac1fa41d73d86e8364a623a6344c32c55437f362d4b' - '20b6ddfe8d3296a5ebdc2bf027e1e4871480dc02069712689a02c032b3f4587287f46a3969cd097bae55fbfbf7d9d21c6bb06b84bcbf1ba40a95d0cfb432d1a2' '36625d21245d5bb9769b1e7916ed8d644cdf56efa1c64c15c8b76d9cd90cdfa7c35324bebdf71426687d6f18b53aa1fb9675d0ba1ea93432ad001b0a54615682' '083713ad07d085bc9120812a354f294bcad12cf4b53a0e6da52bccc2a7319490740191740affb658b2ba2b3de91dda081e62e948bbe62b8f6e2f4613f71a0687' 'f9f5975639792afb2411cec7d9e8580c9a82b1e1aaa38d7df9ebeae6d5aee36e061e4fbbf2836e538bd58898bda4062df201eb2abbc2009500a8b77e0c249074' 'ef41120eeaa0ea584a5efbed55cbd48814cadbb2ea0ca1b063032375841bb9b8aa6fb07b636811f5ca24ee1995333e5515c4143380d6e85e6cc0f4e50006e6d1' '0b743bc6c8c187ab876ab972676cee7f0d7e7a46b3e73fc9f77b7d86eae2eddb5a970bb02215ea0ff5de5f9b94322cb97b6803e2b9fd526b9438d779dcb845c1' 'e5d405c8699ac94839669b3f91039d27a92a80edff0ba3638da10937092b3987bf6d77eb460b34d6258d6a642638f2b927381f0f6acb56ea7d90399cb1e8bde8' - '1389fd46a92b191d2814530ff8c86ee85fffff3b0a5c34c40520bbd50f7ed65c51c4d994c32aea80166ef22f643b4423e70a2af37111513c0d26d09465f9c9f5') + '5670a45e5e4f755c28ed29be4c6a2d62611f20ef03d1fc5ddb1be4cff14b20911af7b73d0110e45428a2e3c1caa471e8ad6f6f28fbac2bea44fc4aa1d0b98a45') # official docs say to use lua51 # but makefile supports lua52? @@ -67,6 +69,17 @@ prepare() { #sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp} sed -i 's/shell git/shell false/' Makefile sed -i 's/-Os/-O3/' Makefile + + + # Hotfixes + # Fix Vehicle Heater and Cooler to be less severe + patch -Np1 -i "$srcdir"/emit.diff + + # Fix Quiverfull house to have the correct stairs + patch -Np1 -i "$srcdir"/house_quiverfull.diff + + # Fix Ankle Ammo Pouch to not look like a backpack + patch -Np1 -i "$srcdir"/ammo_pouch.diff } build() { @@ -96,9 +109,6 @@ package_cataclysm-dda() { cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md" # Mods - mv "$srcdir/cataclysm-dda-mod_backport_heatercooler-fix-master" "$srcdir/backport_heatercooler-fix" - cp --reflink -r "$srcdir/backport_heatercooler-fix" "$pkgdir/usr/share/cataclysm-dda/mods" - mv "$srcdir/cataclysm-dda-mod_hack-fix-master" "$srcdir/hack-fix" cp --reflink -r "$srcdir/hack-fix" "$pkgdir/usr/share/cataclysm-dda/mods" @@ -142,11 +152,8 @@ package_cataclysm-dda-tiles() { install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Mods - mv "$srcdir/cataclysm-dda-tileset_msx-tileset-master" "$srcdir/msx-tileset" - cp --reflink -r "$srcdir/msx-tileset" "$pkgdir/usr/share/cataclysm-dda/gfx" - - mv "$srcdir/cataclysm-dda-mod_msx-tileset-fix-master" "$srcdir/msx-tileset-fix" - cp --reflink -r "$srcdir/msx-tileset-fix" "$pkgdir/usr/share/cataclysm-dda/mods" + mv "$srcdir/cataclysm-dda-tileset_undeadpeople-legacy-master" "$srcdir/undeadpeople-legacy" + cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-dda/gfx" mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack" cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-dda/sound" diff --git a/ammo_pouch.diff b/ammo_pouch.diff new file mode 100644 index 0000000..85c7833 --- /dev/null +++ b/ammo_pouch.diff @@ -0,0 +1,11 @@ +--- a/data/json/items/armor/ammo_pouch.json ++++ b/data/json/items/armor/ammo_pouch.json +@@ -192,7 +192,7 @@ + "price_postapoc": 4500, + "material": "cotton", + "symbol": "[", +- "looks_like": "ragpouch", ++ "looks_like": "boostrap", + "color": "dark_gray", + "covers": [ "FOOT_EITHER" ], + "coverage": 5, diff --git a/emit.diff b/emit.diff new file mode 100644 index 0000000..c3d16d5 --- /dev/null +++ b/emit.diff @@ -0,0 +1,20 @@ +--- a/data/json/emit.json ++++ b/data/json/emit.json +@@ -185,7 +185,7 @@ + { + "id": "emit_heater_vehicle", + "type": "emit", +- "field": "fd_hot_air3", ++ "field": "fd_hot_air2", + "intensity": 3, + "qty": 3, + "chance": 100 +@@ -193,7 +193,7 @@ + { + "id": "emit_cooler_vehicle", + "type": "emit", +- "field": "fd_cold_air3", ++ "field": "fd_cold_air2", + "intensity": 3, + "qty": 3, + "chance": 100 diff --git a/house_quiverfull.diff b/house_quiverfull.diff new file mode 100644 index 0000000..ad40706 --- /dev/null +++ b/house_quiverfull.diff @@ -0,0 +1,11 @@ +--- a/data/json/mapgen/house/house_quiverfull.json ++++ b/data/json/mapgen/house/house_quiverfull.json +@@ -29,7 +29,7 @@ + "%or E|R y| h F#.", + "%# + + O#.", + ".# |||R R|J 5o.", +- ".#HHsHH|< R|n 4o.", ++ ".#HHsHH|> R|n 4o.", + ".#|||||| |R R|JJ 123#.", + ".#q+ ||||+|||#.", + ".#q+ + d#.", -- cgit v1.2.1