Moved fadeout functions from Levelsystem

source/scripts/_00e_fs_nq02_functions.psc

@@ -1,6 +1,7 @@
 Scriptname _00E_FS_NQ02_Functions extends Quest  
 
 Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 Import Utility
 Import Game
 
@@ -38,8 +39,9 @@ EndFunction
 
 Function GivePlayerGewuerzwein()
 
-	Levelsystem.FadeToBlack()
-	Levelsystem.FadeToBlackBack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
+	FadeToBlackControl.FadeToBlackBack()
 	PlayerREF.AddItem(FoodSolitudeSpicedWine, 1)
 	SetStage(90)
 
@@ -373,14 +375,16 @@ EndFunction
 
 Function SteintafelFound()
 
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	
 	Levelsystem.SetAllowIdleChatter(false)
 	_00E_FS_NQ02_Travelbox3.Disable()
-	Levelsystem.FadeToBlack()
+	FadeToBlackControl.FadeToBlack()
 	_00E_FS_NQ02_EsmeREF.MoveTo(_00E_FS_NQ02_SC10_Marker5)
 	_00E_FS_NQ02_WaerterREF.MoveTo(_00E_FS_NQ02_SC10_Marker3)
 	PlayerREF.MoveTo(_00E_FS_NQ02_SC10_Marker4)
 	StopTravelWithEsme()
-	Levelsystem.FadeToBlackBack()
+	FadeToBlackControl.FadeToBlackBack()
 
 EndFunction
 
@@ -678,8 +682,9 @@ EndFunction
 
 Function SC15FadeOutIn()
 
-	Levelsystem.FadeToBlack()
-	Levelsystem.FadeToBlackBack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
+	FadeToBlackControl.FadeToBlackBack()
 
 EndFunction
 

source/scripts/_00e_fs_nq02_functions2.psc

@@ -1,6 +1,6 @@
 Scriptname _00E_FS_NQ02_Functions2 extends Quest  
 
-Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 Import Utility
 Import Game
 
@@ -298,8 +298,9 @@ EndFunction
 
 Function SC19FadeOut()
 
-	Levelsystem.FadeToBlack()
-	Levelsystem.FadeToBlackBack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
+	FadeToBlackControl.FadeToBlackBack()
 	_00E_SilenceLongTransitionHighPriority.Add()
 
 EndFunction
@@ -312,10 +313,10 @@ Function SC19DisableEsme()
 	_00E_SilenceLongTransitionHighPriority.Remove()
 	_00E_FS_NQ02_Music_Theme.Remove()
 	if SympathyEsme.GetValue() >= 0
-	SetStage(960)
+		SetStage(960)
 	else
-	SetStage(1060)
-	Levelsystem.GiveEP(3000)
+		SetStage(1060)
+		_00E_EPHandler.GiveEP(3000)
 	endif
 
 EndFunction
@@ -351,14 +352,15 @@ Function MoveToEpilogPosition()
 	If PlayerREF.IsSneaking()
     		PlayerREF.StartSneaking()
 	EndIf
-	Levelsystem.FadeToBlack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
 	_00E_FS_NQ02_EsmeREF.MoveTo(_00E_FS_NQ02_SC21_EsmeMarker)
 	PlayerREF.MoveTo(_00E_FS_NQ02_SC21_PlayerMarker)
 	_00E_SilenceLongTransitionHighPriority.Add()
 	Levelsystem.SkipTimeToHour(20)
 	SkyrimClear_Aurora_Green.ForceActive(True)
 	Game.ForceThirdPerson()
-	Levelsystem.FadeToBlackBack()
+	FadeToBlackControl.FadeToBlackBack()
 	DisablePlayerControls()
 	SetStage(1005)
 
@@ -366,14 +368,16 @@ EndFunction
 
 Function EndEpilog()
 
-	Levelsystem.FadeToBlack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	
+	FadeToBlackControl.FadeToBlack()
 	PlayerREF.MoveTo(_00E_FS_NQ02_SC21_Marker2)
 	EnablePlayerControls()
 	_00E_SilenceLongTransitionHighPriority.Remove()
 	_00E_FS_NQ02_Music_Theme.Remove()
