From 2e32db95af5e0be541194c44aa5153ac1de4f8e8 Mon Sep 17 00:00:00 2001
From: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:19:18 -0400
Subject: [PATCH] Scope lighthouse quest variables appropriately (#73097)

---
 .../Lighthouse_Family/NPC_lighthouse_man.json  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
index f54006153d32d..1d83abb83200a 100644
--- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
+++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
@@ -129,12 +129,12 @@
         "topic": "TALK_lighthouse_man_cleaned",
         "condition": {
           "and": [
-            { "npc_has_var": "count_cleaning_lighthouse_man", "value": "0" },
+            { "math": [ "n_count_cleaning_lighthouse_man", "==", "0" ] },
             "at_safe_space",
             { "npc_at_om_location": "lighthouse_ground" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }
       },
       {
         "text": "Yes.  First floor is clear.",
@@ -146,7 +146,7 @@
             { "npc_at_om_location": "lighthouse_z1" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }
       },
       {
         "text": "Yes.  Second floor is clear.",
@@ -158,7 +158,7 @@
             { "npc_at_om_location": "lighthouse_z2" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }
       },
       {
         "text": "Yes.  Third floor is clear.",
@@ -170,7 +170,7 @@
             { "npc_at_om_location": "lighthouse_z3" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }
       },
       {
         "text": "Yes.  Fourth floor is clear.",
@@ -182,7 +182,7 @@
             { "npc_at_om_location": "lighthouse_z4" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] }
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }
       },
       {
         "text": "Yes.  Top floor is clear.",
@@ -193,7 +193,7 @@
             { "npc_at_om_location": "lighthouse_z5" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] },
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] },
         "topic": "TALK_lighthouse_man_cleaned_done"
       },
       {
@@ -205,7 +205,7 @@
             { "npc_at_om_location": "lighthouse_ground" }
           ]
         },
-        "effect": { "math": [ "npc_count_cleaning_lighthouse_man", "++" ] },
+        "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] },
         "topic": "TALK_MISSION_INQUIRE"
       },
       { "text": "Not yet.", "topic": "TALK_DONE" }
@@ -353,7 +353,7 @@
       "effect": [
         "follow_only",
         { "npc_first_topic": "TALK_lighthouse_man_cleaning" },
-        { "math": [ "npc_count_cleaning_lighthouse_man", "=", "0" ] }
+        { "math": [ "n_count_cleaning_lighthouse_man", "=", "0" ] }
       ]
     },
     "end": {