New game updates

Enderal SE v2.1.0 Changelog.txt

@@ -37,14 +37,6 @@ User interface:
 -- Gold bonuses (lockpicking skill) and contents of hidden stashes (pickpocketing skill) get added automatically after a very short delay without opening the container menu.
 -- Disabled loot menu on containers, triggering quest or achievement events.
 
-Werewolf updates:
-- Expanded the collision box, making werewolves and melee builds more viable against other werewolves, Bonerippers, and Vatyrs.
-- Fixed freezing in the beginning of one of werewolf killmoves thanks to improved werewolf behaviors from Precision Creatures by NickaNack.
-- Fixed inability to turn off werewolf killmoves.
-- Fixed inability to break spider webs.
-- Werewolf does not need a shovel to dig up a mound.
-- Fixed restoring player's speed with applied speedmult effects.
-
 Gameplay changes:
 - Added map markers to wishing wells.
 - Fixed rare cases, when bounty targets could not be killed.
@@ -77,6 +69,15 @@ Gameplay changes:
 - Fixed pickup sounds not playing on first try after game start.
 - Many small fixes and optimizations.
 
+Werewolf updates:
+- Expanded the collision box, making werewolves and melee builds more viable against other werewolves, Bonerippers, and Vatyrs.
+- Fixed freezing in the beginning of one of werewolf killmoves thanks to improved werewolf behaviors from Precision Creatures by NickaNack.
+- Fixed inability to turn off werewolf killmoves.
+- Fixed inability to break spider webs.
+- Werewolf does not need a shovel to dig up a mound.
+- Fixed restoring player's speed with applied speedmult effects.
+- Fixed Wolf Claws turning player into a werewolf without drinking a potion.
+
 
 2.0.12.5 (2023-10-21)
 - Fixed infinite loop in _00E_BelloScript, reported by Lirk.

scripts/scriptarchiveorder.txt

@@ -165,7 +165,7 @@ scripts\enchantment.pex
 scripts\encounterzone.pex
 scripts\enderalfunctions.pex
 scripts\EnderalSteam.pex
-scripts\EnderalUpgradeAlias.pex
+scripts\_00E_EnderalVersion.pex
 scripts\environmentscene02_functions.pex
 scripts\environmentscene06_functions.pex
 scripts\equipslot.pex

source/scripts/EnderalUpgradeAlias.psc

@@ -1,29 +0,0 @@
-Scriptname EnderalUpgradeAlias extends ReferenceAlias Hidden 
-{This script handles game version upgrades, DO NOT MODIFY.}
-
-Float Property CURRENT_PATCH_VERSION = 2.1 AutoReadOnly
-float fPatchVersion
-
-Event OnInit()
-
-	; MQP01
-	Quest startQuest = Game.GetForm(0x46F1A) as Quest
-	if startQuest.IsStageDone(10) || startQuest.IsCompleted()
-		While Utility.IsInMenuMode()
-			Utility.WaitMenuMode(0.1)
-		EndWhile
-	
-		Debug.MessageBox("A savegame was loaded which was made before the release of Enderal SE 2.1. In this save, several new features won't be available and there is a chance that you'll encounter grave bugs. Please, start a new game.")
-		;Game.QuitToMainMenu()
-	endif
-
-EndEvent
-
-Event OnPlayerLoadGame()
-
-	if fPatchVersion < CURRENT_PATCH_VERSION
-		;
-		fPatchVersion = CURRENT_PATCH_VERSION
-	endif
-
-EndEvent

source/scripts/_00E_EnderalVersion.psc

@@ -0,0 +1,35 @@
+Scriptname _00E_EnderalVersion extends ReferenceAlias Hidden 
+{This script handles Enderal SE updates, DO NOT MODIFY.}
+
+int iPatchVersion
+
+; Do not make comparisons with GetVersionFull(), versions are not float numbers, use GetVersion().
+float function _GetVersionFull() global
+	; ABCD.E
+	; A - engine version (1 - LE, 2 - SE)
+	; B - backward-incompatible update
+	; C - backward-compatible update
+	; D - hotfix
+	; E - build
+	return 2100.0
+endfunction
+
+int function GetVersion() global
+	return Math.Floor(_GetVersionFull())
+endfunction
+
+Event OnInit()
+
+	iPatchVersion = GetVersion()
+
+EndEvent
+
+Event OnPlayerLoadGame()
+
+	if iPatchVersion < GetVersion()
+		;Utility.Wait(0.1) ; wait for menu mode to end
+		;
+		iPatchVersion = GetVersion()
+	endif
+
+EndEvent

source/scripts/_00E_IntegrityCheckAlias.psc

@@ -1,7 +1,16 @@
 Scriptname _00E_IntegrityCheckAlias extends ReferenceAlias Hidden 
 
 Event OnInit()
+
+	if Game.GetRealHoursPassed() > 0.005 ; 18 seconds
+		Utility.Wait(0.1) ; wait for menu mode to end
+		;Game.QuitToMainMenu()
+		Debug.MessageBox("Savegames, made before the release of Enderal SE 2.1, are incompatible with the current version. Please, start a new game.")
+		;return
+	endif
+
 	RegisterForSingleUpdate(2.0) ; Give a few seconds for the game to warm up at the start
+	
 EndEvent
 
 Event OnPlayerLoadGame()
@@ -18,6 +27,7 @@ Event OnUpdate()
 	if _00E_FS_IsForgottenStoriesActivated.GetValue() as Int != 1
 		Game.QuitToMainMenu()
 		Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly.")
+		return
 	EndIf
 
 	_00E_Func_CheckSKSE.Run()

source/scripts/headchopblockhookupscript.psc

@@ -24,8 +24,6 @@ Keyword property executionerKeyword auto
 Keyword property executionGuardKeyword auto
 {The keyword that designates the executioner from the soon to be dead.}
 
-Quest Property MQ101 Auto
-
 ;*****************************************
 
 auto STATE readyToChop
@@ -94,7 +92,6 @@ Event OnUpdate()
 ; 				debug.trace(self+ "player play idle failed" )
 			endif
 			wait(5)
-			MQ101.SetCurrentStageID(98)
 		else
 			if ( !myExecutionee.PlayIdle( animIdle ) )
 ; 				debug.trace(self+ " play idle failed" )

source/scripts/qf_mq101_0003372b.psc

@@ -2,16 +2,6 @@
 ;NEXT FRAGMENT INDEX 332
 Scriptname QF_MQ101_0003372B Extends Quest Hidden
 
-;BEGIN ALIAS PROPERTY Player
-;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_Player Auto
-;END ALIAS PROPERTY
-
-;BEGIN ALIAS PROPERTY StartMarkerRef
-;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_StartMarkerRef Auto
-;END ALIAS PROPERTY
-
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
@@ -23,8 +13,9 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_332
 Function Fragment_332()
 ;BEGIN CODE
-game.GetPlayer().RemoveAllItems(none, false, false)
-game.GetPlayer().MoveTo(Alias_StartMarkerRef.GetReference(), 0.000000, 0.000000, 0.000000, true)
+Actor PlayerREF = Game.GetForm(0x14) as Actor
+PlayerREF.RemoveAllItems(none, false, false)
+PlayerREF.MoveTo(PlayerStartMarkerNew)
 
 if EnderalFunctions.GetNewGameCount() > 1
 	Game.QuitToMainMenu()
@@ -35,3 +26,5 @@ EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
+
+ObjectReference Property PlayerStartMarkerNew Auto