-	Levelsystem.FadeToBlackBack()
+	FadeToBlackControl.FadeToBlackBack()
 	Weather.ReleaseOverride()
-	Levelsystem.GiveEP(3500)
+	_00E_EPHandler.GiveEP(3500)
 	Setstage(1030)
 	
 	If _00E_AchievementsEnabled.GetValueInt() == 1

source/scripts/_00e_fs_nq02_lagerfeuerscript.psc

@@ -5,7 +5,8 @@ Import Utility
 Event OnActivate(ObjectReference akActionRef)
 	if akActionRef == PlayerREF && FS_NQ02.GetStage() == 70
 		GoToState("DoNothing")
-		Levelsystem.FadeToBlack()
+		_00E_FadeToBlackControl FadeToBlackControl = _00E_PlayerFunctions.GetFadeToBlackControl()
+		FadeToBlackControl.FadeToBlack()
 		FS_NQ02.SetStage(80)
 		wait(0.1)
 		_00E_FS_NQ02_EsmeREF.MoveTo(_00E_FS_NQ02_SC02_EsmeMarker2)
@@ -14,7 +15,7 @@ Event OnActivate(ObjectReference akActionRef)
 		Levelsystem.SkipTimeToHour(0)
 		_00E_SilenceLongTransitionHighPriority.Add()
 		self.Disable()
-		Levelsystem.FadeToBlackBack()
+		FadeToBlackControl.FadeToBlackBack()
 
 	Endif
 EndEvent
@@ -32,4 +33,4 @@ _00E_QuestFunctions Property Levelsystem Auto
 ObjectReference Property _00E_FS_NQ02_SC02_PlayerMarker Auto
 ObjectReference Property _00E_FS_NQ02_SC02_EsmeMarker2 Auto
 ObjectReference Property _00E_FS_NQ02_CaravanCampfireOff Auto
-MusicType Property _00E_SilenceLongTransitionHighPriority Auto
+MusicType Property _00E_SilenceLongTransitionHighPriority Auto

source/scripts/_00e_fs_nq03_functions.psc

@@ -1,6 +1,6 @@
 Scriptname _00E_FS_NQ03_Functions extends Quest  
 
-Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 Import Utility
 Import Game
 
@@ -37,7 +37,7 @@ Function PrepareSC02()
 	Game.DisablePlayerControls()
 	_FS_TheriantrophistControlQuest.TransformBackIfTransformed()
 	_00E_TeleportGlobal.SetValue(1)
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	PlayerREF.MoveTo(_00E_FS_NQ03_SC02_PlayerMarker)
 	_00E_FS_NQ03_DisableRatsMarker.Disable() ; This enables Yuslan, Lexil and Lishari
 	_00E_FS_NQ03_YuslanREF.MoveTo(_00E_FS_NQ03_SC02_YuslanMarker)
@@ -53,7 +53,7 @@ EndFunction
 
 Function FadeBack()
 
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	Game.EnablePlayerControls()
 	
 EndFunction
@@ -256,7 +256,7 @@ EndFunction
 
 Function TeleportPlayerToVision2()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	PlayerREF.PlayIdle(IdleStop_Loose)
 	Game.SetPlayerAIDriven(False)
 	_00E_MAGEldritchFireM.Play(PlayerREF)
@@ -265,7 +265,7 @@ Function TeleportPlayerToVision2()
 	_00E_FS_NQ03_PlayerVoiceREF.MoveTo(_00E_FS_NQ03_PlayerVoiceMarker2)
 	wait(0.1)
 	Game.EnablePlayerControls()
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	wait(0.1)
 	FS_NQ03_SC18_TavernForcegreet.ForceStart()
 	Game.RequestAutoSave()
@@ -307,7 +307,7 @@ EndFunction
 Function StartSC20()
 
 	Game.SetPlayerAIDriven(True)
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	FS_NQ03_SC20_TavernTalk.ForceStart()
 	PlayerREF.Moveto(_00E_FS_NQ03_SC20_PlayerChair)
 	_00E_FS_NQ03_GarrecREF.Moveto(_00E_FS_NQ03_SC20_GarrecChair)
