Wait for 3D to load in the Tealor and Irlanda scene

Recompiled WaitForReferenceToLoad users to use its new signature
Refresh the cooldown spell if it got dispelled for whatever reason
2024-02-26 20:28:26 +01:00 · 2024-02-26 19:31:00 +01:00 · 2024-02-26 17:39:08 +01:00
19 changed files with 7 additions and 2 deletions
--- a/scripts/_00E_Func_WaitForRef.pex
+++ b/scripts/_00E_Func_WaitForRef.pex
--- a/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex
+++ b/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex
--- a/scripts/_00e_fs_nqr05_functions.pex
+++ b/scripts/_00e_fs_nqr05_functions.pex
--- a/scripts/_00e_game_oorbayaspawnsc.pex
+++ b/scripts/_00e_game_oorbayaspawnsc.pex
--- a/scripts/_00e_game_talentcontrolsc.pex
+++ b/scripts/_00e_game_talentcontrolsc.pex
--- a/scripts/_00e_game_talentcooldownsc.pex
+++ b/scripts/_00e_game_talentcooldownsc.pex
--- a/scripts/_00e_mq07a_functions.pex
+++ b/scripts/_00e_mq07a_functions.pex
--- a/scripts/_00e_mq11a_functions.pex
+++ b/scripts/_00e_mq11a_functions.pex
--- a/scripts/_00e_mq12b_functions.pex
+++ b/scripts/_00e_mq12b_functions.pex
--- a/scripts/_00e_mq14_functions.pex
+++ b/scripts/_00e_mq14_functions.pex
--- a/scripts/_00e_mq16_functions.pex
+++ b/scripts/_00e_mq16_functions.pex
--- a/scripts/_00e_nq10_functions.pex
+++ b/scripts/_00e_nq10_functions.pex
--- a/scripts/_00e_nq15functions.pex
+++ b/scripts/_00e_nq15functions.pex
--- a/scripts/_00e_nq26_questfunctions.pex
+++ b/scripts/_00e_nq26_questfunctions.pex
--- a/scripts/_00e_phasmalist_workbench.pex
+++ b/scripts/_00e_phasmalist_workbench.pex
--- a/scripts/_00e_playerhousing_mannequincontrol.pex
+++ b/scripts/_00e_playerhousing_mannequincontrol.pex
--- a/source/scripts/_00e_game_talentcontrolsc.psc
+++ b/source/scripts/_00e_game_talentcontrolsc.psc
@ -48,6 +48,9 @@ Event OnPlayerLoadGame()
 				GoToState("RealPlayer")
 			endif
 			RegisterForActions()
+			if CooldownMagicEffect == None || CooldownMagicEffect as String == "[_00E_Game_TalentCooldownSC <None>]"
+				RefreshCooldownSpell()
+			endif
 		endif
 	else
 		Debug.Trace("NO SKSE: individual shout cooldowns are disabled")
@ -63,7 +66,7 @@ State RealPlayer
 		; This OnUpdate is triggered by RegisterForUpdates in other scripts attached to the player, e.g. in _00E_EPUpdateFunctions.
 		; So we must be cautious here.

-		If (CooldownMagicEffect == None && _00E_Game_TalentControl_CooldownResetDesired.GetValue() != 0)
+		If (CooldownMagicEffect == None && _00E_Game_TalentControl_CooldownResetDesired.GetValueInt() != 0)
 			_00E_Game_TalentControl_CooldownResetDesired.SetValue(0)
 			AddSpell(_00E_Game_AbTalentCooldown, False)
 		EndIf
--- a/source/scripts/_00e_game_talentcooldownsc.psc
+++ b/source/scripts/_00e_game_talentcooldownsc.psc
@ -27,7 +27,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)

 	LastTimeElapsed = 0.0

-	Player = Game.GetPlayer() as _00E_Game_TalentControlSC
+	Player = Game.GetForm(0x14) as _00E_Game_TalentControlSC

 	CurrentShout = Player.GetEquippedShout()

--- a/source/scripts/_00e_mq16_functions.psc
+++ b/source/scripts/_00e_mq16_functions.psc
@ -263,7 +263,9 @@ Function EnableMemory()
    MQ16_SC05_Tealor.MoveTo(MQ16_SC05_IllusionTealorStartMarker)
    MQ16_SC05_Irlanda.Enable(True)
    MQ16_SC05_Tealor.Enable(True)
+	_00E_Func_WaitForRef.WaitForReferenceToLoad(MQ16_SC05_Tealor)
    MQ16_SC05_Tealor.PlaceAtMe(ExplosionIllusionDark01, 1)
+	_00E_Func_WaitForRef.WaitForReferenceToLoad(MQ16_SC05_Irlanda)
    MQ16_SC05_Irlanda.PlaceAtMe(ExplosionIllusionDark01, 1)
    _00E_HighOnesDisintegrate.Play(MQ16_SC05_Tealor)
    _00E_HighOnesDisintegrate.Play(MQ16_SC05_Irlanda)
Author	SHA1	Message	Date
Eddoursul	e94716792a	Wait for 3D to load in the Tealor and Irlanda scene	2024-02-26 20:28:26 +01:00
Eddoursul	1e0e263547	Recompiled WaitForReferenceToLoad users to use its new signature	2024-02-26 19:31:00 +01:00
Eddoursul	7530eb221d	Refresh the cooldown spell if it got dispelled for whatever reason	2024-02-26 17:39:08 +01:00