From b817836ef0da06275da6c6ae71d0eb80aba5b9f3 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Fri, 1 Mar 2024 13:32:00 +0100
Subject: [PATCH] Apply the stuck help message fix only on reloads after the
 first

---
 scripts/_00E_EngineBugfixAlias.pex        | Bin 1728 -> 1797 bytes
 source/scripts/_00E_EngineBugfixAlias.psc |  24 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/_00E_EngineBugfixAlias.pex b/scripts/_00E_EngineBugfixAlias.pex
index 095f7ab37637160846df09473544aae703cbef14..b5c56d9d74bcd94389b9803653838fc211cb5d27 100644
GIT binary patch
literal 1797
zcma)5-%lGy5dPLa|G*)}BmoL-+Dn_3geJrxKpIzh0M`&y5)eq_@pQQx%$4(=b-Tvp
zzpK>tjr<Fh`bYGked_GqIhcw{xs_Jm%<Rm5-|XB!Z-4otSbzY3^yhDXW5H`SJ6=b2
zBT1Ws?s4?<MjZKSxvv7$I$@X$QZ<NO)M<p5hmmygJ!Y@Z<igc$(udmDgo*7$CmEdf
zj5kQ5zCNN<MTtatPwvP_qp>IVWB;7e-NX;K{T`v_9grfuPw6S<ymm}}dZ-7%=_`u+
zuSqGtOA6(aC=5yBMv%xb(p=GxQ9qz#N=XJ}bzrI0vOL?duax&AQJ+$8zq#hMz4j<A
zl3nl2PvLOv^gkI#emC`{wkez5Zqz-|Lo&O~n9HkodVPJK6SILzFJp=OA9FjVvtEu>
zxsv$5Bv9Ou8qS+U5-P2hre1$-1lHkfCP|EmR?EbXSYUqSIZ9h`;&bCkhLrm8@jwQq
ze+pClNN;Fp9-*BKxOT%n#8}@^vSKlPc#;e^)Oh5@R$j-|C%$&oFw(&ZDYhczChvZt
zK)X6&lU&uOAUcjHbd?>Hs-$5yC*?z(@`Iq3$c_v%pQ9)~HtaKVGLf6a1DjcufsW!x
zpTl|U^Ds?hqjb>OLdg$wl0x)H!dFpw<tsZ?wFBxUXJm0@BMdEAyec3iJxHbDPi`<s
zd8$~HrJFahiK$FhIvTpsO;1N)WdxpKl6(7MI?>osduNn(WH9Kx<B1J1!5;bAcD?#T
zq<RMBKkBc4p~63wK*9XD1{6oYF&1yUm%#BVCah5g>iN2j+qi=nUh}vMm)AXBCWDKX
zu*mBH9`Z7-D%iVh*Aq1DDwvWr!9o5CzvG5Q#x7zKH;va^mV+rYGEWiH?6XM~K6i`#
zxiQ6rK1Ay5HB21lXybN+STGU|pP9^UiaMC(Q*-!)mCRrPpQ17^@R`6}fmz#<TLN=A
z7PE|vv&3f_0-p=a+nNP@Q5UfFYkb%hn94&Ahn$xe7w_}1xRa46@@@AF0mJA^e8syV
zP~`0U0$=CZxGC@r$Jx6$=H(WTNyst_OzDBZ!#q<sFLy8Ab6#~kuX34Jz!JX2Bko!O
zk8}AYKEEumB=Fd>6nMmnEp|Bc#D+4(9AZ!NswdZ0U^!1SZC2j`i$MAEYOt|_XINzd
zYkajKV#KdAu5;Drmhy_B0B-B5zzX+)S*>#LJB!wAkjYtK$W<<N7VMG9>zwtB;z#s~
TvtL|um3g3+^{-nBS-pP&9ME0I

literal 1728
zcma)5-BQ~|6#it(KRCpgCV|9|RB1v8X-iE4?bI{90BQ)+q%bf;E;Wj@*lOfmk9LL2
zqx4aF*9V}l&<E*N&mLL9Oz5=Qv3&MB=X`t4cUFJD`{S>22@dEHm%lBc?RPpozbE^#
z6gye}EdF&ni37bp(jgkXC{kIfv&2JF6!!W!mL9&t!p)gPT;CVw!~{lQW?vbVoAbU!
z!!#b5Q<3UeNmLKzfs74Whw>;1E=2l91<`&m6lnOzLJM;w(hpelcM}n$CngI&ycWsm
zt<XB?3yta^jv^s(D^xOy4KW4@n#bZyq(X**`@mwio7XuUnTtuPe;%Z$4Rap6m_+O*
zf!6+M&`$$t{G-m6zvI7&`vWr;_RUG|$X0Yc<0l~q<%C^-w<sl+ea@Kw<a9h`=s%9T
z7WJ=3pnM<=swXC;^RT*?$<XTHnL%K@RG2K4nl{1<vy?<Jp60RCy4`#z?$1inlydct
zdwZw^p;0NE5h%up;b;@?j#3F`x?LN4YL$B(Xr4^tSPa#<V7s;*MY)lgIEl>#+;;)Z
z*3}|8E66&SQ}2Hfp-GD&6`qa4cv%>)FiRKa<22Da(1+(D?a443zNZOCm?1>IRT(Kz
z|1s7>wkBn7p|Y2#fbJGwq^Wy@O3z*e%%2R@cw0|<zQ3-Y9>*pe2rFQ$y}WSGDArSt
zL>QmNBAO^#mtvet+EB75quicVa!1gY#k=C0yMr2iBMwUT8?;8bFkHK%7riSWe;qTt
zsRB*R;STQcYNL%MEYtF6J*H(dh_r%LTF<dY%R+Svt>YV79c&OG(KQ@$&{O&yx7f1#
zGG=kxqWM8=wCF^B%9tl7C)FtKGr}jECYAJY(<0PX;o@%Y=O8$3+n(+A9u{&!`*zw6
z7Ag9E9&5XOz-`TuwTy>&M6SxBgU=m2aInlI4we=swo5LLU5^SEA&;*kck`nwSEtxY
zEOUuCzi{w`b{ymWaC!MB5!4+#onSz9I<LxkD|ki<w@KrNT<;qFH~$A0QNLj76?+_-
z4ptqk+~#su$@wK)&)G>WvSC}SUDZ?Kkk(CLGjEh!U){h{Cj4v0*O-5zN`1P!5_e~>
zN`<<ix;lk2C2UZ&>#PzHy>u`;ak=DT-3s?jI(*7Tm+d}YSrzOsHtAXrA3?Uvt*drz
M5rk~g@7pQ#A76}1!vFvP

diff --git a/source/scripts/_00E_EngineBugfixAlias.psc b/source/scripts/_00E_EngineBugfixAlias.psc
index 770c4ec2..580ffdf9 100644
--- a/source/scripts/_00E_EngineBugfixAlias.psc
+++ b/source/scripts/_00E_EngineBugfixAlias.psc
@@ -5,19 +5,12 @@ int function _GetScriptVersion() Global
 endFunction
 
 Event OnInit()
-	Utility.Wait(0.1)
+	Utility.Wait(0.05)
 	_ClearStuckHelpMessages()
 EndEvent
 
 Event OnPlayerLoadGame()
 
-	; ResetHelpMessage crashes the game when called in menu mode, for instance, when loading a savegame fails due to missing mods
-	Utility.Wait(0.1)
-
-	; If a help message is visible during game reload, it gets stuck on screen
-	; This workaround shows an empty message to forcefully clear the queue
-	_ClearStuckHelpMessages()
-
 	Actor PlayerREF = GetReference() as Actor
 
 	; Perks modifying armor weights need some push on each game load to work.
@@ -27,6 +20,13 @@ Event OnPlayerLoadGame()
 		_ResetPerk(PlayerREF, _00E_Class_Keeper_P05_C_Conditioning)
 		_ResetPerk(PlayerREF, _00E_Class_Vagrant_P05_B_Lightweight)
 	EndIf
+	
+	; ResetHelpMessage crashes the game when called in menu mode, for instance, when loading a savegame fails due to missing mods
+	Utility.Wait(0.05)
+
+	; If a help message is visible during game reload, it gets stuck on screen
+	; This workaround shows an empty message to forcefully clear the queue
+	_ClearStuckHelpMessages()
 
 	; Workaround for broken physics on loading saves, made on a mount
 	If PlayerREF.IsOnMount()
@@ -43,10 +43,10 @@ Function _ResetPerk(Actor PlayerREF, Perk p)
 EndFunction
 
 Event _ClearStuckHelpMessages()
-	Message.ResetHelpMessage("Empty")
-	_00E_EmptyMessage.ShowAsHelpMessage("Empty", 0.1, 1, 1)
-	Utility.Wait(0.1)
-	Message.ResetHelpMessage("Empty")
+	if EnderalFunctions.GetNewGameCount() > 1
+		Message.ResetHelpMessage("Empty")
+		_00E_EmptyMessage.ShowAsHelpMessage("Empty", 0.1, 10, 1)
+	endif
 EndEvent
 
 Perk Property _00E_Class_Keeper_P05_C_Conditioning  Auto