@@ -315,7 +315,7 @@ Function StartSC20()
 	_00E_FS_NQ03_SC20_Door.SetOpen(false)
 	Game.DisablePlayerControls()
 	wait(3)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 
 EndFunction
 
@@ -356,7 +356,7 @@ EndFunction
 
 Function KnockOut()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	_00E_FS_NQ03_FaintIMOD.Remove()
 	PlayerREF.MoveTo(_00E_FS_NQ03_SC21_PlayerMarker)
 	wait(0.1)
@@ -376,14 +376,14 @@ EndFunction
 Function Wakeup()
 
 	_00E_FS_NQ03_SC21_Door.SetOpen(false)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	_00E_FS_NQ03_FaintIMOD.Apply()
 
 EndFunction
 
 Function FadeToBlack()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	_00E_FS_NQ03_FaintIMOD.Remove()
 	_00E_MQ07a_VisionIMOD.Remove()
 
@@ -420,7 +420,7 @@ EndFunction
 
 Function SetUpEpilogTalk()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	Game.DisablePlayerControls()
 	PlayerREF.MoveTo(_00E_FS_NQ03_SC22_PlayerMarker2)
 	_00E_FS_NQ03_LexilREF.MoveTo(_00E_FS_NQ03_SC22_LexilChair)
@@ -436,13 +436,13 @@ Function SetUpEpilogTalk()
 	_00E_FS_NQ03_SC02_StorageDoor.Lock(false)
 	Game.EnablePlayerControls()
 	SetStage(260)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 
 EndFunction
 
 Function FinishQuest()
 
-	Levelsystem.GiveEP(1000)
+	_00E_EPHandler.GiveEP(1000)
 	_00E_FS_NQ03_FinishedVar.SetValue(1)
 	_00E_TeleportGlobal.SetValue(0)
 
@@ -478,8 +478,6 @@ EndEvent
 Int GameDay
 Int SoundID01
 
-_00E_QuestFunctions Property Levelsystem Auto
-
 Quest Property FS_NQ03 Auto
 
 Actor Property _00E_FS_NQ03_MessengerGirlREF Auto

source/scripts/_00e_fs_nq05_functions.psc

@@ -2,8 +2,6 @@ Scriptname _00E_FS_NQ05_Functions extends Quest
 
 Import Utility
 Import Game
-Import _00E_QuestFunctions
-_00E_QuestFunctions Property Levelsystem Auto
 
 ;=====================================================================================
 ;              							FUNCTIONS                  					 
@@ -86,10 +84,11 @@ EndFunction
 
 Function Warten()
 
-	Levelsystem.FadeToBlack()
+	_00E_FadeToBlackControl FadeToBlackControl = _00E_PlayerFunctions.GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
 	wait(3)
 	Mirell.MoveTo(FS_NQ05MirellWohnzimmerMarker)
-	Levelsystem.FadeToBlackBack()
+	FadeToBlackControl.FadeToBlackBack()
 	SetCurrentStageID(75)
 
 EndFunction
@@ -112,7 +111,7 @@ Function GiveMirellElixir()
 
 	PlayerREF.RemoveItem(FS_NQ05_Elixier, 1)
 	PlayerREF.AddItem(FS_NQ05_Amulett, 1)
-	Levelsystem.GiveEP(300)
+	_00E_EPHandler.GiveEP(300)
 
 EndFunction
 
@@ -142,7 +141,7 @@ EndFunction
 
 Function PrepareEnde2()
 
-	Levelsystem.GiveEP(350)
+	_00E_EPHandler.GiveEP(350)
 	Tochter.SetGhost(false)
 	Tochter.SetActorValue("Aggression", 2)
 	Tochter.RemoveFromAllFactions()
@@ -173,7 +172,7 @@ Function GivePlayerBelohnung()
 
 	PlayerREF.RemoveItem(FS_NQ05_Elixier, 1)
 	PlayerREF.AddItem(FS_NQ05_Amulett, 1)
