From 23268b01f3978cbe6b42a350df14bf8614ee4096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?= Date: Wed, 14 Oct 2020 21:01:36 -0700 Subject: [PATCH] formatting/minor wording --- MWSE/mods/celediel/NPCsGoHome/functions/checks.lua | 8 ++++---- MWSE/mods/celediel/NPCsGoHome/functions/processors.lua | 3 ++- MWSE/mods/celediel/NPCsGoHome/mcm.lua | 2 +- readme.md | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MWSE/mods/celediel/NPCsGoHome/functions/checks.lua b/MWSE/mods/celediel/NPCsGoHome/functions/checks.lua index 1256ac4..fe48129 100644 --- a/MWSE/mods/celediel/NPCsGoHome/functions/checks.lua +++ b/MWSE/mods/celediel/NPCsGoHome/functions/checks.lua @@ -306,11 +306,11 @@ this.isIgnoredDoor = function(door, homeCellId) -- don't lock doors to canton cells local isCantonWorks = common.isCantonWorksCell(dest) - log(common.logLevels.large, "[CHECKS] %s is %s, (%sin a city, is %spublic, %soccupied)", -- - dest.id, this.isIgnoredCell(dest) and "ignored" or "not ignored", -- destination is ignored - inCity and "" or "not ", leadsToPublicCell and "" or "not ", hasOccupants and "" or "un") -- in a city, is public, is ocupado - -- LuaFormatter off + log(common.logLevels.large, "[CHECKS] %s is %s, (%sin a city, is %spublic, %soccupied)", + dest.id, this.isIgnoredCell(dest) and "ignored" or "not ignored", + inCity and "" or "not ", leadsToPublicCell and "" or "not ", hasOccupants and "" or "un") + return this.isIgnoredCell(dest) or not this.isInteriorCell(dest) or isCantonWorks or diff --git a/MWSE/mods/celediel/NPCsGoHome/functions/processors.lua b/MWSE/mods/celediel/NPCsGoHome/functions/processors.lua index d7d1a47..bc55675 100644 --- a/MWSE/mods/celediel/NPCsGoHome/functions/processors.lua +++ b/MWSE/mods/celediel/NPCsGoHome/functions/processors.lua @@ -11,6 +11,7 @@ local function log(level, ...) if config.logLevel >= level then common.log(...) local this = {} -- iterators +-- in common maybe? local function iterateNPCs(cell) local function iterator() for npc in cell:iterateReferences(tes3.objectType.npc) do @@ -373,7 +374,7 @@ this.processDoors = function(cell) log(common.logLevels.large, "[PROC:DOOR] Now locked Status: %s", tes3.getLocked({reference = door})) end else - -- unlock + -- unlock, don't need all the extra overhead that comes along with checks.isIgnoredDoor here for door in cell:iterateReferences(tes3.objectType.door) do -- only unlock doors that we locked before if door.data.NPCsGoHome and door.data.NPCsGoHome.modified then diff --git a/MWSE/mods/celediel/NPCsGoHome/mcm.lua b/MWSE/mods/celediel/NPCsGoHome/mcm.lua index dd739fa..fd86c19 100644 --- a/MWSE/mods/celediel/NPCsGoHome/mcm.lua +++ b/MWSE/mods/celediel/NPCsGoHome/mcm.lua @@ -67,7 +67,7 @@ category:createYesNoButton({ category:createSlider({ label = "NPC Disposition at which dialogue is prevented.", description = "If the player's disposition with an NPC is less than this value, dialogue will be prevented " .. - "(if configured to do so). Set to 0 to disable disposition checking, and disable dialogue for all NPCs when applicable.", + "(if configured to do so). Set to 0 to effectively disable disposition checking, and disable dialogue for all NPCs when applicable.", min = 0, max = 100, step = 5, diff --git a/readme.md b/readme.md index 570aeee..2bb5ca0 100644 --- a/readme.md +++ b/readme.md @@ -31,7 +31,7 @@ A no-longer-lightweight fork of [OEA's Lightweight Lua Scheduling](https://www.n ### Debug / Devel Stuff ### - data/positions.lua contains positions used for NPC placement in homes and public houses -- it's tedious work, so I haven't done many, so I've added debug some debug keybinds to help: +- I haven't done many as it's tedious work, so I've added debug some debug keybinds to help: - ctrl + c prints to mwse.log position data sorta properly formatted for positions.lua - alt + c prints to mwse.log all the current runtime data, found in common.runtimeData - includes: public houses and homes found for NPCs: cells that NPCs will be moved to, needing position data