celediel/morrowind-more-attentive-guards
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

less false negatives but potentially more false positives

Browse source 
net gain imo
This commit is contained in:
Lilian Jónsdóttir 2020-08-02 15:15:17 -07:00
parent 386170f72f
commit 8b33725c2e
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
MWSE/mods/celediel/MoreAttentiveGuards/combat.lua
View file

@ -16,13 +16,13 @@ local function isFriendlyActor(actor)
return false return false
end end
local function doChecks(e) local function doChecks(attacker, target)
if not config.combatEnable then if not config.combatEnable then
return false return false
end end
-- if player initiates combat or combat is not against player, do nothing -- if player initiates combat or combat is not against player, do nothing
if e.actor == tes3.mobilePlayer or e.target ~= tes3.mobilePlayer then if attacker == tes3.mobilePlayer or target ~= tes3.mobilePlayer then
return false return false
end end
@ -35,12 +35,12 @@ local function doChecks(e)
return false return false
end end
if config.ignored[e.actor.object.id] or config.ignored[e.actor.object.baseObject.id] then if config.ignored[attacker.object.id] or config.ignored[attacker.object.baseObject.id] then
log("Ignored NPC or creature detected, not helping.") log("Ignored NPC or creature detected, not helping.")
return false return false
end end
if isFriendlyActor(e.actor) then if isFriendlyActor(attacker) then
log("Friendly actor, not helping.") log("Friendly actor, not helping.")
return false return false
end end
@ -50,7 +50,15 @@ local function doChecks(e)
return false return false
end end
if e.actor.object.isGuard then -- ? Guards don't know who started it if the player is being attacked with their weapon out ?
-- seems to fix weird issue when sneak attacking NPCs in town, guards would kill NPC,
-- then player would get murder bounty, so guards would come after player
if tes3.mobilePlayer.weaponReady and attacker.object.objectType == tes3.objectType.npc then
log("NPC Fight, not sure who started it, not helping.")
return false
end
if attacker.object.isGuard then
log("Guards don't fight guards!") log("Guards don't fight guards!")
return false return false
end end
@ -85,7 +93,7 @@ end
-- {{{ returned event functions -- {{{ returned event functions
this.onCombatStarted = function(e) this.onCombatStarted = function(e)
if not doChecks(e) then return end if not doChecks(e.actor, e.target) then return end
for _, cell in pairs(tes3.getActiveCells()) do for _, cell in pairs(tes3.getActiveCells()) do
alertGuards(e.actor, cell) alertGuards(e.actor, cell)