-	Levelsystem.GiveEP(400)
+	_00E_EPHandler.GiveEP(400)
 
 EndFunction
 

source/scripts/_00e_fs_nq06_functions.psc

@@ -1,6 +1,6 @@
 Scriptname _00E_FS_NQ06_Functions extends Quest  
 
-Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 Import Utility
 Import Game
 
@@ -78,14 +78,14 @@ EndFunction
 
 Function MoveDariusToJail()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	wait(1)
 	PlayerREF.MoveTo(_00E_FS_NQ06_PlayerJailMarker)
 	_00E_FS_NQ06_DariusKupferhammerREF.MoveTo(_00E_FS_NQ06_DariusJailMarker)
 	_00E_FS_NQ06_DariusKupferhammerREF.EvaluatePackage()
 	_00E_FS_NQ06_GuardREF.MoveTo(_00E_FS_NQ06_GuardPresentEvidenceMarker)
 	_00E_FS_NQ06_GuardREF.EvaluatePackage()
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	
 EndFunction
 
@@ -101,14 +101,14 @@ Function EndDariusInJail()
 
 	PlayerREF.AddItem(Gold001, 500)
 	PlayerREF.RemoveItem(_00E_FS_NQ06_LetterLighthouse, 1)
-	Levelsystem.GiveEP(1500)
+	_00E_EPHandler.GiveEP(1500)
 	wait(1)
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	wait(1)
 	PlayerREF.MoveTo(_00E_FS_NQ06_PlayerJailMarker)
 	_00E_FS_NQ06_GuardREF.MoveTo(_00E_FS_NQ06_GuardStandMarker)
 	_00E_FS_NQ06_GuardREF.EvaluatePackage()
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	SetStage(130)
 
 EndFunction
@@ -117,9 +117,9 @@ Function EndKarymeaInJail()
 
 	PlayerREF.AddItem(Gold001, 500)
 	PlayerREF.RemoveItem(_00E_FS_NQ06_LetterLighthouse, 1)
-	Levelsystem.GiveEP(1500)
+	_00E_EPHandler.GiveEP(1500)
 	wait(1)
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	wait(1)
 	PlayerREF.MoveTo(_00E_FS_NQ06_PlayerJailMarker)
 	_00E_FS_NQ06_GuardREF.MoveTo(_00E_FS_NQ06_GuardStandMarker)
@@ -129,7 +129,7 @@ Function EndKarymeaInJail()
 	_00E_FS_NQ06_KarymeaREF.MoveTo(_00E_FS_NQ06_DariusJailMarker)
 	_00E_FS_NQ06_KarymeaREF.EvaluatePackage()
 	_00E_FS_NQ06_KarymeaREF.BlockActivation(true)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	SetStage(160)
 
 EndFunction

source/scripts/_00e_fs_nq07_doorrepairscript.psc

@@ -1,13 +1,12 @@
 Scriptname _00E_FS_NQ07_DoorRepairScript extends ObjectReference  
 
-Import _00E_QuestFunctions
-
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ07.GetStage() >= 115 && akActionRef == PlayerREF && PlayerREF.GetItemCount(_00E_FS_NQ07_MiscDoor) >= 1)
+	if (FS_NQ07.GetCurrentStageID() >= 115 && akActionRef == PlayerREF && PlayerREF.GetItemCount(_00E_FS_NQ07_MiscDoor) >= 1)
+		_00E_FadeToBlackControl FadeToBlackControl = _00E_PlayerFunctions.GetFadeToBlackControl()
 		PlayerREF.RemoveItem(_00E_FS_NQ07_MiscDoor, PlayerREF.GetItemCount(_00E_FS_NQ07_MiscDoor))
-		Levelsystem.FadeToBlack()
+		FadeToBlackControl.FadeToBlack()
 		_00E_FS_NQ07_AuroraDoorREF.Enable()
-		Levelsystem.FadeToBlackBack()
+		FadeToBlackControl.FadeToBlackBack()
 		FS_NQ07.SetObjectiveCompleted(35)
 		_00E_FS_NQ07_DoorRepaired.SetValue(1)
 		Disable()
