Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reposition Wanev's tower portal, minor script fixes #821

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Reposition Wanev's tower portal, minor script fixes #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/git/pl_eastplains_t3.git.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions src/nss/dev_xpvalues.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -49,7 +51,7 @@ void RunOnArea(object oArea)
sLogEntry += "," + FloatToString(fThis, 8, 2);
}

WriteTimestampedLogEntry(sLogEntry);
DelayCommand(60.0f, WriteTimestampedLogEntry(sLogEntry));

NWNX_Util_SetInstructionLimit(nOldInstructionLimit);
}
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/nss/inc_areadist.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading