From ddf5960320029600b961d865ebdb2ffb214294d6 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Fri, 27 Oct 2023 21:14:07 +0200
Subject: [PATCH] Moved integrity checks to a separate quest

---
 IntegrityCheck.esp                          | Bin 0 -> 455 bytes
 scripts/_00E_IntegrityCheckAlias.pex        | Bin 0 -> 1362 bytes
 scripts/_00e_playersetupscript.pex          | Bin 4497 -> 3809 bytes
 source/scripts/_00E_IntegrityCheckAlias.psc |  37 ++++++++++++++++++++
 source/scripts/_00e_playersetupscript.psc   |  25 -------------
 5 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 IntegrityCheck.esp
 create mode 100644 scripts/_00E_IntegrityCheckAlias.pex
 create mode 100644 source/scripts/_00E_IntegrityCheckAlias.psc

diff --git a/IntegrityCheck.esp b/IntegrityCheck.esp
new file mode 100644
index 0000000000000000000000000000000000000000..131a35a57290dd15bfd226a1a84634048c66a914
GIT binary patch
literal 455
zcmZ`#T}#6-6g}071BW2ngO3GY{TSlAgeKKuSGFcCf)Ar?VV1R<w3*PKqWH(eM}Npn
zS{(=)NI3VNd+)g?g7K?2{642Tyk#`%;`QbIdPhee4&a7l*a2l8i35Ql;o<;%QI}b9
zE~^5R2-4ZkY3cZBmMZxV?SL(3vP^U5%<)#`e5I6JI$W*FOjdvN_@PK_SX$yHibp*S
z#xWO0@!_J?HSuQ)QS`BEpz*?}PkZo}O3uqn)k0Qkyw(qrA)#~Z!B{l6nU1E{BrP0c
zG8nMQw$*)<(*?=1w9@2BOL~0bS6c($`;)24p0)RxrT5%y4liv`{eN8?S=bmQb3%5n
p_a{2v`XT`rcEgasr~4S?X)Q~5O@Yaiz>943HA;kg_fyI!@CCq_T*&|c

literal 0
HcmV?d00001

diff --git a/scripts/_00E_IntegrityCheckAlias.pex b/scripts/_00E_IntegrityCheckAlias.pex
new file mode 100644
index 0000000000000000000000000000000000000000..436f20b644b3dd33f2d0561cd8043406f342b01f
GIT binary patch
literal 1362
zcmb7D(QZ>m5It+(*daJBl!THL=n`ltAgr`~su5C2i6cu*(-H)a*5=-cv#{B<?(W6S
zH&yC4^u6>K`XNXton70(MXCh5vV3M{XXe~9yKkQV`A@wD0bcar^bcGeY;JB3`Zmz8
z)ZygEBg$VsGFti0$mdwvE(%wbzA_SRn&Hk^TZwzP@_)Hpd~t`ueo%pMZpQ^TfsH-e
zw>sd$p8dtB6Dogls@PG-gw@oz=gOfAf$V;8r6!NYkuD0dIG;OP=%Afd2JI(wNF~{v
z5>edgb`z1_{-E#QFYzc3`W4eC2Cr0!_RzQkWf*F8U<fxqAQ9Qm&hlq;yYc@SSIIn?
zLtNrq8XQ(OALLOr|I!ocPb!PG_abBqDwQdW!S_8rAHPF}BNe0{>%hsLE$yW{ctLrP
z!Ldowk0{rNnhNQYj*FJYQyKR|sqGL;&TiXc;%j!h6VP&Yi-wvdjN-F9(D7&!*_Lw#
z%_?ZaV@9j*`*xRXwd)E(>$%e5%$nwWgN2@PD$Htpi#lJEne|<o@H1s9LN?}fWWzYf
z_OF!=Pu;H4sXP`6I;fcHE_ttpwB>%oF_VsZ$oukaT5>w^4*6rrQdk!xH!rBTA)m4s
zv9=s*V^XB7tQ?hYM5Q_D$h{F+`B()dd)ly;$`+DroUhcOgWLa=yrfW-HY!dsuS&j0
zJcg*%>`nZR1-`!mwfIINsLwzKG|}MQ<h_IzmQ$RM*KrA}xSY%eICkx9U&j}axWT)|
zSy&X4$0z>6xrCxEIOF`RON(LR5_`nh0`KLCE1nT(vswR4pds)HTZ!MAzy*PebLOXW
zCKFs{ifIX~FxPigF3(k27T~%o{JS#eMK<5RhBd4w4oz<QxxiI{wZwrdB~YLEuT9B_
z?BVOzf3MU}Pfy=|9P7q>-wZP;H>UlUxY|wDPT+d#-xiRJS(6P$(Iq&>c!Qa3M7uFz
pcI%AU5A0;$mjYkSNq1Y|>)DYS?yO@a72^r6;x1=Qmsn@H{snTwA;16t

literal 0
HcmV?d00001

diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index 6cdc7d9175a2b1b54642b32c86e7d4df0f8f5fe6..60737b7de27e86a5e83ff9d54d84e541c2db5b92 100644
GIT binary patch
literal 3809
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

literal 4497
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

diff --git a/source/scripts/_00E_IntegrityCheckAlias.psc b/source/scripts/_00E_IntegrityCheckAlias.psc
new file mode 100644
index 00000000..35c6e72f
--- /dev/null
+++ b/source/scripts/_00E_IntegrityCheckAlias.psc
@@ -0,0 +1,37 @@
+Scriptname _00E_IntegrityCheckAlias extends ReferenceAlias Hidden 
+
+Event OnInit()
+	
+	; needs the IsInMenuMode() check to prevent stuck messages
+	While Utility.IsInMenuMode()
+		Utility.WaitMenuMode(0.1)
+	EndWhile
+
+	CheckForgottenStories()
+	
+	_00E_Func_CheckSKSE.Run()
+	_00E_Func_CheckEnderalDLL.Run()
+
+EndEvent
+
+Event OnPlayerLoadGame()
+
+	CheckForgottenStories()
+
+	_00E_Func_CheckSKSE.Run()
+	_00E_Func_CheckEnderalDLL.Run()
+
+EndEvent
+
+function CheckForgottenStories()
+	; If Enderal - Forgotten Stories.esm is not loaded, kick the player back to main menu
+
+	if _00E_FS_IsForgottenStoriesActivated.GetValue() as Int != 1
+		Utility.wait(2.0)
+		Game.QuitToMainMenu()
+		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly. Open Data Files and enable it.")
+		return
+	EndIf
+endfunction
+
+GlobalVariable Property _00E_FS_IsForgottenStoriesActivated  Auto  
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index e832cd0d..d0c5050e 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -14,16 +14,6 @@ Event OnInit()
 	If self != (PlayerREF as ObjectReference)
 		return
 	EndIf
-
-	; needs the IsInMenuMode() check to prevent stuck messages when FS is not loaded
-	While Utility.IsInMenuMode()
-		Utility.WaitMenuMode(0.1)
-	EndWhile
-
-	CheckForgottenStories()
-	
-	_00E_Func_CheckSKSE.Run()
-	_00E_Func_CheckEnderalDLL.Run()
 	
 	GoToState("RealPlayer")
 	PlayerREF.SetActorValue("speedMult", 95)
@@ -43,11 +33,6 @@ EndEvent
 
 Event OnPlayerLoadGame()
 	If self == (PlayerREF as ObjectReference) ; A check just in case. Most likely this condition is always True
-		CheckForgottenStories()
-		
-		_00E_Func_CheckSKSE.Run()
-		_00E_Func_CheckEnderalDLL.Run()
-	
 		Maintenance()
 		If GetState() != "RealPlayer"
 			GoToState("RealPlayer")
@@ -129,16 +114,6 @@ EndFunction
 ;              							 MAINTENANCE                   					 
 ;=====================================================================================
 
-function CheckForgottenStories()
-	; If Enderal - Forgotten Stories.esm is not loaded, kick the player back to main menu
-	if (Game.GetForm(0x4320E) as GlobalVariable).GetValue() as Int != 1
-		Utility.wait(2.0)
-		Game.QuitToMainMenu()
-		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly. Open Data Files and enable it.")
-		return
-	EndIf
-endfunction
-
 Function Maintenance()
 
 	; changes to the actor value healrate will not persist in consecutive saves