From 86e40b92b9966410c51519c6df14da50c21883c1 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 13 Nov 2020 16:28:47 -0800
Subject: Fix well patch

---
 ...e-firestation-shelter-wells-npc-drinkable.patch | 30 +++++++++++++++++-----
 PKGBUILD                                           |  2 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch b/0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch
index c9864c2..8eac7f0 100644
--- a/0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch
+++ b/0.F-backport-make-firestation-shelter-wells-npc-drinkable.patch
@@ -1,33 +1,51 @@
 --- a/data/json/recipes/basecamps/recipe_modular_firestation1.json
 +++ b/data/json/recipes/basecamps/recipe_modular_firestation1.json
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,13 @@
      "construction_blueprint": "fbmc_firestation1_well",
      "blueprint_name": "build a well",
      "blueprint_requires": [ { "id": "fbmc_firestation1_0" } ],
 -    "blueprint_provides": [ { "id": "fbmc_firestation1_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
-+    "blueprint_provides": [ { "id": "fbmc_firestation1_well" }, { "id": "water_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
++    "blueprint_provides": [
++      { "id": "fbmc_firestation1_well" },
++      { "id": "water_well" },
++      { "id": "relaying" },
++      { "id": "scouting" },
++      { "id": "patrolling" }
++    ],
      "blueprint_excludes": [ { "id": "fbmc_firestation1_well" } ],
      "blueprint_needs": {
        "time": "11 h",
 --- a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
 +++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,13 @@
      "construction_blueprint": "fbmc_shelter_1_well",
      "blueprint_name": "build a well",
      "blueprint_requires": [ { "id": "fbmc_shelter_1_fire" } ],
 -    "blueprint_provides": [ { "id": "fbmc_shelter_1_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
-+    "blueprint_provides": [ { "id": "fbmc_shelter_1_well" }, { "id": "water_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
++    "blueprint_provides": [
++      { "id": "fbmc_shelter_1_well" },
++      { "id": "water_well" },
++      { "id": "relaying" },
++      { "id": "scouting" },
++      { "id": "patrolling" }
++    ],
      "blueprint_excludes": [ { "id": "fbmc_shelter_1_well" } ],
      "blueprint_needs": {
        "time": "11 h",
 --- a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json
 +++ b/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,13 @@
      "construction_blueprint": "fbmc_shelter_well",
      "blueprint_name": "build a well",
      "blueprint_requires": [ { "id": "fbmc_shelter_fire" } ],
 -    "blueprint_provides": [ { "id": "fbmc_shelter_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
-+    "blueprint_provides": [ { "id": "fbmc_shelter_well" }, { "id": "water_well" }, { "id": "relaying" }, { "id": "scouting" }, { "id": "patrolling" } ],
++    "blueprint_provides": [
++      { "id": "fbmc_shelter_well" },
++      { "id": "water_well" },
++      { "id": "relaying" },
++      { "id": "scouting" },
++      { "id": "patrolling" }
++    ],
      "blueprint_excludes": [ { "id": "fbmc_shelter_well" } ],
      "blueprint_needs": {
        "time": "11 h",
diff --git a/PKGBUILD b/PKGBUILD
index af5cc28..4520aa3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,7 +60,7 @@ b2sums=('a2aa335a762573a8d41f0d0a908ffa16e5b3156aab29062a5e47a1a45d9d3ff793870c5
         '7d5a74fa2edb4c89e664419d818650ec45b6a3efde3617a49737af014b0aa438ff3bdb06b87f6d31ef1851cafdffa5f4c3947f104127d376c6ea4806190676ae'
         '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
-        '6c6968f47962f521a0bdf710f4d001f03b0b64002193b43115ee20581990298a066a95c942275496069fe928f99bca5fb7ed395f9e99dee0b3b8e3dcc80aaebc'
+        '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         'af47a9372ba990bc97d17362c8d89847177e6cbefaa241c23bcdc670ef29d82bf150983f4c730753cabaa77a01f8e966307831cdc192a92237d5f3e8e6599d2b'
         '3936f88fab90b344299a62bb5bc836d03b1bb8293d2ca4cbb8a48468497119db2174f2b37a1775c0aed1be07107c4ae815f6308efa633abf76bbd6ba458ff66b'
-- 
cgit v1.2.1