From 74264d2d26943f4e59f7ac62c970570283eb6ac5 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 27 Feb 2025 00:21:34 +0100 Subject: [PATCH] Added failsafe to _00E_Complex_AddSilenceSC to ensure silence removal --- Enderal SE v2.1.4 Changelog.txt | 9 ++++++--- scripts/_00e_complex_addsilencesc.pex | Bin 1345 -> 1669 bytes source/scripts/_00e_complex_addsilencesc.psc | 18 +++++++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Enderal SE v2.1.4 Changelog.txt b/Enderal SE v2.1.4 Changelog.txt index a8473d673..b946fbd6b 100644 --- a/Enderal SE v2.1.4 Changelog.txt +++ b/Enderal SE v2.1.4 Changelog.txt @@ -1,7 +1,7 @@ Enderal Special Edition Changelog Ported by Eddoursul et al -See https://en.wiki.sureai.net/Enderal:Patch for the list of official patches up to version 1.6.4. +See https://en.wiki.sureai.net/Enderal:Patch for the list of official patches up to version 1.6.4 for Skyrim LE. Beware, spoilers ahead! @@ -10,6 +10,7 @@ Beware, spoilers ahead! - Chinese Simplified localization revision by DaisyComment (no translation of lines added after 2.0.12.4 yet). - Dimension Rift might get stuck in an infinite effect+sound loop if player left the cell while it's active. - Fixed missing damage from spectral arrows produced by the Arcane Arrow affinity. +- Fixed help messages (in the middle of the screen) sometimes getting stuck in an infinite savebaked loop. - Dreamflower can be found without finishing The Secrets first. - Revised alchemy. Consistency and distribution changes across the board due to lack of a coherent alchemy system prior to this patch, such as: @@ -18,13 +19,13 @@ Beware, spoilers ahead! -- Merged two redundant `Health Damage` groups and 'Poison Damage' into a single 'Poison Damage' group, applying damage over time. One of the merged effects used to revert itself immediately after expiration. -- Merged redundant 'Damage Mana' and 'Mana damaged' groups and 'Damage Mana temporary' into a single 'Damage Mana' group, applying damage over time. -- Some combinations of Fire Resistance, Shock Resistance, and Water Breathing worked for 0 seconds. --- All ingredients, except one, allowed Water Breathing for less than 10 seconds. Base Water Breathing duration has been increased to 30. +-- All ingredients, except one, used to allow Water Breathing for less than 10 seconds. Base Water Breathing duration has been increased to 30. -- Significantly, at least x10, increased effect from 'Damage Mana' and 'Damage Stamina' poisons to finally make them useful. -- Fixed several ingredients having duplicated or contradicting effects (for example, Damage and Restore Health). -- 'Increase Arcane Fever' no longer occupies a whole slot in ingredient effects (it is still applied automatically with Restore Health). -- Fixed excessive damage caused by Stain Mushroom poisons. -- Fixed "Fortify" effects having duration 1-2 seconds. --- Fixed the 'Slow' effect almost never working due to an engine bug. +-- Fixed the 'Slow' effect never working due to an engine bug. -- Effects of unique ingredients are known from the start. OverDev: @@ -167,6 +168,8 @@ Keranos: 2.0.12.4 (2022-09-30) +Discontinued Steam support. + - Skyrim SE 1.6.640 (Steam) and 1.6.659 (GOG) support. - Fixed the dialog quit popup appearing in non-locked conversations. - Making a Wolf Blood in Call of the Hunt led to the objective to drink Chymikum, and vice versa. diff --git a/scripts/_00e_complex_addsilencesc.pex b/scripts/_00e_complex_addsilencesc.pex index 66f8863c02a3ebc13848b202fce6f6a7a2b4cd2a..e1073e56b8a73d825823fcf968d3b66fe3a7c2ab 100644 GIT binary patch literal 1669 zcma)5+g95~6y4)H7#j>UgrqcX(&9o4C70g(l!TfzYo#T{qKq`{~)Gp;la;Y<3M z{z>~K{g6I&&q%V3`%=wX(m6BxoW0LEqkn$>>+gIH0(=I4{;`Cu{=q@Ff2c1;L;0@% zGzfa(P%2;c4);f~kHu~f=y4Q}hfUOFX768ys)@(gWU%b}X|NXraT3fxpz>Urp7D&t z!gFnOV%CqPz}&J8Y`BrRnwe%rWr{y zj#NxXHvMtLwwh+_CRpxtlKB;W(27&)bnN#h_O^5)FEo2s^?tQo)QSTE;YMDJzQ~L( zvG!U;auCLx`H_y&xfWtMoPfW|z+YqIWD4z3=TN2rY2Jej`XDnNX2zq;c#H<`-(gaP zoArxtk>~x!H`j}fFGJ&>OIvjqH?_M|O`}~C;*s>jvrq*;%w=BL0l(FJg1FKl$vfIpB!L6Bf z8@Js-8RTl>W4Jz1y3M&_*0u+nqX`eBmOzQrwpEmrwaf^%EALpQe}&=gn|xZ~PZ z6R5Kv#VJy-&_(w2F5mZ9f{iNI1?~#0EDPM@Ih`A{Y=YukKDwU>e0n|oxv(oZuxl06NU$%kE^yzvSQBW|7N{|VR-3@KlR5`%2<$mvH39C;0zaQ` lzeqHv%JWoyVA*WT9&oJeCAVy`52wX~gWKXccOT8{{tK1!JC6VW literal 1345 zcma)5*>ck`6g?tKn=VPZ&;>|qmbNUVQ`Q;s1|>je3N1|s9y7+ibp@#uY^BQ=@D=dD zm+&L-Av|#<+jQXtJ5kP+&OP_&O8Nc%$FIT#2=GJSzJEcZv%1>qtm*w;mySA5!>}#8 zqylQMt@M%rL#;5>{W$4&Jya>jD~D2fxQkg%rcRJ0`(c=*$(#rbz9iE&z9CdzYNJzF z-BdfVj3SC#%214xc!T@{!f>EfD2>$0@1ndX!;lnen;$+>V76(OV(SgHW^=3SA5*;D zdeJ%XW0d^B=orh*rrS=ohYhWwo!D226MQA3y{%a4Sej#(RN3z*GBC$I!VD*J6V$GZ zI`XxD#AYLMq{6x~=a!{9S)M(W__j}p+0kt>si)62#^V1u!uTlzSp`h|ojcJ!L(H6_ z^0yr*zR`;N=zn?|*fw(0Fwkro+V8FA;2w(4wC?8N{Tw{V!9!GcdppMGxYm!k z^Y%C+T7QlL-xHMECYCC~(u=-wr989e8!sl)k5$3}c|n@yCGHxq4Hn@0kokF(gU2Xu z)4t~8e{xnUIg}>YBP%8oPrF;-8SS)_9tCn&Qkba^DmqN%hqP*`FvZ1$y1N+B>KR3@ ztA?_>|Fw!D-%^1K_P=03AqPBPMajKooP7siU&}6mKQ;H(QD>F1uq#eo{KR029I=9- zRC*XADH!Df?y2RVjA#sW1? zVbow^!>$z15yu4P9C0)y&gH}c6R!#k3(PykNjr*k_aH&PBYD+EsQ;N@d8aLA-0=Kv#Tj43ozAbPkH#W+(d7WpMPtE=T DLQxXR diff --git a/source/scripts/_00e_complex_addsilencesc.psc b/source/scripts/_00e_complex_addsilencesc.psc index 40a8413c8..970ba998e 100644 --- a/source/scripts/_00e_complex_addsilencesc.psc +++ b/source/scripts/_00e_complex_addsilencesc.psc @@ -5,6 +5,7 @@ Event OnTriggerEnter(ObjectReference akActionRef) If akActionRef == PlayerREF If (__Config_QuestToSet.GetCurrentStageID() >= __Config_iMinStage) && (__Config_QuestToSet.GetCurrentStageID() <= __Config_iMaxStage) _00E_SilenceLongTransitionHighPriority.Add() + bActive = true EndIf EndIf @@ -14,12 +15,27 @@ Event OnTriggerLeave(ObjectReference akActionRef) If akActionRef == PlayerREF _00E_SilenceLongTransitionHighPriority.Remove() + UnregisterForUpdate() + bActive = false EndIf EndEvent +; 2.1.4 Failsafe to ensure silence removal when OnTriggerLeave does not fire +Event OnTrigger(ObjectReference akActionRef) + If bActive && akActionRef == PlayerREF + RegisterForSingleUpdate(3.0) + EndIf +EndEvent + +Event OnUpdate() + _00E_SilenceLongTransitionHighPriority.Remove() + bActive = false +EndEvent + int Property __Config_iMinStage Auto int Property __Config_iMaxStage Auto Actor Property PlayerREF Auto Quest Property __Config_QuestToSet Auto -MusicType Property _00E_SilenceLongTransitionHighPriority Auto \ No newline at end of file +MusicType Property _00E_SilenceLongTransitionHighPriority Auto +bool bActive