From 50e8edafa5dde7664363cbc2f30d255f14bc3322 Mon Sep 17 00:00:00 2001
From: ReznoRMichael <mic3arena@gmail.com>
Date: Sat, 13 Feb 2021 22:02:33 +0100
Subject: [PATCH] merging Zote and Nailsmith initial

---
 src/js/HKCheckCompletion.js | 30 ++++++++++++++++++++++++++++--
 src/js/hk-database.js       | 20 ++++++++++++++------
 src/partials/analytics.html |  2 +-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/js/HKCheckCompletion.js b/src/js/HKCheckCompletion.js
index 7ce05ae..61bee8c 100644
--- a/src/js/HKCheckCompletion.js
+++ b/src/js/HKCheckCompletion.js
@@ -922,10 +922,36 @@ function CheckAdditionalThings(divId, dataObject, playerData, worldData, sceneDa
                 if (playerData[i] === false && playerData.killedVoidIdol_3 === true) CurrentDataTrue();
                 break;
             case "greyPrinceDefeated":
-            case "zoteDead":
-            case "nailsmithSpared":
                 (playerData[i] === true) ? CurrentDataTrue(): CurrentDataBlank();
                 break;
+            case "zoteStatus":
+                if (playerData.zoteDead === true) {
+                    textPrefix = dataObject[i].nameNeglect;
+                    textSuffix = dataObject[i].spoilerNeglect;
+                    CurrentDataTrue();
+                }
+                else if (playerData.zoteDefeated === true) {
+                    textPrefix = dataObject[i].nameRivalry;
+                    textSuffix = dataObject[i].spoilerRivalry;
+                    CurrentDataTrue();
+                }
+                else if (playerData.zoteRescuedBuzzer === false) {
+                    CurrentDataBlank();
+                    if (playerData.hasWalljump === false) {
+                        textPrefix = dataObject[i].nameTrappedVengefly;
+                        textSuffix = dataObject[i].spoilerTrappedVengefly;
+                    }
+                    else {
+                        textPrefix = dataObject[i].nameNotRescuedVengefly;
+                        textSuffix = dataObject[i].spoilerNotRescuedVengefly;
+                    }
+                }
+                else {
+                    CurrentDataFalse();
+                }
+                break;
+            case "nailsmithStatus":
+                break;
             case "mrMushroomState":
                 CheckMrMushroomState(divId, dataObject[i], playerData[i]);
                 break;
diff --git a/src/js/hk-database.js b/src/js/hk-database.js
index be65b46..e2b2432 100644
--- a/src/js/hk-database.js
+++ b/src/js/hk-database.js
@@ -955,13 +955,21 @@ const HK = {
             name: "Embrace the Void",
             spoiler: "Godhome: Pantheon of Hallownest"
         },
-        zoteDead: {
-            name: "Optimal Zote",
-            spoiler: "Neglect achievement (per save choice)"
+        zoteStatus: {
+            name: "Zote Status",
+            nameNeglect: "Zote Status",
+            nameRivalry: "Zote Status",
+            spoiler: "Neglect achievement (per save choice)",
+            spoilerNeglect: "Neglect achievement (per save choice)",
+            spoilerRivalry: "Neglect achievement (per save choice)",
         },
-        nailsmithSpared: {
-            name: "Optimal Nailsmith",
-            spoiler: "Happy Couple achievement (per save choice)"
+        nailsmithStatus: {
+            name: "Nailsmith Status",
+            nameHappyCouple: "Nailsmith Status",
+            namePurity: "Nailsmith Status",
+            spoiler: "Happy Couple achievement (per save choice)",
+            spoilerHappyCouple: "Happy Couple achievement (per save choice)",
+            spoilerPurity: "Happy Couple achievement (per save choice)",
         },
         mrMushroomState: {
             name: "Mr Mushroom",
diff --git a/src/partials/analytics.html b/src/partials/analytics.html
index 0807164..4fd04f9 100644
--- a/src/partials/analytics.html
+++ b/src/partials/analytics.html
@@ -2,7 +2,7 @@
 <script async src="https://www.googletagmanager.com/gtag/js?id=<%= ga_property_id %>"></script>
 <script>
     // Temporarily disable the tracking for testing (set to false to enable Analytics)
-    window['ga-disable-<%= ga_property_id %>'] = false;
+    window['ga-disable-<%= ga_property_id %>'] = true;
 
     window.dataLayer = window.dataLayer || [];