From ab504570498df164eb5b28caa6a4aa12fe381619 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sun, 24 Oct 2021 04:40:47 +0200
Subject: [PATCH] Weather.ReleaseOverride() in OnTriggerLeave may not trigger
 weather change, added a workaround with SetActive(false)

---
 scripts/_00e_fs_nqr05_weathertriggersc.pex    | Bin 1173 -> 1453 bytes
 scripts/_00e_modifyweathercomplexsc.pex       | Bin 1349 -> 1629 bytes
 .../_00e_fs_nqr05_weathertriggersc.psc        |   4 ++++
 .../scripts/_00e_modifyweathercomplexsc.psc   |   4 ++++
 4 files changed, 8 insertions(+)

diff --git a/scripts/_00e_fs_nqr05_weathertriggersc.pex b/scripts/_00e_fs_nqr05_weathertriggersc.pex
index 8e647b482cb8bbc5e2f3ef924fddc31f3d8509aa..1a30083a3b7957bb81995a3770a9527f5fbb69f7 100644
GIT binary patch
literal 1453
zcmaJ<%W@k<6g{nnC0VwF9ovZ^iDd(}WhX%)1jy_XBd4gM;vfN8s)o^(JVfbnW?FW!
z=acdQZ21X(fjuiuch4lTDVWxb&b@u^<J|7QU;O@Oxda71q50!4?2LN7{^)o(diMRG
z_i*$=LUStV4{1D|N;*8cca}w{d=tM4QTuV&AKZO@gwJrBK{A?TBmFvM(1i~&K8OK8
z{i&Ft35}rfG%<;XtrMLm?rS3{-r3(tcrIv0i5|x$PINfK!f8Ani$?q8=U*f;1DQxF
zIuf*k;BC9-VT$VOxnu_IAb36tf0cC5KOQ-M7?~u+RuEj4IE;<tG99m$w~u;}7MuSW
zfyUb+s60!w;L-71N4DpVISoxGyNFG6DjBUf>m;uCj!9@rCp(iUp2RZlWNtKdEf;<=
z3quZ1PtgbhoAf8jT1<3bkNtKfli38dAn@i=qMyh#*4}D{FCV)GDBN<4ygKU@;65r(
zl4MqxpQHS(Hih+|0ACd6HRX8?#n^m2kG;#%QZe&XTV>LT<|$8ua-ER8>cb-6mj(E$
z0ACm25$e9h`#rP=GLtZqlXFSacq~}qtvT|U^Ao}<T_<xhO*o$1S6trTP~lBeDA~(w
zLAe0*x3K6|6PMQ#?6T}Cuz@wV)^YuR*A3WJ!h%B0hVm&*Q1{3cZm^hpnl3xxGFxy@
z8EtO5pc)$Zfd1TA#tPZF(Iik*RK_Z<`AEg)*6G}!t9)I7zZ<li%w>g5?$h<*dtSz`
z`h>R4kJ#b@Zt{Bzx3Pr|w)wxq*Jf<B6mBXs+X}bHrLjR|lP@vr#|jOFEm!NB!gh`y
zGl+Pb)NQ+0xk6o0*vYAHJawm_S_PjduyLoLR8>{1*&ND$Ip1}B>XqBCqOeV#(iK59
z>{8HPE@Ge4>=GaFJtW>>(OoZU&xzV)`8``@jpO3xonnB*`=Iu&YiWPcp)S32bQ#oj
q@_f);a;<6k2gD5V#DgpRs^{M;_}o5x7j&2h71{qa5vqNEBL4sdS^Gc$

delta 617
zcmZ8d%Syvg5IvKJHEpd``%vqv)l`cL5vhyrR1`$<(H6UsQs_ks(Mo)PtA0ZX{)FI8
z5O@B73qL>?{)FJlxk&?J0+Ts&&P>kCW8~h5|I}VTRRsioPQE^tyK!?hTy5F*O!dsU
zxqw#P+1o<_Q+3PQs&7~7`$uJ~Sg(o3^_g(0PV4kkIF-$=cn%wfcH>Ss<*jWuLwQZx
zZ(q3Ylv*qzR4QGI^UF188|}6Yqf}x}95);cmW3@ESK{DSI8LkS9@2sPKm~VMvBFl+
zx8i<N(eN!cm)h=|vYyeA@ZKbnP|!yR!C!)2++B646ZKID5yTM=fPo>z0x-Y{L4%HA
zza%G&pdTtv?&rBFq?yuVgajcnNJuizAjO%=_fp3QOpX%L5+WfZar-bjW3nL8I5HgN
zAT>>xAWR1G0m2mXT%G<?<!v&U@tVCr<1AyB|2*~~%N}#=aTaqh`J3<gjj^R{$2Xkw
z3}@MJPI`;-zvc;i%304aFJt!db?)NaWT`1R?Vogrknc&Kd}%(A%Dol{ypDGUMJF9m
I{}z7y1&D}8LjV8(

diff --git a/scripts/_00e_modifyweathercomplexsc.pex b/scripts/_00e_modifyweathercomplexsc.pex
index d282b4c4f7c9bac6af06a28884d3c6dc95bc0c42..9bc3aa56f7af70f7bcd95c114620399f1d59c2f0 100644
GIT binary patch
literal 1629
zcmaJ=+g95~6y0Nd!5FYHlr*6P2a={YKqi+qdTXf3%37tQI87c|iaZ##W`;^*NWQHv
zeQ188AJV7pnUQM4Lp4j%o^$rO?UDX@`{&;?B?$0}%wHd|aS{Z*lS4g7PCvYrkvWs;
zzCOPg$@l&Jor^3+`G@2@LhYA+?|A#wKAvKY5%T2RMO^ua*hi2J%)XGOZz3a6f1!=`
zaPdgJPLttKrafh3ipl;*8C^<L&yvAFDl}rP28l_uibiN2z57+h=2)J}RH|5_9ft1?
zbQ;U=W0PFUlglVY`MK7lhT*GG^g*V_y#r^iM6uDSwI_$sdp0rj^qH5+cx$32)>at)
zJeHYxt^3mW_}}f`R?J12xN7;(sQ*_I_2e+mhxzFM>&VMvZc+mC({rHOH)*1Vcz7^Y
zoJ^~ZIg3mum1dl(j2qdB$0;>1oy;j)3q!AK`6sO;8qsf75v@2q=ri*CA}Bz&0DA>^
zRDj2*hoQ~zhC=4&He|XfjZvo}UT!?Q-d=W<nD|WE{*tVt-C1>vcI{>tGEPntImjEH
zRr1PrJf~Gp4f5_YIXcC>R?p?o$;Xc-Z~sXFo)+NS0(@71XPEV~b^|nz<w!=EJi3%=
znhYeC_!;hd(eeX9o2H|&8ER^s+lv3-50v@o3Y6@BVZlrRXkS9ztp={I1uSy4+_Eth
zU=?@VTEqJPuDh_Sgep)I{%<UO#H>erR#|Y)w!oYX%=>0+J$E$=&|+`yYGc`hDpp8$
zW7Qb>37Pq($>x@eO&hl+o&|i$JUOj}+pL^#>I8z)lsMFyFJPbIj=*O$uX~=I{VtoY
zVuQ~P!|yTqCf{4U?~}H)D6k>WXbN=5<z|)0YTUdf@Ias?aL-A;EU-x|&}0bFCW)KY
zQ@%l564-LY1y9^6h*g5RjhJD?=K^hk`*tfTV#U5oG(Vh}OBGRpb9lEs`gMFkA}@h2
zIXM&1WYc{m@O7RJ3)FyqTECgH^1yDWQo}Y?*~yjI<rxITUEX`dtL%Q;E3@O2*=GAY
zw$GK@0#xHsQIEu3P{6?TzB}hoKr0Oag8~~=_Cb%ywOh;Y5;MdTyEph1&wo<z>E4?J
S?d3s5b}PX(={W7QbpHZQ%^d^)

literal 1349
zcmaJ=*-{fh6g{1lBtQZpD7cIZ1Q#%_RnD7QU|9vCB&9D})Ht~$qoF&_bXdO47eB=E
z!O!r?+ubt;e6Ty2oV(w1@8tLU??3Z72=Mv%>&G`--D|Zr_O?|w+CO<uf$mfMLLCeT
zbliTiK1@PXJJDd^b^7s0qR@G@wS^Xz{u9KBCti|n>p&AKFO^mfPVdN09QAq>Z%9os
z#_|>ghlEl;>UK$@7Ao0|bfjc3Kz--aXA1Q$?NdxLB+UAL+GR(zN$(v7G0I1-Z)5zl
zsp62Hg*rMUYb-ohiu3q>v>i$Ar03N6S5iA|a6Hzs+nYgfLh<g#rj0HJp;j>(zW;Va
zi5}N1el;>Gf89|XdtmZ(kElf3X%S4G?#~#~o=|wLB;o1iNOJ2+db%HIFFA^I*r$Z0
zDDjjXg{KvZ<RwE2qy31wUScObA?e5sy42QjBzvg%zDfFyCsb8(Lw23HkkDWsW#4z=
zq>|66XWQU?)q*c(c1rR9jE|;+VJidoGw>h-4>Ry6+j)<3oLT`Yyd<{`G|!TYNsnS_
zxRDo*VqPy3wp7x(kF(@YP~W8i1qtmOQXEHJa<6Z9^8*U}x(VdW>uf+i1FWAx#oiju
z-YHD;ZP;sKir~+py-Qf)TqU3^++QSj0TT}Kv&8ADu0Rcw25_j!W=}l>4X$j@EY3Ml
z!W`>t(`7Dup7p6Pi+N6&3KcAHj#Q}Q0@p}|8ZM44Q>+zCJkKpJxdH;0aG8}?Se0K8
zxGLbWWT!DDaE<M(y?#o|@rxW_kH8IPS;9?zE_2ZpuGQq<RsNccGt&Y$1sZjMW%gxZ
zo{>pj=d8B`W(8Jkt#blR#sX6u!l=oPO=Bti<2WO*Y8~s&aW!)+F{qgcL*uqUC8Z&X
zV$P^@tiCf==Zc~TYj9@sDqO~0c1(|0Wcqf$XUOKU#$?x1f<<m(%@JI;1lPEWb=$>7
MfvUj0Y?!XpAG-beZ~y=R

diff --git a/source/scripts/_00e_fs_nqr05_weathertriggersc.psc b/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
index 34ab6c3f..7074c923 100644
--- a/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
+++ b/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
@@ -19,6 +19,10 @@ Event OnTriggerLeave (ObjectReference akActionREF)
 
 	if akActionREF == PlayerREF
 		Weather.ReleaseOverride()
+		; SE: Weather.ReleaseOverride() alone may not trigger weather change
+		if _00E_FS_NQR05_SiteWeather != None && Weather.GetCurrentWeather() == _00E_FS_NQR05_SiteWeather && Weather.GetOutgoingWeather() == None
+			_00E_FS_NQR05_SiteWeather.SetActive(False)
+		endif
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_modifyweathercomplexsc.psc b/source/scripts/_00e_modifyweathercomplexsc.psc
index 8007e54f..eb1355e2 100644
--- a/source/scripts/_00e_modifyweathercomplexsc.psc
+++ b/source/scripts/_00e_modifyweathercomplexsc.psc
@@ -25,6 +25,10 @@ Event OnTriggerLeave (ObjectReference akActionREF)
 
 	if akActionREF == PlayerREF
 		Weather.ReleaseOverride()
+		; SE: Weather.ReleaseOverride() alone may not trigger weather change
+		if WeatherToSet != None && Weather.GetCurrentWeather() == WeatherToSet && Weather.GetOutgoingWeather() == None
+			WeatherToSet.SetActive(False)
+		endif
 	EndIf
 
 EndEvent