Add patches fot fix lumbermill and community garden liquid spills

3 files changed, 46 insertions, 8 deletions

diff --git a/0007-lumbermill-gasoline-not-spilled.patch b/0007-lumbermill-gasoline-not-spilled.patch
new file mode 100644
index 0000000..05e63ac
--- /dev/null
+++ b/0007-lumbermill-gasoline-not-spilled.patch
@@ -0,0 +1,11 @@
+--- a/data/json/mapgen/lumbermill.json
++++ b/data/json/mapgen/lumbermill.json
+@@ -51,7 +51,7 @@
+         "v        2    __________________________________",
+         "v vvvvv    *___________________________1 1  ____",
+         "v vooov______________________   ____ 121   1   v",
+-        "v voGoV_____________ #.......#  ____ 1 1*1 1 1 v",
++        "v voooV_____________ #.......#  ____ 1 1*1 1 1 v",
+         "v vooov_________     #L.....L#* ____*  1 1 1 2 v",
+         "v vvvvv   ______  * *wL.....Lw   ____1 1 1 1  *v",
+         "v         1____ 2    #L.....L# * ____1 1*  1   v",
diff --git a/0008-community-garden-fertilizer-not-spilled.patch b/0008-community-garden-fertilizer-not-spilled.patch
new file mode 100644
index 0000000..dfc3d29
--- /dev/null
+++ b/0008-community-garden-fertilizer-not-spilled.patch
@@ -0,0 +1,17 @@
+--- a/data/json/mapgen/garden_community.json
++++ b/data/json/mapgen/garden_community.json
+@@ -141,10 +141,10 @@
+         "|": "f_null"
+       },
+       "place_liquids": [
+-        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 4, "y": 4 },
+-        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 4, "y": 5 },
+-        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 5, "y": 4 },
+-        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 5, "y": 5 }
++        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 9, "y": 9 },
++        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 10, "y": 9 },
++        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 9, "y": 10 },
++        { "liquid": "fertilizer_liquid", "chance": 1, "amount": [ 2, 3 ], "x": 10, "y": 10 }
+       ],
+       "items": { "D": { "item": "hydro", "chance": 15 }, "#": { "item": "hydro", "chance": 15 } },
+       "place_items": [
diff --git a/PKGBUILD b/PKGBUILD
index d5f37cb..05c95fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.2
 _pkgver=0.E-2
-pkgrel=1.49
+pkgrel=1.57
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -35,6 +35,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/
         "0004-tacoma-clinic-add-missing-floor.patch"
         "0005-allow-bio-firestarter-on-smoker.patch"
         "0006-npcs-eat-when-hungry.patch"
+        "0007-lumbermill-gasoline-not-spilled.patch"
+        "0008-community-garden-fertilizer-not-spilled.patch"
         "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"
@@ -59,18 +61,20 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483'
         'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904'
-        '6af4597a1dfa9eeebc41d3fc17b0d48115ea948510917c114528ba37643354d1c8472fb3d92d59f408be10ea396704a6ad7234df02be7970a59275b057bd6105'
-        'd04461b7126e3f7c49590fbace0960a5fbd29f30f598c37a88252bcb6c2b00ee9ebf2149565cf6a1de935fc278c60524c710b370d69dd4c1527a68bd0a0f48ba'
-        '353fed5883383063b2b2d3a81f3a5d5364a0351d037f5456e9d89d4eeee3b20b3e1f9c74c3d458193deb8ac1fa41d73d86e8364a623a6344c32c55437f362d4b'
+        '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
+        '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
+        '7238e8642bbe469ecf68c577d96a772545f3a8c0917219cc18e952e2bce649a5412f77207103fb6865f4d2f34ae4d3034baf5f8adef160d4cd0402ea2d67c7b7'
+        '499145e380d5e02cbe8f6f370ea102d2334d9df8b9bea51f62921b3f16bd5c1d2826470d082d25e56cf3ef0af3614880fae943c009c9bc690fdc78874dabca13'
+        'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb'
         '7287a10e71580c6924956f18d3f14c21a22bc80f9f40b9e8baa46e7f0c37367cd595879a41fdcd4ca2a27b517a8dfe77c23e71d136154636a14469685987ad99'
         'be7eb543443b5b90b539fc2149572544f127951bf281ae8f01aff196b5a3b89abc71e4b34f763ff159fa575a8b070b4f3e2cbd0aece434c98a1a4c327fc8870f'
-        'b9b80381b16d6a0758da8c39dd4f27fcc89fbd05b2e31bdd943d3924270c0217bd7a59fd43222de67a368ecba0721eb075ffaaa464281fc5fb080339aaf493e9'
-        '0a3d92f96e8e5e35928ffb421a95805f6953d1c1cb7f7aaab990d3f0091a8eaefe02624c8a303b09a90a736e1da60b754287346ce609f8db6ed558005de31852'
+        '4b199afe065962fc9ef660b2bce1be51a246aa2930005ce224f633a515c7b5748d8ee8b3900026305d1b5f2148bf184d06394adc65af19c802e5ac6dcbbd01ec'
+        'bd60ac7679feb0a54f123bbfec1315bd2c47c0caaf860ea58522394ddd2c7958e108c3f0245807c307007229480a26b7af0a84119c90acec193093187851adbc'
         '0df5b69f4e56d41cdfc8365d2eda8361ec0dd8f474b578c9f90f7764b803fc63adaff1c4d7d2ebfcbd30a5e210a8836a03267531cb328e5629d96ea491e39ef9'
         '2bdeb26873ad4ae8c8e202b1f76e411cc30ddf460d593d127ed0babb4466c9cb3848bd9440a668af046a13f3634245333dfc6e628988488bc40eae364b9c849d'
-        '1ba3f9b94d75aaa2b836caf30b8a3d677a551ace1c581a9a41270b9b9b8cf47966900a3d8ea6491bfc826b28ef012586a5bbefb0b6a4732bb5375a9c718c3caf'
+        '135e962bcd5f5141c896f3edbad3aac7498f6a1be8ed8d926738e0064968e76437d1b25a794c11b96863c8cf9033b6b2060600f67ae4bba3a72cd32d789496ad'
         'a074d8c2a5a248568ae063b365b32ca731618053269e641f99d491edffe3123b700c9b155143a623615577b734662eb6b8048014fadf182a6e67ce4834132af6'
-        '281bb2c14b65a050ab81e0082c41afa6a1fb2c092b949d11a6ff30501223dfb53c8ae02b99a4c50b8f41bef3fc15c3272532b1b87daeb2c6ccd14545a2e38a26')
+        'ce6e6c6d90b96d9314d5a5e1faeb278b9b2f322f6dda81b55f688a2fe790188f7a185cb67449105176f9ef6f3fbccf1953182432a53970468a91dbcac073838b')
 
 # official docs say to use lua51
 # but makefile supports lua52?
@@ -112,6 +116,12 @@ prepare() {
 
   # Fix NPCs not eating until they drop below normal weight and not becoming full from eating the basecamp stockpile
   patch -Np1 -i "$srcdir"/0006-npcs-eat-when-hungry.patch
+
+  # Fix lumbermill gasoline being spilled instead of being inside the gas pump
+  patch -Np1 -i "$srcdir"/0007-lumbermill-gasoline-not-spilled.patch  
+
+  # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks
+  patch -Np1 -i "$srcdir"/0008-community-garden-fertilizer-not-spilled.patch
 }
 
 build() {