Fix linting on lighthouse family patch v2

2 files changed, 10 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4f60a39..5275ad7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,11 +65,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "npc-04_island-prison-update.patch"
         "npc-05_kindred-update.patch"
         "npc-06_lapin-update.patch"
-        "npc-07_lighthouse-family.patch"
         "npc-07_lighthouse-family_v2.patch"
         #"npc-nn_refugee.patch"
         #"npc-nn_robofac.patch"
-        #"npc-nn_lighthouse-family.patch"
         "npc-10_dialogue-fixes.patch"
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
@@ -142,8 +140,7 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
-        'ed5b2c6ef223a253039d22f55f6ab6039b1caad33c7874ff1f67f7c2aaa7dd8552b81d578ba504a1aec66a81fb454269673dd9e782b2ba7b89e42c7744a94e32'
-        'aec8bd50d9c0ae2b19a4191984d8b202cb4fe457b61861d379fe4d765392e33475b74466be9387602cfcc39bbce3092808aeeb18b1975022828d6098f0771b20'
+        'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -325,9 +322,7 @@ prepare() {
   patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch
 
   # Port the lighthouse family from DDA
-  # Removed the repair lighthouse quest as it relies on new json functions :/
   # Hack in some effects to use as timers and probe NPC mechanic skill.
-  #patch -Np1 -i "$srcdir"/npc-07_lighthouse-family.patch
   patch -Np1 -i "$srcdir"/npc-07_lighthouse-family_v2.patch
 
   # Port the updates to Free Merchant Center from DDA
diff --git a/npc-07_lighthouse-family_v2.patch b/npc-07_lighthouse-family_v2.patch
index 386a246..0b46f0b 100644
--- a/npc-07_lighthouse-family_v2.patch
+++ b/npc-07_lighthouse-family_v2.patch
@@ -124,7 +124,7 @@
 +]
 --- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
 +++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
-@@ -0,0 +1,492 @@
+@@ -0,0 +1,487 @@
 +[
 +  {
 +    "type": "npc",
@@ -198,12 +198,7 @@
 +      {
 +        "text": "Has anyone come recently?",
 +        "condition": { "u_has_var": "lighthouse_fixed", "type": "global", "context": "safe_space", "value": "yes" },
-+        "trial": {
-+          "type": "CONDITION",
-+          "condition": {
-+            "not": { "npc_has_effect": "lighthouse_survivor_delay" }
-+          }
-+        },
++        "trial": { "type": "CONDITION", "condition": { "not": { "npc_has_effect": "lighthouse_survivor_delay" } } },
 +        "success": {
 +          "topic": "TALK_lighthouse_man_survivors_yes",
 +          "effect": [
@@ -743,7 +738,7 @@
 +]
 --- a/data/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json
 +++ b/data/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,79 @@
 +[
 +  {
 +    "type": "talk_topic",
@@ -753,10 +748,7 @@
 +        "text": "You said that you have experience in electrical engineering…",
 +        "topic": "TALK_ENG_LIGHTHOUSE",
 +        "condition": {
-+          "and": [
-+            { "npc_has_skill": { "skill": "mechanics", "level": 6 } },
-+            { "u_has_mission": "MISSION_lighthouse_man_5" }
-+          ]
++          "and": [ { "npc_has_skill": { "skill": "mechanics", "level": 6 } }, { "u_has_mission": "MISSION_lighthouse_man_5" } ]
 +        }
 +      }
 +    ]
@@ -807,11 +799,7 @@
 +    },
 +    "speaker_effect": {
 +      "sentinel": "done",
-+      "condition": {
-+        "and": [
-+          { "not": { "npc_has_effect": "lighthouse_repairs_underway" } }
-+        ]
-+      },
++      "condition": { "not": { "npc_has_effect": "lighthouse_repairs_underway" } },
 +      "effect": { "u_add_var": "lighthouse_fixed", "type": "global", "context": "safe_space", "value": "ready" }
 +    },
 +    "responses": [
@@ -832,7 +820,7 @@
 +]
 --- a/data/json/npcs/Lighthouse_Family/npc_survivor.json
 +++ b/data/json/npcs/Lighthouse_Family/npc_survivor.json
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,43 @@
 +[
 +  {
 +    "type": "npc",
@@ -878,15 +866,13 @@
 +]
 --- a/data/json/npcs/Lighthouse_Family/effects.json
 +++ b/data/json/npcs/Lighthouse_Family/effects.json
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,20 @@
 +[
 +  {
 +    "type": "effect_type",
 +    "id": "lighthouse_survivor_delay",
 +    "name": [ "Asked about survivors" ],
-+    "desc": [
-+      "AI tag: for having recently asked an NPC about new people.  This is a bug if you have it."
-+    ],
++    "desc": [ "AI tag: for having recently asked an NPC about new people.  This is a bug if you have it." ],
 +    "max_intensity": 1,
 +    "int_dur_factor": "336 h",
 +    "base_mods": { "per_mod": [ 0 ] }
@@ -895,9 +881,7 @@
 +    "type": "effect_type",
 +    "id": "lighthouse_repairs_underway",
 +    "name": [ "Repairing lighthouse" ],
-+    "desc": [
-+      "AI tag: for repairing the lighthouse.  This is a bug if you have it."
-+    ],
++    "desc": [ "AI tag: for repairing the lighthouse.  This is a bug if you have it." ],
 +    "max_intensity": 1,
 +    "int_dur_factor": "48 h",
 +    "base_mods": { "per_mod": [ 0 ] }