@@ -19,17 +18,14 @@ Event OnActivate(ObjectReference akActionRef)
 EndEvent
 
 Event OnUnload()
-	if FS_NQ07.GetStage() >= 130
+	if FS_NQ07.GetCurrentStageID() >= 130
 		Disable()
 	EndIf
 EndEvent
 
 Message Property _00E_FS_NQ07_RepairDoorMSG Auto
-
-
 Actor Property PlayerREF Auto
-_00E_QuestFunctions Property Levelsystem Auto
 MiscObject Property _00E_FS_NQ07_MiscDoor Auto
 ObjectReference Property _00E_FS_NQ07_AuroraDoorREF Auto
 Quest Property FS_NQ07 Auto
-GlobalVariable Property _00E_FS_NQ07_DoorRepaired Auto
+GlobalVariable Property _00E_FS_NQ07_DoorRepaired Auto

source/scripts/_00e_fs_nq07_functions.psc

@@ -1,6 +1,6 @@
 Scriptname _00E_FS_NQ07_Functions extends Quest  
 
-Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 Import Utility
 Import Game
 
@@ -9,15 +9,15 @@ Import Game
 ;=====================================================================================
 
 Function SetupSC01()
-	
-	Levelsystem.FadeToBlack()
+
+	GetFadeToBlackControl().FadeToBlack()
 	_00E_FS_NQ07_SC01_DisableMarker.Disable()
 	_00E_FS_NQ07_Aushang1.Disable()
 	_00E_FS_NQ07_Aushang2.Disable()
 	wait(1)
 	_00E_FS_NQ07_MaxusREF.MoveTo(_00E_FS_NQ07_MaxusTavernMarker)
 	PlayerREF.MoveTo(_00E_FS_NQ07_PlayerTavernMarker)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	SetCurrentStageID(30)
  
 EndFunction
@@ -115,7 +115,7 @@ EndFunction
 Function GiveAuroraTrank()
 
 	;_00E_FS_NQ07_AuroraREF.AddItem(_00E_FS_NQ07_AuroraTrank, 1)
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	PlayerREF.RemoveItem(_00E_FS_NQ07_AuroraTrank, 1, true, _00E_FS_NQ07_AuroraREF)
 	wait(1)
 	
@@ -129,7 +129,7 @@ Function GiveAuroraTrank()
 	; break the pipesmoking animation bug by reseting the NPC
 	_00E_FS_NQ07_AuroraREF.Reset(_00E_FS_NQ07_AuroraREF)
 	
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	wait(1)
 	SetCurrentStageID(135)
 
@@ -411,8 +411,9 @@ EndFunction
 
 Function FadeAndForcegreet()
 
-	Levelsystem.FadeToBlack()
-	Levelsystem.FadeToBlackBack()
+	_00E_FadeToBlackControl FadeToBlackControl = GetFadeToBlackControl()
+	FadeToBlackControl.FadeToBlack()
+	FadeToBlackControl.FadeToBlackBack()
 	;FS_NQ07_SC06_MaxusForcegreet.ForceStart()
 
 EndFunction
@@ -420,7 +421,7 @@ EndFunction
 Function GivePlayerBelohnung()
 
 	PlayerREF.AddItem(Gold001, 450)
-	Levelsystem.GiveEP(1800)
+	_00E_EPHandler.GiveEP(1800)
 
 EndFunction
 
@@ -433,7 +434,7 @@ EndFunction
 Function StartDinnerScene()
 
 	_00E_SilenceTransitionLowPriority.Add()
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	wait(1)
 	_00E_FS_NQ07_DinnerEnableMarker.Enable()
 	Game.DisablePlayerControls()
@@ -447,7 +448,7 @@ Function StartDinnerScene()
 	SkyrimClear.ForceActive(True)
 	FS_NQ07_SC07_DinnerScene.ForceStart()
 	wait(1)
-	Levelsystem.FadeToBlackBack()
+	GetFadeToBlackControl().FadeToBlackBack()
 	
 EndFunction
 
@@ -460,7 +461,7 @@ EndFunction
 
 Function EndDinnerScene()
 
