source/scripts/ArmorWeightPerkFixAlias.psc

@@ -1,4 +1,4 @@
-Scriptname _00E_ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
+Scriptname ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
 
 Event OnPlayerLoadGame()
 

source/scripts/_00E_FixStuckHelpMessagesAlias.psc

@@ -1,11 +0,0 @@
-Scriptname _00E_FixStuckHelpMessagesAlias extends ReferenceAlias Hidden 
-
-Event OnPlayerLoadGame()
-
-	; Clear stuck help messages, leaking between game loads
-	Message.ResetHelpMessage("Clear")
-	_00E_MQP01_Thoughts01.ShowAsHelpMessage("Clear", 0.1, 1, 1)
-
-EndEvent
-
-Message Property _00E_MQP01_Thoughts01  Auto  

source/scripts/_00E_IntegrityCheckAlias.psc

@@ -1,25 +1,37 @@
 Scriptname _00E_IntegrityCheckAlias extends ReferenceAlias Hidden 
 
 Event OnInit()
-	RegisterForSingleUpdate(2.0) ; Give a few seconds for the game to warm up at the start
+	
+	; 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()
-	RegisterForSingleUpdate(1.2)
-EndEvent
 
-Event OnUpdate()
-
-	; 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(0.1)
-		Game.QuitToMainMenu()
-		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly.")
-	EndIf
+	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  

source/scripts/_00e_playersetupscript.psc

@@ -1,5 +1,5 @@
 Scriptname _00E_PlayerSetUpScript extends ObjectReference  
-{Initializes player's actor values}
+{Initializes all the necessary Quests, maintains the player, contains various OnPlayerLoadGame() failsafes. This script is important for proper updating, do not overwrite it.}
 
 int function _GetScriptVersion() Global
 	return 1
@@ -10,13 +10,28 @@ endFunction
 ;=====================================================================================
 
 Event OnInit()
-
+	
+	If self != (PlayerREF as ObjectReference)
+		return
+	EndIf
+	
 	PlayerREF.SetActorValue("speedMult", 95)
 	PlayerREF.SetActorValue("Healrate", 0)
 
 EndEvent
 
 Event OnPlayerLoadGame()
+	If self == (PlayerREF as ObjectReference) ; A check just in case. Most likely this condition is always True
+		Maintenance()
+	EndIf
+EndEvent
+
+
+;=====================================================================================
+;              							 MAINTENANCE                   					 
+;=====================================================================================
+
+Function Maintenance()
 
 	; changes to the actor value healrate will not persist in consecutive saves
 	; every time a save gets loaded the healrate needs to be set to 0, otherwise it will go back again to default at 0.7
@@ -28,7 +43,11 @@ Event OnPlayerLoadGame()
 		PlayerREF.Dismount()
 	EndIf
 
-EndEvent
+	; Clear stuck help messages, leaking between game loads
+	Message.ResetHelpMessage("Clear")
+	(Game.GetForm(0xAC80E) as Message).ShowAsHelpMessage("Clear", 0.1, 1, 1)
+
+EndFunction
 
 ;=====================================================================================
 ;              							 PROPERTIES