diff --git a/scripts/_00E_BrawlControl.pex b/scripts/_00E_BrawlControl.pex index b68ef14bf..c68647761 100644 Binary files a/scripts/_00E_BrawlControl.pex and b/scripts/_00E_BrawlControl.pex differ diff --git a/scripts/_00E_EngineBugfixAlias.pex b/scripts/_00E_EngineBugfixAlias.pex index b5c56d9d7..45791382b 100644 Binary files a/scripts/_00E_EngineBugfixAlias.pex and b/scripts/_00E_EngineBugfixAlias.pex differ diff --git a/scripts/_00e_epupdatefunctions.pex b/scripts/_00e_epupdatefunctions.pex index af730dc56..76cfd81a8 100644 Binary files a/scripts/_00e_epupdatefunctions.pex and b/scripts/_00e_epupdatefunctions.pex differ diff --git a/scripts/_00e_fs_nq01_functions.pex b/scripts/_00e_fs_nq01_functions.pex index 565a3a380..2897f6392 100644 Binary files a/scripts/_00e_fs_nq01_functions.pex and b/scripts/_00e_fs_nq01_functions.pex differ diff --git a/scripts/_00e_fs_nq07_functions.pex b/scripts/_00e_fs_nq07_functions.pex index 1fe7ad95c..5074a2670 100644 Binary files a/scripts/_00e_fs_nq07_functions.pex and b/scripts/_00e_fs_nq07_functions.pex differ diff --git a/scripts/_00e_mq01_functions.pex b/scripts/_00e_mq01_functions.pex index fe5e24dce..3bbb5d522 100644 Binary files a/scripts/_00e_mq01_functions.pex and b/scripts/_00e_mq01_functions.pex differ diff --git a/scripts/_00e_mq08triggerhouse.pex b/scripts/_00e_mq08triggerhouse.pex index 6cfc430f1..713659367 100644 Binary files a/scripts/_00e_mq08triggerhouse.pex and b/scripts/_00e_mq08triggerhouse.pex differ diff --git a/scripts/_00e_mq10b_lisharitriggerbox.pex b/scripts/_00e_mq10b_lisharitriggerbox.pex index 55ceea5f2..5bc386709 100644 Binary files a/scripts/_00e_mq10b_lisharitriggerbox.pex and b/scripts/_00e_mq10b_lisharitriggerbox.pex differ diff --git a/scripts/_00e_mq11a_functions.pex b/scripts/_00e_mq11a_functions.pex index 31d41bf80..199a84b26 100644 Binary files a/scripts/_00e_mq11a_functions.pex and b/scripts/_00e_mq11a_functions.pex differ diff --git a/scripts/_00e_mqp02_functions.pex b/scripts/_00e_mqp02_functions.pex index f647cebc8..7848b60ef 100644 Binary files a/scripts/_00e_mqp02_functions.pex and b/scripts/_00e_mqp02_functions.pex differ diff --git a/scripts/_00e_mqp03_functions.pex b/scripts/_00e_mqp03_functions.pex index 6b7a43ad1..0aaf3e4bf 100644 Binary files a/scripts/_00e_mqp03_functions.pex and b/scripts/_00e_mqp03_functions.pex differ diff --git a/scripts/_00e_nq12functions.pex b/scripts/_00e_nq12functions.pex index 68e830d53..63a455379 100644 Binary files a/scripts/_00e_nq12functions.pex and b/scripts/_00e_nq12functions.pex differ diff --git a/scripts/_00e_nq16note.pex b/scripts/_00e_nq16note.pex index 37f84f12f..16a58c369 100644 Binary files a/scripts/_00e_nq16note.pex and b/scripts/_00e_nq16note.pex differ diff --git a/scripts/_00e_nq26_questfunctions.pex b/scripts/_00e_nq26_questfunctions.pex index 3fe325ff3..5ad9a9595 100644 Binary files a/scripts/_00e_nq26_questfunctions.pex and b/scripts/_00e_nq26_questfunctions.pex differ diff --git a/scripts/_00e_nq_g_03_functions.pex b/scripts/_00e_nq_g_03_functions.pex index 9550552e0..934bb2850 100644 Binary files a/scripts/_00e_nq_g_03_functions.pex and b/scripts/_00e_nq_g_03_functions.pex differ diff --git a/scripts/_00e_nq_g_07_functions.pex b/scripts/_00e_nq_g_07_functions.pex index 113091ac6..90487e366 100644 Binary files a/scripts/_00e_nq_g_07_functions.pex and b/scripts/_00e_nq_g_07_functions.pex differ diff --git a/scripts/_00e_peaceweedplayeraliasscript.pex b/scripts/_00e_peaceweedplayeraliasscript.pex index bf7613e55..d845e5e7f 100644 Binary files a/scripts/_00e_peaceweedplayeraliasscript.pex and b/scripts/_00e_peaceweedplayeraliasscript.pex differ diff --git a/scripts/_00e_phasmalist_apparationtoplayer.pex b/scripts/_00e_phasmalist_apparationtoplayer.pex index 0ff2700fd..2a6a4d05d 100644 Binary files a/scripts/_00e_phasmalist_apparationtoplayer.pex and b/scripts/_00e_phasmalist_apparationtoplayer.pex differ diff --git a/scripts/_00e_phasmalist_playeraliasscript.pex b/scripts/_00e_phasmalist_playeraliasscript.pex index 42260a8d5..cd10945f0 100644 Binary files a/scripts/_00e_phasmalist_playeraliasscript.pex and b/scripts/_00e_phasmalist_playeraliasscript.pex differ diff --git a/scripts/_00e_showsneakhelpmessage.pex b/scripts/_00e_showsneakhelpmessage.pex index 922ae9fd9..1b4d8c173 100644 Binary files a/scripts/_00e_showsneakhelpmessage.pex and b/scripts/_00e_showsneakhelpmessage.pex differ diff --git a/scripts/_00e_showtutorialmessage.pex b/scripts/_00e_showtutorialmessage.pex index 02ea677d6..9b89ed485 100644 Binary files a/scripts/_00e_showtutorialmessage.pex and b/scripts/_00e_showtutorialmessage.pex differ diff --git a/scripts/_sag_activ_diceblackjackmainsscript.pex b/scripts/_sag_activ_diceblackjackmainsscript.pex index 90763984e..dd951f600 100644 Binary files a/scripts/_sag_activ_diceblackjackmainsscript.pex and b/scripts/_sag_activ_diceblackjackmainsscript.pex differ diff --git a/scripts/_sag_playcards_mainscript.pex b/scripts/_sag_playcards_mainscript.pex index dd54d781b..1f7aeda42 100644 Binary files a/scripts/_sag_playcards_mainscript.pex and b/scripts/_sag_playcards_mainscript.pex differ diff --git a/source/scripts/_00E_BrawlControl.psc b/source/scripts/_00E_BrawlControl.psc index 3f432f128..dbb4941a4 100644 --- a/source/scripts/_00E_BrawlControl.psc +++ b/source/scripts/_00E_BrawlControl.psc @@ -9,8 +9,7 @@ EndFunction Function ShowBrawlTutorial() If _00E_DisableSkillTutorials.GetValueInt() == 0 - Message.ResetHelpMessage("Brawl") - _00E_Tutorial_Brawl.ShowAsHelpMessage("Brawl", 3, 3, 1) + _00E_HelpMessage.Show(_00E_Tutorial_Brawl, 3) EndIf EndFunction diff --git a/source/scripts/_00E_EngineBugfixAlias.psc b/source/scripts/_00E_EngineBugfixAlias.psc index 580ffdf9d..4e06e2718 100644 --- a/source/scripts/_00E_EngineBugfixAlias.psc +++ b/source/scripts/_00E_EngineBugfixAlias.psc @@ -1,7 +1,7 @@ Scriptname _00E_EngineBugfixAlias extends ReferenceAlias Hidden int function _GetScriptVersion() Global - return 1 + return 2 endFunction Event OnInit() @@ -21,7 +21,7 @@ Event OnPlayerLoadGame() _ResetPerk(PlayerREF, _00E_Class_Vagrant_P05_B_Lightweight) EndIf - ; ResetHelpMessage crashes the game when called in menu mode, for instance, when loading a savegame fails due to missing mods + ; Wait for game mode Utility.Wait(0.05) ; If a help message is visible during game reload, it gets stuck on screen @@ -44,8 +44,7 @@ EndFunction Event _ClearStuckHelpMessages() if EnderalFunctions.GetNewGameCount() > 1 - Message.ResetHelpMessage("Empty") - _00E_EmptyMessage.ShowAsHelpMessage("Empty", 0.1, 10, 1) + _00E_HelpMessage.Show(_00E_EmptyMessage, 0.1) endif EndEvent diff --git a/source/scripts/_00e_epupdatefunctions.psc b/source/scripts/_00e_epupdatefunctions.psc index cb2ccfa51..504a6b81c 100644 --- a/source/scripts/_00e_epupdatefunctions.psc +++ b/source/scripts/_00e_epupdatefunctions.psc @@ -16,7 +16,7 @@ int IntimidationsCounter = 0 int QuestsCompletedCounter = 0 int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -115,8 +115,7 @@ State RealPlayer if ShowEXPMessage == False && PlayerEXP.GetValue() >= 120 && (_00E_DisableQuestTutorials.GetValueInt() == 0) ShowEXPMessage = true - Message.ResetHelpMessage("Empty") - _00E_Tutorial_EPSystem.ShowAsHelpMessage("Empty", 4.0, 3.0, 1) + _00E_HelpMessage.Show(_00E_Tutorial_EPSystem, 4) EndIf If _00E_OreVeinsMined.GetValueInt() >= 50 && !bOreAchievementUnlocked @@ -157,8 +156,7 @@ State RealPlayer iArcaneFeverWarnCounter -= 1 If iArcaneFeverWarnCounter <= 0 iArcaneFeverWarnCounter = 20 - Message.ResetHelpMessage("Empty") - _00E_Player_sArcaneFever_Critical.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_HelpMessage.Show(_00E_Player_sArcaneFever_Critical, 5) EndIf Else ; iArcaneFever < 90 iArcaneFeverWarnCounter = 0 ; Reset @@ -167,8 +165,7 @@ State RealPlayer If iArcaneFever >= 40 If Player.HasSpell(_00E_Arkanistenfieber40) == False Player.AddSpell(_00E_Arkanistenfieber40,0) - Message.ResetHelpMessage("Empty") - _00E_Player_sArcaneFever_Worsen.ShowAsHelpMessage("Empty", 3, 1, 1) + _00E_HelpMessage.Show(_00E_Player_sArcaneFever_Worsen, 3) EndIf Else ; iArcaneFever < 40 If Player.HasSpell(_00E_Arkanistenfieber40) @@ -180,8 +177,7 @@ State RealPlayer If iArcaneFever >= 70 If Player.HasSpell(_00E_Arkanistenfieber70) == False Player.AddSpell(_00E_Arkanistenfieber70,0) - Message.ResetHelpMessage("Empty") - _00E_Player_sArcaneFever_Worsen.ShowAsHelpMessage("Empty", 4, 1, 1) + _00E_HelpMessage.Show(_00E_Player_sArcaneFever_Worsen, 4) EndIf Else ; iArcaneFever < 70 If Player.HasSpell(_00E_Arkanistenfieber70) diff --git a/source/scripts/_00e_fs_nq01_functions.psc b/source/scripts/_00e_fs_nq01_functions.psc index 64cd6359c..db0f78b4e 100644 --- a/source/scripts/_00e_fs_nq01_functions.psc +++ b/source/scripts/_00e_fs_nq01_functions.psc @@ -1,7 +1,7 @@ Scriptname _00E_FS_NQ01_Functions extends Quest Conditional int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -557,7 +557,7 @@ Function UpdateObjectives02() IncreaseArcaneFever(10, 90) _00E_FS_NQ01_RespectedYuslansWish.SetValueInt(1) - _00E_FS_NQ01_YuslanThought.ShowAsHelpMessage("Jump", 5, 1, 1) + _00E_FS_NQ01_YuslanThought.ShowAsHelpMessage("_00E_FS_NQ01_YuslanThought", 5, 1, 1) SetObjectiveCompleted(50) SetObjectiveDisplayed(55, False) SetObjectiveDisplayed(60) diff --git a/source/scripts/_00e_fs_nq07_functions.psc b/source/scripts/_00e_fs_nq07_functions.psc index 37aa7353b..e9e941657 100644 --- a/source/scripts/_00e_fs_nq07_functions.psc +++ b/source/scripts/_00e_fs_nq07_functions.psc @@ -505,7 +505,6 @@ EndFunction Function ShowThoughts() - ; Message.ResetHelpMessage("Empty") ; _00E_FS_NQ07_Thoughts.ShowAsHelpMessage("Empty", 5, 1, 1) EndFunction diff --git a/source/scripts/_00e_mq01_functions.psc b/source/scripts/_00e_mq01_functions.psc index 1755c279e..01cb9da95 100644 --- a/source/scripts/_00e_mq01_functions.psc +++ b/source/scripts/_00e_mq01_functions.psc @@ -3,7 +3,7 @@ scriptName _00E_MQ01_Functions extends Quest Conditional Import Utility int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -24,8 +24,7 @@ EndFunction Function ShowDialogueTutorial() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_Dialogues.ShowAsHelpMessage("Empty", 5 as Float, 1 as Float, 1) + _00E_MQP03_Tutorial_Dialogues.ShowAsHelpMessage("_00E_MQP03_Tutorial_Dialogues", 5 as Float, 1 as Float, 1) EndFunction @@ -41,8 +40,7 @@ Function BeginHeadache() _00E_BlitzheilungArkanistenfieber_sFeverIncreased.Show(15.0, -1*PlayerREF.GetActorValue("LastFlattered")) debug.SendAnimationEvent(PlayerREF as objectreference, "StaggerPlayer") MagVampireSunlight.Play(PlayerREF as objectreference) - Message.ResetHelpMessage("Empty") - _00E_MQ01_ThoughtsHeadache.ShowAsHelpMessage("Empty", 3 as Float, 1 as Float, 1) + _00E_MQ01_ThoughtsHeadache.ShowAsHelpMessage("_00E_MQ01_ThoughtsHeadache", 3 as Float, 1 as Float, 1) _00E_MQ01_HeadacheShort.apply(1.00000) Wait(1) SoundID01 = UIHealthHeartbeatALP.Play(PlayerREF as objectreference) diff --git a/source/scripts/_00e_mq08triggerhouse.psc b/source/scripts/_00e_mq08triggerhouse.psc index b4403bf2d..161731f9e 100644 --- a/source/scripts/_00e_mq08triggerhouse.psc +++ b/source/scripts/_00e_mq08triggerhouse.psc @@ -3,12 +3,10 @@ Scriptname _00E_MQ08TriggerHouse extends ObjectReference Event OnTriggerEnter(ObjectReference akActionRef) if MQ08_IntoTheDeep.GetCurrentStageID() == 180 && akActionRef == Game.GetPlayer() && DoOnce == False - Message.ResetHelpMessage("Jump") - _00E_MQ08_HouseMessage01.ShowAsHelpMessage("Jump", 2, 1, 1) DoOnce = True + _00E_MQ08_HouseMessage01.ShowAsHelpMessage("_00E_MQ08_HouseMessage01", 2, 1, 1) Utility.Wait(2.0) - Message.ResetHelpMessage("Jump") - _00E_MQ08_HouseMessage02.ShowAsHelpMessage("Jump", 2, 1, 1) + _00E_MQ08_HouseMessage02.ShowAsHelpMessage("_00E_MQ08_HouseMessage02", 2, 1, 1) Utility.Wait(3.0) MQ08_IntoTheDeep.SetCurrentStageID(185) EndIf @@ -18,4 +16,4 @@ EndEvent Message Property _00E_MQ08_HouseMessage01 Auto Message Property _00E_MQ08_HouseMessage02 Auto Quest Property MQ08_IntoTheDeep Auto -Bool DoOnce \ No newline at end of file +Bool DoOnce diff --git a/source/scripts/_00e_mq10b_lisharitriggerbox.psc b/source/scripts/_00e_mq10b_lisharitriggerbox.psc index ca23e83ff..0d5bd5d77 100644 --- a/source/scripts/_00e_mq10b_lisharitriggerbox.psc +++ b/source/scripts/_00e_mq10b_lisharitriggerbox.psc @@ -4,8 +4,7 @@ Scriptname _00E_MQ10b_LishariTriggerbox extends ObjectReference Event OnTriggerEnter(ObjectReference akActionRef) if akActionRef == Game.GetPlayer() && MQ10b.GetCurrentStageID() == 70 && DoOnce == 0 - Message.ResetHelpMessage("Empty") - _00E_MQ10b_ThiningMessage01.ShowAsHelpMessage("Empty", 3, 2, 1) + _00E_HelpMessage.Show(_00E_MQ10b_ThiningMessage01, 3) _00E_MC_YuslanRef.EnableNoWait() _00E_MC_YuslanRef.MoveTo(mq10bYuslanPortDeathscene) Game.DisablePlayerControls() diff --git a/source/scripts/_00e_mq11a_functions.psc b/source/scripts/_00e_mq11a_functions.psc index cd5a6d6ba..53716b03a 100644 --- a/source/scripts/_00e_mq11a_functions.psc +++ b/source/scripts/_00e_mq11a_functions.psc @@ -6,7 +6,7 @@ Import Debug Import _00E_PlayerFunctions int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -510,9 +510,8 @@ EndFunction Function ShowTutorialMessage02() - Message.ResetHelpMessage("MQ11a_TutorialCrosshair") If _00E_DisableQuestTutorials.GetValueInt() == 0 - _00E_MQ11a_TutorialArrows.ShowAsHelpMessage("MQ11a_TutorialArrows", 5, 5, 1) + _00E_MQ11a_TutorialArrows.ShowAsHelpMessage("MQ11a_TutorialArrows", 5, 1, 1) EndIf EndFunction @@ -543,10 +542,6 @@ EndFunction Function ExplodeGears() UnregisterForUpdate() - - Message.ResetHelpMessage("MQ11a_TutorialArrows") - Message.ResetHelpMessage("MQ11a_TutorialCrosshair") - Message.ResetHelpMessage("Telekinesis") Wait(1) MQ11a_SC12_ExplosionMarker.PlaceAtMe(_00E_HarmlessFireExplosion, 1) @@ -1284,8 +1279,7 @@ Function StopVision() (PlayerREF as _00E_PlayerFunctions).ResumeRandomHeadTracking() MQ11a_SC25_MayasREF.SetAlpha(0.0) ; Some kind of failsave inherited from old _00E_MQ11a_SC25_FailsaveSC Wait(3) - Message.ResetHelpMessage("MQ11a_TutorialArrows") - _00E_MQ11a_SC23_MayaMessage.ShowAsHelpMessage("MQ11a_TutorialMaya", 5, 1, 1) + _00E_HelpMessage.Show(_00E_MQ11a_SC23_MayaMessage, 5) EndFunction @@ -1293,7 +1287,6 @@ EndFunction Function StartLastFight() - Message.ResetHelpMessage("MQ11a_TutorialMaya") SwitchAllTeleportation(False) Game.RequestAutoSave() @@ -1413,7 +1406,7 @@ Function CaliaAndVeiledWomanDisappear() (PlayerREF as _00E_PlayerFunctions).ResumeRandomHeadTracking() Self.SetCurrentStageID(210) MQ11a_SC26_DoorREF.BlockActivation(False) - _00E_MQ11a_SC23_Calia.ShowAsHelpMessage("MQ11aFinalCalia", 5, 1, 1) + _00E_HelpMessage.Show(_00E_MQ11a_SC23_Calia, 5) EndFunction @@ -1579,9 +1572,8 @@ Event OnUpdate() If MQ11a_LeftTowerLocal == 3 If PlayerREF.GetItemCount(_00E_MQ11a_SC9_GunpowderSatchel) == 0 - Message.ResetHelpMessage("MQ11a_TutorialCrosshair") If _00E_DisableQuestTutorials.GetValueInt() == 0 - _00E_MQ11a_Tutorial_Telekinesis.ShowAsHelpMessage("Telekinesis", 5, 1, 1) + _00E_HelpMessage.Show(_00E_MQ11a_Tutorial_Telekinesis, 5) EndIf Return diff --git a/source/scripts/_00e_mqp02_functions.psc b/source/scripts/_00e_mqp02_functions.psc index 12cc45064..8cdb393c4 100644 --- a/source/scripts/_00e_mqp02_functions.psc +++ b/source/scripts/_00e_mqp02_functions.psc @@ -3,7 +3,7 @@ Scriptname _00E_MQP02_Functions extends Quest Conditional Import Utility int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -128,7 +128,6 @@ EndFunction Function ShowLanternMessage() - Message.ResetHelpMessage("Activate") _00E_MQP02_Tutorial_Activate.ShowAsHelpMessage("Activate", 5, 1, 1) EndFunction @@ -159,7 +158,6 @@ EndFunction Function StartCombatMusic() - Message.ResetHelpMessage("Attack") Game.RequestAutoSave() _00E_MQP02_CombatMusic.Add() MQP02_SC4_JailDoor.Lock(True) diff --git a/source/scripts/_00e_mqp03_functions.psc b/source/scripts/_00e_mqp03_functions.psc index e71270a9b..dd8b2c041 100644 --- a/source/scripts/_00e_mqp03_functions.psc +++ b/source/scripts/_00e_mqp03_functions.psc @@ -4,7 +4,7 @@ Import Utility Import Game int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -15,11 +15,9 @@ Event OnUpdate() If (Self.GetCurrentStageID() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0 If Game.UsingGamepad() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("_00E_MQP03_Tutorial_LeaveMenuHintConsole", 5, 1, 1) Else - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_LeaveMenuHint.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Tutorial_LeaveMenuHint.ShowAsHelpMessage("_00E_MQP03_Tutorial_LeaveMenuHint", 5, 1, 1) EndIf RegisterForSingleUpdate(15) Else @@ -59,8 +57,7 @@ Function ShowVisionBinkMovie() EndFunction function SetupPlayer() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Thoughts01.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Thoughts01.ShowAsHelpMessage("_00E_MQP03_Thoughts01", 5, 1, 1) Game.SetInCharGen(false, true, false) PlayerREF.AddShout(_00E_Class_Meditate) PlayerREF.EquipShout(_00E_Class_Meditate) @@ -102,8 +99,7 @@ Function ShowThoughtBox() AudioCategoryAMB.Unmute() AudioCategoryAMB2x.Unmute() AudioCategoryAMBr.Unmute() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Thoughts03.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Thoughts03.ShowAsHelpMessage("_00E_MQP03_Thoughts03", 5, 1, 1) EndFunction @@ -115,37 +111,32 @@ EndFunction Function ShowSkillbookTutorial() If _00E_DisableMenuTutorials.GetValueInt() == 0 - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_Skillbooks.ShowAsHelpMessage("Empty", 4, 1, 1) + _00E_MQP03_Tutorial_Skillbooks.ShowAsHelpMessage("_00E_MQP03_Tutorial_Skillbooks", 4, 1, 1) EndIf Lernpunkte.SetValueInt(1) _00E_MQP03_sLearningPointGained.Show(1) Wait(6) If _00E_DisableMenuTutorials.GetValueInt() == 0 - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_Skillbooks2.ShowAsHelpMessage("Empty", 4, 1, 1) + _00E_MQP03_Tutorial_Skillbooks2.ShowAsHelpMessage("_00E_MQP03_Tutorial_Skillbooks2", 4, 1, 1) EndIf EndFunction Function ShowSleepTutorial() If _00E_DisableOtherTutorials.GetValueInt() == 0 - Message.ResetHelpMessage("Empty") - _00E_MQP03_Tutorial_Rest.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Tutorial_Rest.ShowAsHelpMessage("_00E_MQP03_Tutorial_Rest", 5, 1, 1) EndIf EndFunction Function ShowThoughtBox05() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Thoughts05.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Thoughts05.ShowAsHelpMessage("_00E_MQP03_Thoughts05", 5, 1, 1) EndFunction Function ShowThoughtBox06() - Message.ResetHelpMessage("Empty") - _00E_MQP03_Thoughts06.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQP03_Thoughts06.ShowAsHelpMessage("_00E_MQP03_Thoughts06", 5, 1, 1) EndFunction @@ -168,7 +159,7 @@ Function FinishQuestAndStartMQ01() MQ01.SetCurrentStageID(5) Wait(1) If _00E_DisableOtherTutorials.GetValueInt() == 0 - _00E_MQ01_Tutorial_FoodAndMushrooms.ShowAsHelpMessage("Empty", 5, 1, 1) + _00E_MQ01_Tutorial_FoodAndMushrooms.ShowAsHelpMessage("_00E_MQ01_Tutorial_FoodAndMushrooms", 5, 1, 1) EndIf EndFunction diff --git a/source/scripts/_00e_nq12functions.psc b/source/scripts/_00e_nq12functions.psc index be22fd510..e0dd6d858 100644 --- a/source/scripts/_00e_nq12functions.psc +++ b/source/scripts/_00e_nq12functions.psc @@ -1,5 +1,9 @@ Scriptname _00E_NQ12Functions extends Quest +int function _GetScriptVersion() Global + return 1 +endFunction + ;===================================================================================== ; EVENTS ;===================================================================================== @@ -39,8 +43,7 @@ EndFunction Function ShowThoughtMessage() SetObjectiveCompleted(20) - Message.ResetHelpMessage("Empty") - _00E_NQ12_Message01.ShowAsHelpMessage("Empty", 4, 0, 1) + _00E_NQ12_Message01.ShowAsHelpMessage("_00E_NQ12_Message01", 4, 1, 1) EndFunction diff --git a/source/scripts/_00e_nq16note.psc b/source/scripts/_00e_nq16note.psc index 22baf9c2e..c94048e1e 100644 --- a/source/scripts/_00e_nq16note.psc +++ b/source/scripts/_00e_nq16note.psc @@ -6,8 +6,7 @@ Event OnRead() NQ16.SetObjectiveCompleted(10) Bandit.EnableNoWait() Utility.Wait(2) - Message.ResetHelpMessage("Empty") - _00E_NQ16Falle.ShowAsHelpMessage("Empty", 4, 1, 1) + _00E_HelpMessage.Show(_00E_NQ16Falle, 4) Utility.Wait(8) NQ16.SetCurrentStageID(10) DoOnce = true @@ -18,4 +17,4 @@ EndEvent ObjectReference Property Bandit Auto Quest Property NQ16 Auto Message Property _00E_NQ16Falle Auto -bool doonce = false \ No newline at end of file +bool doonce = false diff --git a/source/scripts/_00e_nq26_questfunctions.psc b/source/scripts/_00e_nq26_questfunctions.psc index 55d70752f..665e3f011 100644 --- a/source/scripts/_00e_nq26_questfunctions.psc +++ b/source/scripts/_00e_nq26_questfunctions.psc @@ -2,6 +2,10 @@ Scriptname _00E_NQ26_Questfunctions extends Quest Import Utility +int function _GetScriptVersion() Global + return 1 +endFunction + Function PortPhatira() Phatira.Enable() @@ -102,8 +106,7 @@ Function PortPahtira() Game.SetPlayerAIDriven(False) Game.ShowFirstPersonGeometry(true) Wait(2) - Message.ResetHelpMessage("Empty") - _00E_NQ26_DisplayTextGenerator.ShowAsHelpMessage("Empty", 7, 1, 1) + _00E_NQ26_DisplayTextGenerator.ShowAsHelpMessage("_00E_NQ26_DisplayTextGenerator", 7, 1, 1) NQ26Zenturio.Enable() NQ26_SC4.ForceStart() YeraiRef.MoveTo(NQ26YeraiPortMarker) diff --git a/source/scripts/_00e_nq_g_03_functions.psc b/source/scripts/_00e_nq_g_03_functions.psc index 47426cfb3..6dde69f35 100644 --- a/source/scripts/_00e_nq_g_03_functions.psc +++ b/source/scripts/_00e_nq_g_03_functions.psc @@ -3,7 +3,7 @@ Scriptname _00E_NQ_G_03_Functions extends Quest Conditional Import Utility int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -70,15 +70,9 @@ EndFunction Function ShowInnerVoice() - if !Done - if !(__Config_MessageBox) - Message.ResetHelpMessage(InputEventName) - TutorialMessage.ShowAsHelpMessage(InputEventName, Duration, IntervalTime, HowManyTimesDisplayed) - Done = True - Else - TutorialMessage.Show() - Done = True - EndIf + if ! Done + Done = true + _00E_HelpMessage.Show(TutorialMessage, 3) EndIf EndFunction diff --git a/source/scripts/_00e_nq_g_07_functions.psc b/source/scripts/_00e_nq_g_07_functions.psc index f32a3fd14..8afaef453 100644 --- a/source/scripts/_00e_nq_g_07_functions.psc +++ b/source/scripts/_00e_nq_g_07_functions.psc @@ -3,7 +3,7 @@ Scriptname _00E_NQ_G_07_Functions extends Quest Conditional Import Utility int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -1338,7 +1338,7 @@ EndFunction Function ShowLetterThoughtMessage() - _00E_NQG07_Mael_LetterThoughtMessage.ShowAsHelpMessage(_00E_NQG07_Mael_LetterThoughtMessage, 5, 1, 1) + _00E_NQG07_Mael_LetterThoughtMessage.ShowAsHelpMessage("_00E_NQG07_Mael_LetterThoughtMessage", 5, 1, 1) EndFunction diff --git a/source/scripts/_00e_peaceweedplayeraliasscript.psc b/source/scripts/_00e_peaceweedplayeraliasscript.psc index 9d2154acd..2aacb18f9 100644 --- a/source/scripts/_00e_peaceweedplayeraliasscript.psc +++ b/source/scripts/_00e_peaceweedplayeraliasscript.psc @@ -26,7 +26,7 @@ Actor Property PlayerRef Auto bool bSKSE = true int function _GetScriptVersion() Global - return 1 + return 2 endFunction ;===================================================================================== @@ -49,8 +49,7 @@ State PipeTutorial If akBaseItem == _00E_SmokingPipe GoToState("") If (_00E_DisableOtherTutorials.GetValueInt() == 0) - Message.ResetHelpMessage("Empty") - _00E_PeaceweedSmoking_PipeTutorial.ShowAsHelpMessage("Empty", 7, 30, 1) + _00E_HelpMessage.Show(_00E_PeaceweedSmoking_PipeTutorial, 7) EndIf EndIf EndEvent @@ -207,14 +206,13 @@ Function _TryStartSmoking() If (bQuitTutorialShown == False) && (_00E_DisableOtherTutorials.GetValueInt() == 0) bQuitTutorialShown = True - Message.ResetHelpMessage("Empty") If Game.UsingGamepad() If _00E_PeaceweedSmoking_ExitTutorial_Console == None _00E_PeaceweedSmoking_ExitTutorial_Console = Game.GetFormFromFile(0x000482F8, "Skyrim.esm") as Message EndIf - _00E_PeaceweedSmoking_ExitTutorial_Console.ShowAsHelpMessage("Empty", 7, 30, 1) + _00E_HelpMessage.Show(_00E_PeaceweedSmoking_ExitTutorial_Console, 7) Else - _00E_PeaceweedSmoking_ExitTutorial.ShowAsHelpMessage("Empty", 7, 30, 1) + _00E_HelpMessage.Show(_00E_PeaceweedSmoking_ExitTutorial, 7) EndIf EndIf RegisterForSingleUpdate(2.9) diff --git a/source/scripts/_00e_phasmalist_apparationtoplayer.psc b/source/scripts/_00e_phasmalist_apparationtoplayer.psc index 3edfc3256..7b006cbfa 100644 --- a/source/scripts/_00e_phasmalist_apparationtoplayer.psc +++ b/source/scripts/_00e_phasmalist_apparationtoplayer.psc @@ -10,7 +10,7 @@ GlobalVariable Property _00E_Phasmalist_TankMode Auto Event OnEffectStart(Actor akTarget, Actor akCaster) If _00E_Phasmalist_TeleportTutorialShown.GetValueInt() == 0 && _00E_DisableSkillTutorials.GetValueInt() == 0 _00E_Phasmalist_TeleportTutorialShown.SetValueInt(1) - _00E_Phasmalist_Tutorial_Teleport.ShowAsHelpMessage("Jump", 5, 1, 1) + _00E_Phasmalist_Tutorial_Teleport.ShowAsHelpMessage("_00E_Phasmalist_Tutorial_Teleport", 5, 1, 1) EndIf If controlQuest.IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0 diff --git a/source/scripts/_00e_phasmalist_playeraliasscript.psc b/source/scripts/_00e_phasmalist_playeraliasscript.psc index 82841a01d..434e3f2d7 100644 --- a/source/scripts/_00e_phasmalist_playeraliasscript.psc +++ b/source/scripts/_00e_phasmalist_playeraliasscript.psc @@ -9,11 +9,10 @@ Message Property _00E_Phasmalist_ForceDesummonMessage Auto Event OnLocationChange(Location akOldLoc, Location akNewLoc) If ControlQuest.IsBadApparitionLocation(akNewLoc) If ControlQuest.IsBadApparitionLocation(akOldLoc) == False && ControlQuest.IsApparitionSpawned() - Message.ResetHelpMessage("Empty") If akNewLoc && akNewLoc.HasKeyword(_00E_Phasmalist_NoSummonLocationTown) - _00E_Phasmalist_ForceDesummonMessageTown.ShowAsHelpMessage("Empty", 3.0, 1.0, 1) + _00E_HelpMessage.Show(_00E_Phasmalist_ForceDesummonMessageTown, 3) Else - _00E_Phasmalist_ForceDesummonMessage.ShowAsHelpMessage("Empty", 3.0, 1.0, 1) + _00E_HelpMessage.Show(_00E_Phasmalist_ForceDesummonMessage, 3) EndIf RegisterForSingleUpdate(6.0) EndIf diff --git a/source/scripts/_00e_showsneakhelpmessage.psc b/source/scripts/_00e_showsneakhelpmessage.psc index 4a952e74a..41167bbed 100644 --- a/source/scripts/_00e_showsneakhelpmessage.psc +++ b/source/scripts/_00e_showsneakhelpmessage.psc @@ -3,8 +3,7 @@ Scriptname _00E_ShowSneakHelpMessage extends ObjectReference Event OnTriggerEnter(ObjectReference akActionRef) if _00E_DisableTutorial.GetValueInt() == 0 && akActionRef == Game.GetForm(0x14) && ! DoOnce DoOnce = True - Message.ResetHelpMessage("Empty") - Helpmessage.ShowAsHelpMessage("Empty", 4, 30, 1) + _00E_HelpMessage.Show(Helpmessage, 4) EndIf EndEvent diff --git a/source/scripts/_00e_showtutorialmessage.psc b/source/scripts/_00e_showtutorialmessage.psc index a49fe7706..8afe98d0d 100644 --- a/source/scripts/_00e_showtutorialmessage.psc +++ b/source/scripts/_00e_showtutorialmessage.psc @@ -9,7 +9,6 @@ Event OnTriggerEnter(ObjectReference akActionRef) If Done == False && ((_00E_DisableTutorials == None) || (_00E_DisableTutorials.GetValueInt() == 0)) if !(__Config_MessageBox) Done = True - Message.ResetHelpMessage(InputEventName) TutorialMessage.ShowAsHelpMessage(InputEventName, Duration, IntervalTime, HowManyTimesDisplayed) Else If __Config_ShowOnlyOnce diff --git a/source/scripts/_sag_activ_diceblackjackmainsscript.psc b/source/scripts/_sag_activ_diceblackjackmainsscript.psc index bc180496e..1c9213c13 100644 --- a/source/scripts/_sag_activ_diceblackjackmainsscript.psc +++ b/source/scripts/_sag_activ_diceblackjackmainsscript.psc @@ -44,8 +44,6 @@ Function Step01() Opponent.GetReference().AddItem(Gold001, iStartGold*3) EndIf - Message.ResetHelpMessage("TossCoinTailsEvent") - Message.ResetHelpMessage("TossCoinHeadEvent") PlayerThrowing = 0 OpponentTHrowing = 0 PlayerScore = 0 @@ -116,11 +114,11 @@ Function CoinToss() Coin[CoinTossResult].Enable(true) if CoinTossResult == 0 - Head.ShowAsHelpMessage("TossCoinHeadEvent", 5.0, 1.0,1) + _00E_HelpMessage.Show(Head, 5) Utility.Wait(3.0) PlayerTurn() else - Tails.ShowAsHelpMessage("TossCoinTailsEvent", 5.0, 1.0,1) + _00E_HelpMessage.Show(Tails, 5) Utility.Wait(3.0) OpponentTurn() endif diff --git a/source/scripts/_sag_playcards_mainscript.psc b/source/scripts/_sag_playcards_mainscript.psc index 174d3e27f..9a151713e 100644 --- a/source/scripts/_sag_playcards_mainscript.psc +++ b/source/scripts/_sag_playcards_mainscript.psc @@ -87,7 +87,7 @@ int Function Step01() ; place your bet EnemyPurse.EnableNoWait(true) RegisterForKey(14) RegisterForKey(271) - Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 4.0, 3.0, 1) + _00E_HelpMessage.Show(Helps, 4) Step02() Return PlayerBet endif @@ -111,7 +111,7 @@ Function Step02() ; take player's cards Utility.Wait(2) RegisterForKey(46) RegisterForKey(280) - PressToCheatNow.ShowAsHelpMessage("PCCheatNow", 4.0, 3.0, 1) + _00E_HelpMessage.Show(PressToCheatNow, 4) Utility.Wait(4.0) UnregisterforKey(46) UnregisterforKey(280) @@ -135,7 +135,7 @@ Function Step02() ; take player's cards PlayerRef.RemoveItem(Gold001, BoostPrice, false, Opponent.GetReference()) DicesResult.Show(Dices, totalplayer) endif - Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 4.0, 3.0, 1) + _00E_HelpMessage.Show(Helps, 4) Step03() EndFunction @@ -172,7 +172,7 @@ Function Step03() ; take opponent's cards else EnemyResult.Show(totalEnemy) endif - Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 2.0, 3.0, 1) + _00E_HelpMessage.Show(Helps, 3) Step04() EndFunction @@ -256,8 +256,6 @@ Function FinishGameNoGold() totalplayer = 0 totalenemy = 0 - Message.ResetHelpMessage("ShowCurrentStatsPC") - Message.ResetHelpMessage("PCCheatNow") Utility.Wait(2.0) if initialFurn != none PlayerRef.MoveTo(initialFurn) @@ -296,8 +294,6 @@ Function ResetGame() globalbet = 0 totalplayer = 0 totalenemy = 0 - Message.ResetHelpMessage("ShowCurrentStatsPC") - Message.ResetHelpMessage("PCCheatNow") PlayCards() EndFunction @@ -334,9 +330,6 @@ Function FinishGameAndClearUp() totalplayer = 0 totalenemy = 0 - Message.ResetHelpMessage("ShowCurrentStatsPC") - Message.ResetHelpMessage("PCCheatNow") - ; Utility.Wait(2.0) if initialFurn != none PlayerRef.MoveTo(initialFurn)