From c91c5214972007062998c341c0e5b226eed9267b Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 25 Jan 2021 13:31:31 -0800 Subject: Merge CBM fixes into one patch Expand CBM fixes to scalpels and hearing --- 0008-npc-can-use-more-bionics.patch | 58 ++++++++++++++++++++++++++++++++++ 0008-npc-can-use-soporific.patch | 10 ------ 0009-22-casings-can-stack.patch | 17 ++++++++++ 0009-npc-can-use-gas-fuel.patch | 11 ------- 0010-22-casings-can-stack.patch | 17 ---------- 0010-4570-ammo-can-be-dismantled.patch | 34 ++++++++++++++++++++ 0011-4570-ammo-can-be-dismantled.patch | 34 -------------------- 0011-add-missing-mre.patch | 39 +++++++++++++++++++++++ PKGBUILD | 31 +++++++++--------- 9 files changed, 164 insertions(+), 87 deletions(-) create mode 100644 0008-npc-can-use-more-bionics.patch delete mode 100644 0008-npc-can-use-soporific.patch create mode 100644 0009-22-casings-can-stack.patch delete mode 100644 0009-npc-can-use-gas-fuel.patch delete mode 100644 0010-22-casings-can-stack.patch create mode 100644 0010-4570-ammo-can-be-dismantled.patch delete mode 100644 0011-4570-ammo-can-be-dismantled.patch create mode 100644 0011-add-missing-mre.patch diff --git a/0008-npc-can-use-more-bionics.patch b/0008-npc-can-use-more-bionics.patch new file mode 100644 index 0000000..57e4720 --- /dev/null +++ b/0008-npc-can-use-more-bionics.patch @@ -0,0 +1,58 @@ +--- a/data/json/bionics.json ++++ b/data/json/bionics.json +@@ -337,7 +337,7 @@ + "name": { "str": "Enhanced Hearing" }, + "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.", + "occupied_bodyparts": [ [ "HEAD", 3 ] ], +- "flags": [ "BIONIC_TOGGLED" ], ++ "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], + "included_bionics": [ "bio_earplugs" ] + }, + { +@@ -1000,7 +1000,8 @@ + "name": { "str": "Autonomous Surgical Scalpels" }, + "description": "A system of surgical grade scalpels is implanted on your fingers. They allow you to make automated precise cuts and can also be used as a high-quality butchering tool.", + "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "ARM_L", 1 ] ], +- "fake_item": "bio_scalpel" ++ "fake_item": "bio_scalpel", ++ "flags": [ "BIONIC_NPC_USABLE" ] + }, + { + "id": "bio_sunglasses", +@@ -1196,6 +1197,6 @@ + "name": { "str": "Soporific Induction" }, + "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus. It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.", + "occupied_bodyparts": [ [ "HEAD", 1 ] ], +- "flags": [ "BIONIC_TOGGLED" ] ++ "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ] + } + ] +--- a/data/json/items/bionics.json ++++ b/data/json/items/bionics.json +@@ -266,7 +266,7 @@ + }, + { + "id": "bio_ears", +- "copy-from": "bionic_general", ++ "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": { "str": "Enhanced Hearing CBM" }, + "looks_like": "bio_int_enhancer", +@@ -741,7 +741,7 @@ + }, + { + "id": "bio_fuel_cell_gasoline", +- "copy-from": "bionic_general", ++ "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": { "str": "Gasoline Fuel Cell CBM" }, + "looks_like": "bio_int_enhancer", +@@ -839,7 +839,7 @@ + }, + { + "id": "bio_surgical_razor", +- "copy-from": "bionic_general", ++ "copy-from": "bionic_general_npc_usable", + "type": "BIONIC_ITEM", + "name": { "str": "Autonomous Surgical Scalpels CBM" }, + "looks_like": "bio_int_enhancer", diff --git a/0008-npc-can-use-soporific.patch b/0008-npc-can-use-soporific.patch deleted file mode 100644 index ea0f8db..0000000 --- a/0008-npc-can-use-soporific.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/json/bionics.json -+++ b/data/json/bionics.json -@@ -1196,6 +1196,6 @@ - "name": { "str": "Soporific Induction" }, - "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus. It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.", - "occupied_bodyparts": [ [ "HEAD", 1 ] ], -- "flags": [ "BIONIC_TOGGLED" ] -+ "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ] - } - ] diff --git a/0009-22-casings-can-stack.patch b/0009-22-casings-can-stack.patch new file mode 100644 index 0000000..4085863 --- /dev/null +++ b/0009-22-casings-can-stack.patch @@ -0,0 +1,17 @@ +--- a/data/json/items/generic/casing.json ++++ b/data/json/items/generic/casins.json +@@ -32,13 +32,9 @@ + { + "id": "22_casing_new", ++ "copy-from": "casing", + "type": "GENERIC", +- "category": "spare_parts", +- "price": 100, + "name": { "str": "unused .22 casing" }, +- "symbol": "=", +- "color": "yellow", + "description": "An unfired, like-new .22 round casing, with the primer still intact.", +- "material": [ "powder", "brass" ], + "volume": "3 ml", + "weight": "1 g" + }, diff --git a/0009-npc-can-use-gas-fuel.patch b/0009-npc-can-use-gas-fuel.patch deleted file mode 100644 index f7fc958..0000000 --- a/0009-npc-can-use-gas-fuel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/data/json/items/bionics.json -+++ b/data/json/items/bionics.json -@@ -741,7 +741,7 @@ - }, - { - "id": "bio_fuel_cell_gasoline", -- "copy-from": "bionic_general", -+ "copy-from": "bionic_general_npc_usable", - "type": "BIONIC_ITEM", - "name": { "str": "Gasoline Fuel Cell CBM" }, - "looks_like": "bio_int_enhancer", diff --git a/0010-22-casings-can-stack.patch b/0010-22-casings-can-stack.patch deleted file mode 100644 index 4085863..0000000 --- a/0010-22-casings-can-stack.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/data/json/items/generic/casing.json -+++ b/data/json/items/generic/casins.json -@@ -32,13 +32,9 @@ - { - "id": "22_casing_new", -+ "copy-from": "casing", - "type": "GENERIC", -- "category": "spare_parts", -- "price": 100, - "name": { "str": "unused .22 casing" }, -- "symbol": "=", -- "color": "yellow", - "description": "An unfired, like-new .22 round casing, with the primer still intact.", -- "material": [ "powder", "brass" ], - "volume": "3 ml", - "weight": "1 g" - }, diff --git a/0010-4570-ammo-can-be-dismantled.patch b/0010-4570-ammo-can-be-dismantled.patch new file mode 100644 index 0000000..3681df5 --- /dev/null +++ b/0010-4570-ammo-can-be-dismantled.patch @@ -0,0 +1,34 @@ +--- a/data/json/recipes/ammo/rifle.json ++++ b/data/json/recipes/ammo/rifle.json +@@ -385,6 +385,7 @@ + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, ++ "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "components": [ + [ [ "4570_casing", 1 ] ], +@@ -406,6 +407,7 @@ + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, ++ "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "components": [ + [ [ "4570_casing", 1 ] ], +@@ -426,6 +428,7 @@ + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, ++ "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "components": [ + [ [ "4570_casing", 1 ] ], +@@ -446,6 +449,7 @@ + "batch_time_factors": [ 60, 5 ], + "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], + "charges": 1, ++ "reversible": true, + "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ] + }, diff --git a/0011-4570-ammo-can-be-dismantled.patch b/0011-4570-ammo-can-be-dismantled.patch deleted file mode 100644 index 3681df5..0000000 --- a/0011-4570-ammo-can-be-dismantled.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/data/json/recipes/ammo/rifle.json -+++ b/data/json/recipes/ammo/rifle.json -@@ -385,6 +385,7 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -+ "reversible": true, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ - [ [ "4570_casing", 1 ] ], -@@ -406,6 +407,7 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -+ "reversible": true, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ - [ [ "4570_casing", 1 ] ], -@@ -426,6 +428,7 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -+ "reversible": true, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ - [ [ "4570_casing", 1 ] ], -@@ -446,6 +449,7 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -+ "reversible": true, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ], [ [ "lead", 9 ] ] ] - }, diff --git a/0011-add-missing-mre.patch b/0011-add-missing-mre.patch new file mode 100644 index 0000000..f776e12 --- /dev/null +++ b/0011-add-missing-mre.patch @@ -0,0 +1,39 @@ +--- a/data/json/itemgroups/Food/food.json ++++ b/data/json/itemgroups/Food/food.json +@@ -550,8 +550,10 @@ + { "item": "mre_cheesetort_box" }, + { "item": "mre_mushroomfettuccine_box" }, + { "item": "mre_mexicanchickenstew_box" }, ++ { "item": "mre_chickenburritobowl_box" }, + { "item": "mre_maplesausage_box" }, + { "item": "mre_ravioli_box" }, ++ { "item": "mre_pepperjackbeef_box" }, + { "item": "mre_hashbrownbacon_box" }, + { "item": "mre_lemontuna_box" }, + { "item": "mre_asianbeef_box" }, +--- a/data/json/npcs/items_generic.json ++++ b/data/json/npcs/items_generic.json +@@ -812,8 +812,10 @@ + [ "mre_cheesetort_box", 6 ], + [ "mre_mushroomfettuccine_box", 6 ], + [ "mre_mexicanchickenstew_box", 6 ], ++ [ "mre_chickenburritobowl_box", 6 ], + [ "mre_maplesausage_box", 6 ], + [ "mre_ravioli_box", 6 ], ++ [ "mre_pepperjackbeef_box", 6 ], + [ "mre_hashbrownbacon_box", 6 ], + [ "mre_lemontuna_box", 6 ], + [ "mre_asianbeef_box", 6 ], +--- a/data/json/npcs/NC_SOLDIER.json ++++ b/data/json/npcs/NC_SOLDIER.json +@@ -162,8 +162,10 @@ + { "item": "mre_cheesetort_box", "prob": 45 }, + { "item": "mre_mushroomfettuccine_box", "prob": 45 }, + { "item": "mre_mexicanchickenstew_box", "prob": 45 }, ++ { "item": "mre_chickenburritobowl_box", "prob": 45 }, + { "item": "mre_maplesausage_box", "prob": 45 }, + { "item": "mre_ravioli_box", "prob": 45 }, ++ { "item": "mre_pepperjackbeef_box", "prob": 45 }, + { "item": "mre_hashbrownbacon_box", "prob": 45 }, + { "item": "mre_lemontuna_box", "prob": 45 }, + { "item": "mre_asianbeef_box", "prob": 45 }, diff --git a/PKGBUILD b/PKGBUILD index 07802a1..013fbdd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles) pkgname=cataclysm-dda pkgver=0.E.3 _pkgver=0.E-3 -pkgrel=1.18 +pkgrel=1.20 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -38,10 +38,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/ "0005-lumbermill-gasoline-not-spilled.patch" "0006-community-garden-fertilizer-not-spilled.patch" "0007-oxyacetylene-from-oxygen.patch" - "0008-npc-can-use-soporific.patch" - "0009-npc-can-use-gas-fuel.patch" - "0010-22-casings-can-stack.patch" - "0011-4570-ammo-can-be-dismantled.patch" + "0008-npc-can-use-more-bionics.patch" + "0009-22-casings-can-stack.patch" + "0010-4570-ammo-can-be-dismantled.patch" + "0011-add-missing-mre.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" @@ -66,10 +66,10 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d' - '9cf47504583e16ba2a826bf9431f83ffd57121becb7980bbfb6996929a6bbb5a872cd2c310c4e1d457d59205b0abac306291722aba27ab7fa5a0bf45314d8b56' - '20fbcff9879bdc06a40f56289396a03a9d6fad8aaa7ade0154c6397c0e842d0d4e12aa05fa305153bab0cffdaea670cc91882b8def07f5f422bf010c7fbbc806' + '23a13fccf6514caa6ca23476fe2ce6df180720038c4bb2caa971ef42b31f214b07ed95650d2cb3df173590c8bec02986aced516a6b266cff557b5dcfb7d8ce48' 'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c' 'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4' + '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' 'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483' 'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904' @@ -121,17 +121,18 @@ prepare() { # Fix oxyacetylene to be craftable from oxygen tanks patch -Np1 -i "$srcdir"/0007-oxyacetylene-from-oxygen.patch - # Fix npc not being able to install soporific inducer - patch -Np1 -i "$srcdir"/0008-npc-can-use-soporific.patch - - # Fix npc not being able to install gasoline fuel cell - patch -Np1 -i "$srcdir"/0009-npc-can-use-gas-fuel.patch + # Fix npc not being able to install some additional CBMs: + # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels + patch -Np1 -i "$srcdir"/0008-npc-can-use-more-bionics.patch # Fix .22 casings not stacking when every other casing stacks - patch -Np1 -i "$srcdir"/0010-22-casings-can-stack.patch + patch -Np1 -i "$srcdir"/0009-22-casings-can-stack.patch + + # Fix reloaded 45-70 rounds not allowing dismantling when every other non-caseless does + patch -Np1 -i "$srcdir"/0010-4570-ammo-can-be-dismantled.patch - # Fix reloaded 45-70 rounds not allowing dismantling - patch -Np1 -i "$srcdir"/0011-4570-ammo-can-be-dismantled.patch + # Fix the pepperjack beef and burrito bowl MREs never dropping + patch -Np1 -i "$srcdir"/0011-add-missing-mre.patch # Various other fixes for bugs I came across that modify src -- cgit v1.2.1