-	Levelsystem.FadeToBlack()
+	GetFadeToBlackControl().FadeToBlack()
 	wait(1)
 	Levelsystem.SkipTimeToHour(8)
 	SetObjectiveCompleted(95)
@@ -476,8 +477,8 @@ Function EndDinnerScene()
 	_00E_SilenceTransitionLowPriority.Remove()
 	Weather.ReleaseOverride()
 	wait(1)
-	Levelsystem.FadeToBlackBack()
-	Levelsystem.GiveEP(2000)
+	GetFadeToBlackControl().FadeToBlackBack()
+	_00E_EPHandler.GiveEP(2000)
 
 EndFunction
 

source/scripts/_00e_mq11a_functions.psc

@@ -3,7 +3,7 @@ Scriptname _00E_MQ11a_Functions extends Quest Conditional
 Import Utility
 Import Game
 Import Debug
-Import _00E_QuestFunctions
+Import _00E_PlayerFunctions
 
 ;=====================================================================================
 ;                                       EVENTS                                       
@@ -134,7 +134,7 @@ Function CheckSpokenWith()
         Self.SetStage(37)
     EndIf
 
-    Levelsystem.GiveEP(__Config_RewardEXPSpeakWithPeople)
+    _00E_EPHandler.GiveEP(__Config_RewardEXPSpeakWithPeople)
 
 EndFunction
 
@@ -175,7 +175,7 @@ Function SetUpExplosion()
     
     CompanionIsTalking.SetValueInt(0)
     _00E_SilenceTransitionHighPriority.Add()
-    Levelsystem.FadeToBlack()
+    GetFadeToBlackControl().FadeToBlack()
     Levelsystem.SkipTimeToHour(22)
     MQ11a_SC6_SnowdriftParent.Disable()
     MQ11a_SC6_ParentBarrel.Enable()
@@ -648,7 +648,7 @@ Function PortPlayerBack()
     GoToState("DefaultState")
     CompanionIsTalking.SetValueInt(1)
     Game.DisablePlayerControls()
-    Levelsystem.FadeToBlack()
+    GetFadeToBlackControl().FadeToBlack()
     PlayerREF.MoveTo(MQ11a_PlayerMainHallMarker)
     _00E_MC_CaliaREF.MoveTo(PlayerREF, 72.0) ; Port Calia to the right of the player
     CaliaEquipTorch(True)
@@ -939,7 +939,7 @@ EndFunction
 
 Function SetUpAndStartLibraryScene()
 	
-	UnsummonApparitionIfExists()
+	_FS_Phasmalist_ControlQuest.UnsummonApparitionIfExists()
     SetCaliaAsCompanion(False)
     MQ11a_SC21_WrongDoor002.BlockActivation(True)
     Game.RequestAutoSave()
@@ -1446,7 +1446,7 @@ Function GoToFrostcliffTavern()
     EndIf
     
     Game.DisablePlayerControls()
-    Levelsystem.FadeToBlack()
+    GetFadeToBlackControl().FadeToBlack()
 
     _00E_Music_Special_MQ11a_Reanimation.Remove()
     RemoveCaliaTheme()
@@ -1516,7 +1516,7 @@ Function FinishQuest()
     RemoveCaliaTheme()
     RegisterForSingleUpdateGameTime(9)
     bStartCaliaCQ = True
-    Levelsystem.GiveEP(1500)
+    _00E_EPHandler.GiveEP(1500)
     MQ11a_SC26_Door.SetLockLevel(30)
     MQ11a_SC26_Door.Lock(false)
 

source/scripts/_00e_mq11c_functions.psc

@@ -180,9 +180,8 @@ Function GiveEPForHits()
 
 	int RewardEPNormalHits = (_00E_MQ11c_Sphere_HitsLanded.GetValueInt()*30)
 	int RewardEPEOTSHits = (_00E_MQ11c_Sphere_HitsLandedEOTS.GetValueInt()*10)
-	Levelsystem.GiveEP(RewardEPNormalHits+RewardEPEOTSHits)
+	_00E_EPHandler.GiveEP(RewardEPNormalHits+RewardEPEOTSHits)
 
