celediel/morrowind-npcs-go-home
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

keep fargoth active if quest to find his stash is active

Browse source
This commit is contained in:
Lilian Jónsdóttir 2020-08-05 21:23:04 -07:00
parent e3c5a219b8
commit 49788c98eb
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
MWSE/mods/celediel/NPCsGoHome/main.lua
View file

@ -222,7 +222,12 @@ local function fargothCheck()
hiding. He rewarded me with some gold, and told me I could keep hiding. He rewarded me with some gold, and told me I could keep
anything else I found in the bag besides the money he wanted. anything else I found in the bag besides the money he wanted.
]] ]]
return ( tes3.getJournalIndex({ id = "MS_Lookout" }) or 0 ) <= 30 local fargothJournal = tes3.getJournalIndex({ id = "MS_Lookout" })
if not fargothJournal then return false end
-- only disable Fargoth before speaking to Hrisskar, and after observing Fargoth sneak
log(common.logLevels.large, "Fargoth journal check %s: %s", fargothJournal, fargothJournal > 10 and fargothJournal <= 30)
return fargothJournal > 10 and fargothJournal <= 30
end end
local function isIgnoredNPC(npc) local function isIgnoredNPC(npc)
@ -238,22 +243,24 @@ local function isIgnoredNPC(npc)
isVampire = tes3.isAffectedBy({reference = npc, effect = tes3.effect.vampirism}) isVampire = tes3.isAffectedBy({reference = npc, effect = tes3.effect.vampirism})
end end
local isFargothDone = obj.id == "fargoth" and fargothCheck() or false local isFargothActive = obj.id == "fargoth" and fargothCheck() or false
-- todo: non mwscript version of this -- todo: non mwscript version of this
local isWerewolf = mwscript.getSpellEffects({reference = npc, spell = "werewolf vision"}) local isWerewolf = mwscript.getSpellEffects({reference = npc, spell = "werewolf vision"})
-- local isVampire = mwscript.getSpellEffects({reference = npc, spell = "vampire sun damage"}) -- local isVampire = mwscript.getSpellEffects({reference = npc, spell = "vampire sun damage"})
-- this just keeps getting uglier but it's debug logging so whatever I don't care
log(common.logLevels.large, ("Checking NPC:%s (%s or %s): id blocked:%s, mod blocked:%s " .. log(common.logLevels.large, ("Checking NPC:%s (%s or %s): id blocked:%s, mod blocked:%s " ..
"guard:%s dead:%s vampire:%s werewolf:%s dreamer:%s follower:%s hostile:%s"), obj.name, npc.object.id, "guard:%s dead:%s vampire:%s werewolf:%s dreamer:%s follower:%s hostile:%s %s%s"),
npc.object.baseObject and npc.object.baseObject.id or "nil", config.ignored[obj.id], obj.name, npc.object.id, npc.object.baseObject and npc.object.baseObject.id or "nil",
config.ignored[obj.sourceMod], obj.isGuard, isDead, isVampire, isWerewolf, config.ignored[obj.id], config.ignored[obj.sourceMod], obj.isGuard, isDead, isVampire,
(obj.class and obj.class.id == "Dreamers"), followers[obj.id], isHostile) isWerewolf, (obj.class and obj.class.id == "Dreamers"), followers[obj.id], isHostile,
obj.id == "fargoth" and "fargoth:" or "", obj.id == "fargoth" and isFargothActive or "")
return config.ignored[obj.id] or -- return config.ignored[obj.id] or --
config.ignored[obj.sourceMod] or -- config.ignored[obj.sourceMod] or --
obj.isGuard or -- obj.isGuard or --
isFargothDone or -- isFargothActive or --
isDead or -- don't move dead NPCS isDead or -- don't move dead NPCS
isHostile or -- isHostile or --
followers[obj.id] or -- ignore followers followers[obj.id] or -- ignore followers