Merged game update quest

Enderal - Forgotten Stories.esm.xml

@@ -139738,9 +139738,6 @@
           <property name="KillMove" type="1" status="1">
             <object formID="00100f19" alias="65535" unused="0x0000" />
           </property>
-          <property name="Levelsystem" type="1" status="1">
-            <object formID="00010aa2" alias="65535" unused="0x0000" />
-          </property>
           <property name="MQ05PrologueFunctions" type="1" status="1">
             <object formID="00033a5b" alias="65535" unused="0x0000" />
           </property>

source/Enderal DLL/src/CheckInvalidForms.h

@@ -10,27 +10,6 @@ inline bool DataFileExists(std::string filename, int maxSize = 1000000)
 	return std::filesystem::exists(path) && std::filesystem::file_size(path) > maxSize;
 }
 
-inline void CheckBlacklist()
-{
-	const auto dataHandler = RE::TESDataHandler::GetSingleton();
-
-	if (!dataHandler) {
-		return;
-	}
-
-	std::string filenames[1] = {
-		"Enderal_FS_More_Affinities.esp",
-	};
-
-	for (short i = 0; i < 1; i++) {
-		if (dataHandler->LookupLoadedModByName(filenames[i])) {
-			aModNames.insert(filenames[i]);
-			RE::DebugMessageBox(std::format("{} is incompatible with Enderal SE.\nCheck console for the list of flagged mods.", filenames[i]).c_str());
-			RE::ConsoleLog::GetSingleton()->Print(std::format("{} is incompatible", filenames[i]).c_str());
-		}
-	}
-}
-
 inline void NotifyInvalidForm(const RE::TESForm* form)
 {
 	if (!form) {

source/Enderal DLL/src/Util.h

@@ -54,7 +54,6 @@ inline void CheckIncompatibleMods()
 		RE::ConsoleLog::GetSingleton()->Print("Loaded SureAI's Enderal: Forgotten Stories | Special Edition v2.0.x by Eddoursul and contributors");
 	}
 
-	CheckBlacklist();
 	CheckWorldspaces();
 	CheckUnconvertedMap();
 	CheckSkyrimCells();
@@ -67,8 +66,6 @@ inline void CheckIncompatibleMods()
 
 inline bool PapyrusGlobalFunctionExists(const char* scriptName, const char* funcName)
 {
-	logger::info("Real - GetGlobalFunctionNames of {}", scriptName);
-	std::vector<std::string> functionNames;
 	RE::BSTSmartPointer<RE::BSScript::ObjectTypeInfo> typeInfoPtr;
 	RE::BSScript::Internal::VirtualMachine::GetSingleton()->GetScriptObjectType(RE::BSFixedString(scriptName), typeInfoPtr);
 	auto functionCount = typeInfoPtr->GetNumGlobalFuncs();

source/scripts/EnderalUpgradeAlias.psc

@@ -0,0 +1,24 @@
+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
+	if (Game.GetForm(0x46F1A) as Quest).GetStageDone(10)
+		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_playersetupscript.psc

@@ -1,8 +1,6 @@
 Scriptname _00E_PlayerSetUpScript extends ObjectReference  
 {Initializes all the necessary Quests, maintains the player, contains various OnPlayerLoadGame() failsafes. This script is important for proper updating, do not overwrite it.}
 
-Float Property CURRENT_PATCH_VERSION = 2.13 AutoReadOnly
-
 int function _GetScriptVersion() Global
 	return 1
 endFunction
@@ -26,10 +24,6 @@ Event OnInit()
 	
 	_00E_Func_CheckSKSE.Run()
 	_00E_Func_CheckEnderalDLL.Run()
-
-	If fPatchVersion == 0.00
-		fPatchVersion = CURRENT_PATCH_VERSION
-	EndIf
 	
 	GoToState("RealPlayer")
 	PlayerREF.SetActorValue("speedMult", 95)
@@ -45,11 +39,6 @@ Event OnInit()
 		kQuest.Start()
 	endwhile
 
-	If Game.GetModByName("Enderal_FS_More_Affinities.esp") != 255
-		Game.QuitToMainMenu()
-		Debug.MessageBox("Enderal_FS_More_Affinities.esp is outdated and does not work with Enderal SE. Please, uninstall or update the mod.")
-	EndIf
-
 EndEvent
 
 Event OnPlayerLoadGame()
@@ -151,18 +140,7 @@ function CheckForgottenStories()
 endfunction
 
 Function Maintenance()
-	
-	if fPatchVersion <= 2.13
-		Debug.MessageBox("A savegame was loaded which was made before the release of Enderal SE. 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()
-		;return
-	endif
 
-	if fPatchVersion < CURRENT_PATCH_VERSION
-		;
-		fPatchVersion = CURRENT_PATCH_VERSION
-	endif
-	
 	; changes to the actor value healrate will not persist in consecutive saves
 	; every time a save gets loaded the healrate needs to be set to 0, otherwise it will go back again to default at 0.7
 	; this is called before active magic effects of potions or spells are applied to the player which could also alter the value
@@ -195,8 +173,6 @@ EndFunction
 ;              							 PROPERTIES                   					 
 ;=====================================================================================
 
-float fPatchVersion
-
 _00E_MQ05Prologue_Functions Property MQ05PrologueFunctions Auto
 
 Actor Property PlayerREF Auto
@@ -207,5 +183,3 @@ GlobalVariable Property KillMove Auto
 
 Perk Property _00E_Class_Keeper_P05_C_Conditioning Auto
 Perk Property _00E_Class_Vagrant_P05_B_Lightweight Auto
-
-_00E_QuestFunctions Property Levelsystem Auto