From 839df7c06f2f456e62dcc3543ac136d3e9a02b82 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sat, 27 Jan 2024 22:31:45 +0100
Subject: [PATCH] Fixed Papyrus spam in _00E_FS_NQ07_LightScript

---
 scripts/_00e_fs_nq07_lightscript.pex        | Bin 1736 -> 1921 bytes
 source/scripts/_00e_fs_nq07_lightscript.psc |  37 +++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/scripts/_00e_fs_nq07_lightscript.pex b/scripts/_00e_fs_nq07_lightscript.pex
index 150028c92ace1f59ac8a6df4055612de4c270bfa..b4e5d7dce0bc86612a0214ae63927f8209d35d53 100644
GIT binary patch
literal 1921
zcmah}T~ixX7=91g1PCEWLxECSx77+*8)<0>**ZGZ1|~BYR64CQUSyW+*>Gez8+T8@
zdgX<G$!q;3{sV8k^ah`E&Tb21X54px=lwkI^PFA&dHu(qg$ZJWhyOPEl~#M3o9*7-
zQLp>WX0vx71}EyMpNOHV57R!C+d&YIl5`ZgROLCYUkK^aGg?M3?}cek{)pa4_ok*7
z!>9JSI#RykG`%0I*uvRE*$zYA*O^37HFx)f6zK^qwWWU?@!cr;mWOFa?#0PjBvM7o
zFGM;%Q#uhrz$MM}V;Kk~V(CXT@As8B=V$&v^tm~YRz2^(L=P~#ckU-N73L@1%IaS7
zh!5jL9gftiz3)s><y@pAKgtG99`Bk%$ax;e5#9E@uXgu4Q8Y@iLsv`De!~x?=`5!4
zNCtX`aW!FRif)d}NvfH(udhRk<GIk{xEWzcPB)gEru@^Felp;Sir75{ZU6L3KUF-T
zY0uLoub_pK@+hRzkxGOd(AwTef@dsUb>b^G;cAq~6b^U$qa@){xv9D3Nzb!)+`8V8
zUI^7c;krenZhZU$Zr@e0nUD^7Uxb1O*^DX4FYJ(VEZZ`$xDw0fd?2LtaE{_<!v+;P
zQc>n@Q%Q7Wz<<gEO>*>==I##7*^?6<axC5Fd8S1L#As5#t>R}+MSxvJ<xaZw;vn_|
z9+2~O<iDZW>=o?BuYIAYg1Q4CPkDe>H6ON_gU2~|l7p=rJf(_#%k7~2L;Rjf_-GhS
z=nqqaLJk~4aE2--TGY-Bsu>3zi*yI}KI|UsKI{SPBV%i{4*MAPkUlY{=S~vMQv=q7
zwP2pHXZV~ygMCh47@MFeqG@LTQ53pVwg|tA*)mvRma2BkIeO26c`Rq1S`Hjq05miw
zaq>;HWX>$MujI}QExjwNA<7^~k(O;<v%W<ubQ?d6RuP_<Wi(f$B@kkC2QjOc^M4%-
z9i^)s6Lc5qy?xjUBNyT?Lr(KBXnHq0w1DOht~6r@7kNZKyb^`PZ`a2EL31B#5NI8@
zvXR}!Blwy|9rrSi{!barFnVA}VCp*X4MuA~CbS5wLA8KH7Gzl+x;IVthOS`9RvA5H
zw1Ipb2>HhbJ<3NJpt(F@RLf39Uwy$0Kzz&88%deb_^BOb@>+8g;Do$jp>TP5`8V$C
z8tn$?ZfCTc_`3t@Ezr$rFJg|R-7t$;It|d?zCwFj=W1m}P24wRXllQ(LUvck(YP*0
z15>RWJ7!xeM~l&pm7|5cH=bV0G-!G#Ku1mw0V|+6oAM<b#33NYnnJ8ncYgl`+u8U$
NR?9ZXgf%k#^)LEuTIv7*

literal 1736
zcmZ`&+fo}x5Iv(C!V<z)E;hCmUjlJ376O@y-egBmRAJ#nF56Y96t!N>!o<rgwL8Lb
zp7Is>o#aQ7uSj0<Le9);u}BnkY4>#Z>7F?~vwy$&?T>s80{ngV%l8IL2aQJeV7q_N
z`=+sVu%`}>Oy7^yiCH^Ie3W`Bk=`+;d%OK^=f&ff&#{Gt|0`k7@{Tlp;~9zRoybHf
zoY~jiAdtSz#0Is@-Bwy9N0{$w?_DT6Vfd{Kl3l$W#mAva3>Lmt$>dDwNDT&3qvA(;
zpp1&N7vhTN8+9s=y+h?ow;pb_+b=phyJ0v?$mv;i-H&o#ADntIib*uo11wGE1c4(h
zw%bnbD;dg@C^q{;^LqQOOI1%*GW5dHQf%|zx$IGf<CcR=)ZAni<|b`42ykOkT;tk=
zU7^%BvC@ZF-X3bsBGPqp<e7Rb%`nyp9a;B>aV)i|C+?7@+U@j+3cW~6e08xd`Jjw{
zByFKe>e0I&c!YHmxjxB>^i`nbVAQFs<%hJ@bh~Yvz2<~3MY^j8qZJYv2B=2*nLJcF
zjg`Ikue|tB8WcOeiDEGD+)Ip%!JQd-e9}OESDVaRN8wo%g(#_AJ&-?U;U)@pyqUX!
z*>tb53?#++5_v*Q*}JKJk|+{%465n9>qT!oWl(q-dLL0`YES9+a=^QoHQdZVD+5n6
zu!Wh?B~9C8A6ASKzXpMv{m?APXP{ucX%{P6IO`zUvsk3vqTQz5adsDVd`7!Rv*anD
zhDWqj+8XVNvj)~_O<E3RU|NvMU+#BYN)ew0R8X~1U?u}Kw>l%2am8iGx=QG(rx?9P
z=E#}B^-oR(H&{B#)CdIi<}io(w2gg=n*s~ey@;D>P*B<&nM(}i=LK#H+@a?tGea)(
zjNToKqDZP+g<@bwagYDBgCKWmoLl<D1qXE>5AYD5W0~(2e8HK0=~iCldzQ721uhHR
z&sJY1zAErgVA+M{h%Kn*nHU8HcWHU7UUStemLV9d2|N;5VSbf}`6muJZK4PU8UiG_
z06VT0e*KxHjIXC9u95Xw$W9jvE2DjKrPb^Cv$L~5sqcI+R&0|ZH%4MNDYi8xw#Kfh
z*rrpKifB^o#+cX*o2zhZ&5L52tWL#lj)`pvY^Gvc%s>6N*i=;OToehcxG0L{Za?Ru
Q{^I337d7d$OJk?~4<Nci`2YX_

diff --git a/source/scripts/_00e_fs_nq07_lightscript.psc b/source/scripts/_00e_fs_nq07_lightscript.psc
index d25d09d8..8bd355d1 100644
--- a/source/scripts/_00e_fs_nq07_lightscript.psc
+++ b/source/scripts/_00e_fs_nq07_lightscript.psc
@@ -4,14 +4,18 @@ Scriptname _00E_FS_NQ07_LightScript extends activemagiceffect
 ;              							EVENTS                  					 
 ;=====================================================================================
 
+bool bActive
+
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
+	bActive = true
 	EnableAllRefsInFormlist()
 
 EndEvent
 
 Event OnEffectFinish(Actor akTarget, Actor akCaster)
 
+	bActive = false
 	DisableAllRefsInFormlist()
 
 EndEvent
@@ -26,13 +30,20 @@ Function EnableAllRefsInFormlist()
  
 	while iIndex > 0
  
-	iIndex -= 1
-	ObjectReference ref = _00E_FS_NQ07_LightList.GetAt(iIndex) as ObjectReference
-	ref.EnableNoWait()
-	_00E_TeleportOutVFX.Play(ref)
-	ref.GetLinkedRef().EnableNoWait()
-	MAGIllusionNightEyeOn.Play(ref)
-  
+		if ! bActive
+			return
+		endif
+		
+		iIndex -= 1
+		ObjectReference ref = _00E_FS_NQ07_LightList.GetAt(iIndex) as ObjectReference
+		ref.EnableNoWait()
+		ref.GetLinkedRef().EnableNoWait()
+		
+		if ref.Is3DLoaded()
+			_00E_TeleportOutVFX.Play(ref)
+			MAGIllusionNightEyeOn.Play(ref)
+		endif
+	
 	endwhile
 
 EndFunction
@@ -43,11 +54,13 @@ Function DisableAllRefsInFormlist()
  
 	while iIndex > 0
  
-	iIndex -= 1
-	ObjectReference ref = _00E_FS_NQ07_LightList.GetAt(iIndex) as ObjectReference
-	ref.DisableNoWait()
-	ref.GetLinkedRef().DisableNoWait()
-  	MAGIllusionNightEyeOff.Play(ref)
+		iIndex -= 1
+		ObjectReference ref = _00E_FS_NQ07_LightList.GetAt(iIndex) as ObjectReference
+		if ref.Is3DLoaded()
+			MAGIllusionNightEyeOff.Play(ref)
+		endif
+		ref.DisableNoWait()
+		ref.GetLinkedRef().DisableNoWait()
   
 	endwhile