From 956c8561f20981196b36ece6684015992ce66ad7 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 5 Feb 2022 10:04:48 -0800
Subject: Fix linting on lighthouse family patch v2

---
 npc-07_lighthouse-family_v2.patch | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

(limited to 'npc-07_lighthouse-family_v2.patch')

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 ] }
-- 
cgit v1.2.1