Merge pull request #821 from Logg-y/master

Reposition Wanev's tower portal, minor script fixes
The-Frozen-North · Nov 20, 2023 · 0662574 · 0662574
2 parents 2bc2bf9 + 3d1a2ab
commit 0662574
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/git/pl_eastplains_t3.git.json b/src/git/pl_eastplains_t3.git.json
@@ -32039,15 +32039,15 @@
         },
         "XPosition": {
           "type": "float",
-          "value": 15.4743
+          "value": 15.2979
         },
         "YOrientation": {
           "type": "float",
           "value": 0.0
         },
         "YPosition": {
           "type": "float",
-          "value": 54.2816
+          "value": 64.1631
         },
         "ZOrientation": {
           "type": "float",

diff --git a/src/nss/dev_xpvalues.nss b/src/nss/dev_xpvalues.nss
@@ -7,6 +7,8 @@
 
 void RunOnArea(object oArea)
 {
+    ExecuteScript("area_cleanup", oArea);
+    ExecuteScript("area_refresh", oArea);
     int nOldInstructionLimit = NWNX_Util_GetInstructionLimit();
     NWNX_Util_SetInstructionLimit(52428888);
 
@@ -49,7 +51,7 @@ void RunOnArea(object oArea)
         sLogEntry += "," + FloatToString(fThis, 8, 2);
     }
 
-    WriteTimestampedLogEntry(sLogEntry);
+    DelayCommand(60.0f, WriteTimestampedLogEntry(sLogEntry));
 
     NWNX_Util_SetInstructionLimit(nOldInstructionLimit);
 }
@@ -71,8 +73,8 @@ void main()
     SendMessageToAllDMs(GetName(oDev) + " is running dev_xpvalues");
     SendDiscordLogMessage(GetName(oDev) + " is running dev_xpvalues");
 
-    WriteTimestampedLogEntry("========================================");
-    WriteTimestampedLogEntry("areatag,areacr,2,3,4,5,6,7,8,9,10,11,12");
+    DelayCommand(60.0f, WriteTimestampedLogEntry("========================================"));
+    DelayCommand(60.0f, WriteTimestampedLogEntry("areatag,areacr,2,3,4,5,6,7,8,9,10,11,12"));
 
 	int nAreaIndex = 0;
 	float fDelay = 0.1*nAreaIndex;

diff --git a/src/nss/inc_areadist.nss b/src/nss/inc_areadist.nss
@@ -169,14 +169,14 @@ void PrepareAreaTransitionDB()
     int nHash = NWNX_Util_Hash(JsonDump(jDist));
 
     int nSavedHash = 0;
+    // This will throw an error if the db doesn't exist. But the db should in theory always exist
+    // unless we change how we handle seeded dbs
     sqlquery sql = SqlPrepareQueryCampaign("areadistances", "SELECT hash from areadistshash;");
     if (SqlStep(sql))
     {
         nSavedHash = SqlGetInt(sql, 0);
     }
 
-    if (_ShouldAbortAreaDistOnError(SqlGetError(sql))) return;
-
     //if (0)
     if (nSavedHash == nHash)
     {