Skip the light attach crash fix when po3's Tweaks are loaded

Enderal Credits.txt

@@ -645,6 +645,7 @@ FNIS by Fore
 Unfuzer by greentea101
 UIExtensions by expired6978
 Flat Map Markers SSE, Stay At The System Page, Yes Im Sure by Ryan McKenzie
+powerofthree's Tweaks
 CommonLibSSE-NG and general reverse engineering by Ryan McKenzie, powerofthree, Charmed Baryon, Qudix, Maxsu, doodlum, and others
 Better Dialogue Controls by ecirbaf
 Unofficial Enderal Port (fs.dll) by Hishutup

Enderal SE v2.1.2 Changelog.txt

@@ -6,16 +6,16 @@ See https://en.wiki.sureai.net/Enderal:Patch for the list of official patches up
 Beware, spoilers ahead!
 
 
-2.1.2 (TBD)
+2.1.2 (2024-08-01)
 - Entropic Blood fixes:
 -- Controlled actor no longer remains hostile to player.
 -- INI settings get properly restored after save reload occured during victim selection - fixes floating in the air and increased activation distance.
 -- Fixed the damage bonus never applying to controlled NPCs.
--- The time slow effect is two times slower.
+-- Changed the time slow effect to be two times slower.
 -- Marking NPCs no longer happens solely by pointing, press "Activate" to mark an actor.
 - Added the light attach crash fix by powerofthree.
-- Fixed hightlighting of permanent effects in the hero menu (regression since 2.1).
+- Brought back hightlighting of permanent effects in the hero menu.
-- Fixed apparition talismans not recognized as equipped after turning back from the werewolf form.
+- Fixed apparition talismans not being recognized as equipped after turning back from the werewolf form.
 
 
 2.1.1 (2024-04-24)

scripts/scriptarchiveorder.txt

@@ -313,6 +313,7 @@ scripts\defaultsetstageonattacked.pex
 scripts\defaultsetstageondeath.pex
 scripts\dragonactorscript.pex
 scripts\masterambushscript.pex
+scripts\QuickReflexesFix.pex
 scripts\_00e_setupinitquestlist.pex
 scripts\_00e_func_setnpcascompanion.pex
 scripts\_00e_func_safemove.pex

source/Enderal DLL/src/Main.cpp

@@ -64,6 +64,10 @@ namespace {
 			
 			if (message->type == MessagingInterface::kPostLoad) {
 				if (!REL::Module::IsVR()) {
+					if (g_settings.at("AttachLightHitEffectCrashFix")) {
+						logger::info("Installing light attach crash fix...");
+						AttachLightHitEffectCrash::Install();
+					}
 					if (g_settings.at("StayAtSystemPage")) {
 						if (const auto pluginInfo = GetLoadInterface()->GetPluginInfo("StayAtSystemPage"); pluginInfo) {
 							MessageBoxW(NULL, L"Stay At The System Page is already included in Enderal, please, disable it.", L"Enderal SE Error", MB_OK | MB_ICONERROR);
@@ -215,10 +219,6 @@ SKSEPluginLoad(const LoadInterface* skse) {
 			logger::info("Initializing Stay At The System Page...");
 			JournalMenuEx::InstallHooks();
 		}
-		if (g_settings.at("AttachLightHitEffectCrashFix")) {
-			logger::info("Installing light attach crash fix...");
-			AttachLightHitEffectCrash::Install();
-		}
 	}
 
     logger::info("{} has finished loading.", plugin->GetName());

source/Enderal DLL/src/Patches/AttachLightHitEffectCrash.h

@@ -29,9 +29,26 @@ namespace AttachLightHitEffectCrash
 
 	void Install()
 	{
+		if (!GetLoadInterface()->GetPluginInfo("po3_Tweaks")) {
+			// proceed normally
+		} else if (std::filesystem::exists("Data/SKSE/Plugins/po3_Tweaks.ini")) {
+			CSimpleIniA ini;
+			ini.SetMultiKey(false);
+			ini.LoadFile("Data/SKSE/Plugins/po3_Tweaks.ini");
+			if (!ini.GetBoolValue("Fixes", "Light Attach Crash", false)) {
+				logger::info("Detected po3's Tweaks with disabled Light Attach Crash Fix");
+				// proceed normally
+			} else {
+				logger::info("Detected po3's Tweaks with enabled Light Attach Crash Fix");
+				return;
+			}
+		}
+
 		REL::Relocation<std::uintptr_t> func{ REL::RelocationID(33610, 34388) };
 
 		std::size_t size = REL::Module::get().version() > REL::Version(1, 5, 97, 0) ? 0xEC : 0x86;
 		SKSE::stl::asm_replace<AttachLightHitEffectVisitor>(func.address(), size);
+
+		logger::info("Initialized Light Attach Crash Fix");
 	}
 }