From d7ead3030e294608b33a505b83cc6f46de2a8997 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 20 Apr 2021 12:41:15 -0700
Subject: Add patch for npcs not using certain doors Fix ankle ammo pouch patch

---
 0002-ankle-ammo-pouch-is-not-a-backpack.patch |  2 +-
 0012-fix-doors-for-npcs.patch                 | 20 ++++++++++++++++++++
 PKGBUILD                                      | 13 +++++++++----
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 0012-fix-doors-for-npcs.patch

diff --git a/0002-ankle-ammo-pouch-is-not-a-backpack.patch b/0002-ankle-ammo-pouch-is-not-a-backpack.patch
index 85c7833..ca51551 100644
--- a/0002-ankle-ammo-pouch-is-not-a-backpack.patch
+++ b/0002-ankle-ammo-pouch-is-not-a-backpack.patch
@@ -5,7 +5,7 @@
      "material": "cotton",
      "symbol": "[",
 -    "looks_like": "ragpouch",
-+    "looks_like": "boostrap",
++    "looks_like": "bootstrap",
      "color": "dark_gray",
      "covers": [ "FOOT_EITHER" ],
      "coverage": 5,
diff --git a/0012-fix-doors-for-npcs.patch b/0012-fix-doors-for-npcs.patch
new file mode 100644
index 0000000..54f1f47
--- /dev/null
+++ b/0012-fix-doors-for-npcs.patch
@@ -0,0 +1,20 @@
+--- a/data/json/furniture_and_terrain/terrain-fences-gates.json
++++ b/data/json/furniture_and_terrain/terrain-fences-gates.json
+@@ -243,7 +243,7 @@
+     "color": "brown",
+     "looks_like": "t_chickenwire_gate_o",
+     "move_cost": 2,
+-    "flags": [ "TRANSPARENT", "DOOR", "PERMEABLE", "BURROWABLE", "CONNECT_TO_WALL" ],
++    "flags": [ "TRANSPARENT", "PERMEABLE", "BURROWABLE", "CONNECT_TO_WALL" ],
+     "close": "t_screen_door_c",
+     "deconstruct": {
+       "ter_set": "t_floor",
+@@ -732,7 +732,7 @@
+     "looks_like": "t_fencegate_o",
+     "move_cost": 1,
+     "coverage": 60,
+-    "flags": [ "TRANSPARENT", "DOOR", "BURROWABLE", "FLAT", "ROAD" ],
++    "flags": [ "TRANSPARENT", "BURROWABLE", "FLAT", "ROAD" ],
+     "connects_to": "WOODFENCE",
+     "close": "t_gate_metal_c",
+     "deconstruct": {
diff --git a/PKGBUILD b/PKGBUILD
index 60b6aa6..abccd5d 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=2.2
+pkgrel=2.4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -43,6 +43,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "0009-22-casings-can-stack.patch"
         "0010-4570-ammo-can-be-dismantled.patch"
         "0011-add-missing-mre.patch"
+        "0012-fix-doors-for-npcs.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -67,7 +68,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         'd429bdf583ba6a69814f3a33a983650bcaa61b8edaed6560491972478515adb996482af248b10df8b4435bfad487ecba6c2ca0a249a4daee54994117a2742055'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
-        'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
+        '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
         '3c180b3b8fed46a1f4bfd357fee3b8b541f1c86b073bbc6215ed0e4298a8d9c7527fda028227d0695c045d2198839d7042544a3467d6f8733e9ddabe884e3c2b'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
@@ -77,6 +78,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c'
         'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
+        '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
         'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
@@ -84,8 +86,8 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'ad4e4626e1e3358059c7023eff0ac38ca5e05eb4ff86449a649fc25c88c3ce4bc27bef317b62fe42398ae24845d109a4f77aad2ed3eb9e18f2388fe9ee87368f'
         'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278'
-        'ed4b1a6eb75479e7d4ed0db61c2f300b906b6c75e625c6cce09342c879a8dfafad46205a66e2fa8b707b01e12b3ad21e7fc92cf5e6a68b42c4b6cd91d85c023c'
-        '46a97f46d52362f486af47fcbbcc99c8b7a7e729e9a83cb049b332459657a910e5ebc4000d0d505523155a3716950685102857640c5bc6f84804b0a4d5d3fbbd'
+        '88e643e6b34119ddd7e3178d1974d5cbbcb4effb7a2a2768654745cab609e624090ff64f51166eee5d0eb531262c38664a2731f73ed44f7895142cd7279a87e9'
+        '0c9692d1065a5333784b42f1e961dde5ffec1ce06a6f86ed20830d85e0ed6882e400385bc4a9208f50afa6f8e37ef57731f9dce3983f550f8a5483c149541f65'
         '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40'
         'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -147,6 +149,9 @@ prepare() {
   # Fix the pepperjack beef and burrito bowl MREs never dropping
   patch -Np1 -i "$srcdir"/0011-add-missing-mre.patch
 
+  # Fix some doors being unusable by npcs (incorrect door flag)
+  patch -Np1 -i "$srcdir"/0012-fix-doors-for-npcs.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two
-- 
cgit v1.2.1