diff options
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | ammo-01_inconsistent-ammo-names.patch | 2 | ||||
| -rw-r--r-- | recipes-03_seperate-leather-recipes.patch | 10 |
3 files changed, 18 insertions, 3 deletions
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202112191356 _pkgver=2021-12-19-1356 -pkgrel=1 +pkgrel=2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -54,6 +54,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "recipes-01_fix-brioche-cooking-time.patch" "recipes-02_4570-dragon-can-be-dismantled.patch" + "recipes-03_seperate-leather-recipes.patch" "terrain-01_quiverfull-house-correct-stairs.patch" "terrain-02_tacoma-barn-door-position.patch" @@ -98,7 +99,7 @@ b2sums=('14efdbb916a59346c33da47cc91c1884ea091e7e7081690023f1e732024bbc4494e3629 '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' - '34dacfc4f338b68ecbb449e4726dc77a6876aae1c4ac31e0df4526a4df237d43ff3dcdd1d77d9266fb74d96f36b36fb93bbf1992e827504a313fdd1f3bfaf0ed' + '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988' '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504' '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d' '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef' @@ -115,6 +116,7 @@ b2sums=('14efdbb916a59346c33da47cc91c1884ea091e7e7081690023f1e732024bbc4494e3629 'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768' '8eef73575981d10a6a8734afc0e284ec7125db24bf666ff943938a4df87dedbd9ac622ea51bb71b5aaff7b1cc75627258bcfdc8659b915c09c82d3561fde1f62' '71768899e631c5293d5fb8bcb237ca54f880913b6400d445c8a0322cb69801fe85b94b1293306e2f33fac6067cbd892c4665b9563bdc9ff4df5be245c7e7108f' + 'f5bd9a10f5d1b78a3d3b80c6b374227b6f8e189a0fc83c72bf30ff3f45c25a60cacf3a90cbbde9f2bd2d5dc9ae0943f6cb57d6419d01fd1053487a5f490dd9fd' '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' @@ -257,6 +259,9 @@ prepare() { # Fix reloaded 45-70 rounds and reloaded dragon shot not allowing dismantling when every other non-caseless round does. patch -Np1 -i "$srcdir"/recipes-02_4570-dragon-can-be-dismantled.patch + # Fix the leather from fur recipe to have a seperate suffix than the leather from cured hide recipe. + patch -Np1 -i "$srcdir"/recipes-03_seperate-leather-recipes.patch + # # terrain and overmap fixes echo "Applying terrain and overmap fixes" diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch index 2c55e7f..9d12fbc 100644 --- a/ammo-01_inconsistent-ammo-names.patch +++ b/ammo-01_inconsistent-ammo-names.patch @@ -32,7 +32,7 @@ "copy-from": "556", "type": "AMMO", - "name": { "str": "5.56 NATO, reloaded" }, -+ "name": { "str": "5.56 NATO M885A1, reloaded" }, ++ "name": { "str": "5.56 NATO M855A1, reloaded" }, "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } diff --git a/recipes-03_seperate-leather-recipes.patch b/recipes-03_seperate-leather-recipes.patch new file mode 100644 index 0000000..c00864e --- /dev/null +++ b/recipes-03_seperate-leather-recipes.patch @@ -0,0 +1,10 @@ +--- a/data/json/recipes/other/materials.json ++++ b/data/json/recipes/other/materials.json +@@ -1148,6 +1148,7 @@ + { + "type": "recipe", + "result": "leather", ++ "id_suffix": "fur", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "survival", |