-	
 EndFunction
 
 ;------------------------------------------Stealth minigame------------------------------------
@@ -289,7 +288,7 @@ EndFunction
 Function GiveEPForButterflies()
 
 	int RewardEPButterfly = PlayerREF.GetItemCount(_00E_MQ11cSchmetterling)
-	Levelsystem.GiveEP(RewardEPButterfly*50)
+	_00E_EPHandler.GiveEP(RewardEPButterfly*50)
 	
 	if PlayerREF.GetItemCount(_00E_MQ11cSchmetterling) > 7
 	
@@ -569,10 +568,11 @@ Function BuryRyneus()
 		EndIf
 		
 		MQ11c_D13_RyneusBurialMarker.Disable()
-		Levelsystem.FadeToBlack()
+		_00E_FadeToBlackControl FadeToBlackControl = _00E_PlayerFunctions.GetFadeToBlackControl()
+		FadeToBlackControl.FadeToBlack()
 		PlayerREF.MoveTo(MQ11c_D13_RyneusBurialPlayerMarker)
 		MQ11c_RyneusRefReal.Disable()
-		Levelsystem.FadeToBlackBack()
+		FadeToBlackControl.FadeToBlackBack()
 
 		Wait(3)
 		PostTransformCleanup()

source/scripts/_00e_questfunctions.psc

@@ -523,34 +523,6 @@ Function TeleportOut()
 
 EndFunction
 
-;=====================================================================================
-;   		      						FADE TO BLACK            					 
-;=====================================================================================
-
-Function FadeToBlackAndBack()
-
-	FadeToBlackIMOD.Apply()
-	Wait(2.8)
-	FadeToBlackIMOD.PopTo(FadeToBlackHoldIMOD)
-	Wait(1.9)
-	FadeToBlackHoldIMOD.PopTo(FadeToBlackBackIMOD)
-
-EndFunction
-
-Function FadeToBlack()
-
-	FadeToBlackIMOD.Apply()
-	Wait(2.8)
-	FadeToBlackIMOD.PopTo(FadeToBlackHoldImod)
-	
-EndFunction
-
-Function FadeToBlackBack()
-
-	FadeToBlackHoldImod.PopTo(FadeToBlackBackImod)
-
-EndFunction
-
 
 ;=====================================================================================
 ;   		      						VISION          			  				
@@ -1269,9 +1241,6 @@ Spell Property _00E_FS_NQR05_SlowMotionSP Auto
 
 GlobalVariable Property _00E_HeadtrackGlobal Auto
 
-ImageSpaceModifier Property FadeToBlackIMOD Auto
-ImageSpaceModifier Property FadeToBlackHoldIMOD Auto
-ImageSpaceModifier Property FadeToBlackBackIMOD Auto
 ImageSpaceModifier Property _00E_NPCTeleportExplosionIMOD Auto
 ImageSpaceModifier Property _00E_TeleportImod Auto
 ImageSpaceModifier Property _00E_VisionStartTimestopIMOD Auto

source/scripts/tif__000753c4.psc

@@ -6,11 +6,9 @@ Scriptname TIF__000753C4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-Levelsystem.FadeToBlackAndBack()
+_00E_PlayerFunctions.GetFadeToBlackControl().FadeToBlackAndBack()
 ;END CODE
 EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
-
-_00E_QuestFunctions Property Levelsystem Auto

source/scripts/tif__0011b1fb.psc

@@ -6,7 +6,7 @@ Scriptname TIF__0011B1FB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-Levelsystem.FadeToBlackAndBack()
+_00E_PlayerFunctions.GetFadeToBlackControl().FadeToBlackAndBack()
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,5 +21,3 @@ EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
-
-_00E_QuestFunctions Property Levelsystem Auto

source/scripts/tif__0102b428.psc

@@ -6,11 +6,9 @@ Scriptname TIF__0102B428 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-Levelsystem.FadeToBlackAndBack()
+_00E_PlayerFunctions.GetFadeToBlackControl().FadeToBlackAndBack()
 ;END CODE
 EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
-
-_00E_QuestFunctions Property Levelsystem Auto