diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index df514b734..2acd5cefb 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index 7db61e488..8914add04 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00E_EnderalVersion.pex b/scripts/_00E_EnderalVersion.pex index 67c21751d..a2a683ade 100644 Binary files a/scripts/_00E_EnderalVersion.pex and b/scripts/_00E_EnderalVersion.pex differ diff --git a/scripts/_00e_enderalmcm.pex b/scripts/_00e_enderalmcm.pex index 1a741612b..232ccb5ae 100644 Binary files a/scripts/_00e_enderalmcm.pex and b/scripts/_00e_enderalmcm.pex differ diff --git a/source/Enderal DLL/src/Main.cpp b/source/Enderal DLL/src/Main.cpp index d9d1dfb82..a1cdcbbbf 100644 --- a/source/Enderal DLL/src/Main.cpp +++ b/source/Enderal DLL/src/Main.cpp @@ -181,7 +181,7 @@ SKSEPluginLoad(const LoadInterface* skse) { auto* plugin = PluginDeclaration::GetSingleton(); auto version = plugin->GetVersion(); - logger::info("{} {} is loading...", plugin->GetName(), version); + logger::info("{} {} ({}) is loading...", plugin->GetName(), version, SemVerToInt({ version.major(), version.minor(), version.patch(), version.build() })); Init(skse); InitializeMessaging(); diff --git a/source/Enderal DLL/src/Util.h b/source/Enderal DLL/src/Util.h index 5b9a231cb..b62326e3d 100644 --- a/source/Enderal DLL/src/Util.h +++ b/source/Enderal DLL/src/Util.h @@ -123,7 +123,7 @@ inline void CheckScriptVersions() scripts["_00E_ContainerBonusControl"] = 2; scripts["_00E_AffinityControl"] = 1; scripts["_00E_SympathyControl"] = 1; - scripts["_00E_EnderalMCM"] = 1; + scripts["_00E_EnderalMCM"] = 2; scripts["_00E_SkillControl"] = 1; scripts["_00E_VisionControl"] = 1; scripts["_00E_EnderalControls"] = 1; diff --git a/source/scripts/_00E_EnderalVersion.psc b/source/scripts/_00E_EnderalVersion.psc index 7b62fd79c..7dd61e4bd 100644 --- a/source/scripts/_00E_EnderalVersion.psc +++ b/source/scripts/_00E_EnderalVersion.psc @@ -19,8 +19,15 @@ EndEvent Event OnPlayerLoadGame() - if iPatchVersion < GetVersion() - iPatchVersion = GetVersion() + if iPatchVersion < 33620992 ; 2.1.4 + Debug.Trace("Updating to v2.1.4 (33620992)...") + ; Synchronize KillMoveConfig with KillMove + (Game.GetForm(0x49425) as GlobalVariable).SetValue((Game.GetForm(0x100F19) as GlobalVariable).GetValue()) endif + if iPatchVersion < GetVersion() + Debug.Trace("Setting current version to " + GetVersion()) + iPatchVersion = GetVersion() + endif + EndEvent diff --git a/source/scripts/_00e_enderalmcm.psc b/source/scripts/_00e_enderalmcm.psc index 6525b799c..92cb97922 100644 --- a/source/scripts/_00e_enderalmcm.psc +++ b/source/scripts/_00e_enderalmcm.psc @@ -5,10 +5,11 @@ Scriptname _00E_EnderalMCM extends SKI_ConfigBase ;===================================================================================== int function _GetScriptVersion() Global - return 1 + return 2 endFunction event OnGameReload() + _00E_KillMove.SetValue(KillMoveConfig.GetValue() as bool) if SKSE.GetVersion() == 0 Debug.Trace("NO SKSE: the Mod Configuration Menu is disabled") return @@ -31,7 +32,7 @@ Event OnPageReset(string page) toggleOID_ReadAloudBooks = AddToggleOption(_00E_ConfigMenu_DisableReadAloudBooks.GetName(), _00E_DisableReadAloudBooks.GetValue() != 0) toggleOID_VideoSkip = AddToggleOption(_00E_ConfigMenu_VideoSkip.GetName(), _00E_VideoSkip.GetValue() != 0) toggleOID_ActorHealthBars = AddToggleOption(_00E_ConfigMenu_ActorHealthBars.GetName(), _00E_ActorHealthBarsEnabled.GetValue() != 0) - toggleOID_KillMoves = AddToggleOption(_00E_ConfigMenu_KillMove.GetName(), KillMove.GetValue() != 0) + toggleOID_KillMoves = AddToggleOption(_00E_ConfigMenu_KillMove.GetName(), KillMoveConfig.GetValue() != 0) SetCursorPosition(1) @@ -94,13 +95,8 @@ Event OnOptionSelect(int option) ActorHealthBarWidget.UnregisterEvents() endif elseif option == toggleOID_KillMoves - ChangeCheckbox(toggleOID_KillMoves, KillMove) - - if KillMove.GetValue() - Utility.SetINIBool("bVATSDisable:VATS", false) - else - Utility.SetINIBool("bVATSDisable:VATS", true) - endif + ChangeCheckbox(toggleOID_KillMoves, KillMoveConfig) + _00E_KillMove.SetValue(KillMoveConfig.GetValue() as bool) EndIf EndEvent @@ -195,7 +191,7 @@ GlobalVariable Property _00E_DisableOtherTutorials Auto GlobalVariable Property _00E_DisableReadAloudBooks Auto GlobalVariable Property _00E_VideoSkip Auto GlobalVariable Property _00E_ActorHealthBarsEnabled Auto -GlobalVariable Property KillMove Auto +GlobalVariable Property KillMoveConfig Auto _00E_MeditationHotkeyAlias Property PlayerMeditation Auto