Testing

shad0wshayd3-FO4 · Dec 5, 2023 · 2629f3d · 2629f3d
1 parent 3542416
commit 2629f3d
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 5 deletions.
diff --git a/src/c++/MCM/MCM.h b/src/c++/MCM/MCM.h
@@ -31,15 +31,20 @@ namespace MCM
 			inline static bool bToggleGodMode{ true };
 		};
 
+		class Runtime
+		{
+		public:
+			inline static std::int32_t iAmmoWeight{ 6 };
+		};
+
 		static void Update()
 		{
 			if (m_FirstRun)
 			{
 				m_FirstRun = false;
 			}
 
-			m_ini_base.LoadFile("Data/MCM/Config/BakaSurvivalSettings/settings.ini");
-			m_ini_user.LoadFile("Data/MCM/Settings/BakaSurvivalSettings.ini");
+			ResetStateInit();
 
 			GetModSettingBool("General", "bEnable", General::bEnable);
 
@@ -59,13 +64,34 @@ namespace MCM
 			GetModSettingBool("Setting", "bSurvivalLock", Setting::bSurvivalLock);
 			GetModSettingBool("Setting", "bToggleGodMode", Setting::bToggleGodMode);
 
-			m_ini_base.Reset();
-			m_ini_user.Reset();
+			ResetStatePost();
 		}
 
 		inline static bool m_FirstRun{ true };
 
 	private:
+		static void ResetStateInit()
+		{
+			m_ini_base.LoadFile("Data/MCM/Config/BakaSurvivalSettings/settings.ini");
+			m_ini_user.LoadFile("Data/MCM/Settings/BakaSurvivalSettings.ini");
+		}
+
+		static void ResetStatePost()
+		{
+			if (General::bEnable)
+			{
+				Runtime::iAmmoWeight = (Setting::bAmmoWeight) ? 6 : 7;
+			}
+			else
+			{
+				Runtime::iAmmoWeight = 6;
+			}
+
+			m_ini_base.Reset();
+			m_ini_user.Reset();
+		}
+
+	protected:
 		static void GetModSettingBool(const std::string& a_section, const std::string& a_setting, bool& a_value)
 		{
 			auto base = m_ini_base.GetBoolValue(a_section.c_str(), a_setting.c_str(), a_value);

diff --git a/src/c++/main.cpp b/src/c++/main.cpp
@@ -1,5 +1,66 @@
 #include "MCM/MCM.h"
 
+namespace ObScript
+{
+	class UpdateSettings
+	{
+	public:
+		static void Install()
+		{
+			const auto functions = RE::SCRIPT_FUNCTION::GetConsoleFunctions();
+			const auto it = std::find_if(
+				functions.begin(),
+				functions.end(),
+				[&](auto&& a_elem)
+				{
+					return _stricmp(a_elem.functionName, "PrintAiList") == 0;
+				});
+
+			if (it != functions.end())
+			{
+				*it = RE::SCRIPT_FUNCTION{ LONG_NAME.data(), SHORT_NAME.data(), it->output };
+				it->helpString = HelpString().data();
+				it->executeFunction = Execute;
+
+				logger::debug("Registered UpdateSettings."sv);
+			}
+			else
+			{
+				logger::debug("Failed to register UpdateSettings."sv);
+			}
+		}
+
+	private:
+		static bool Execute(
+			const RE::SCRIPT_PARAMETER*,
+			const char*,
+			RE::TESObjectREFR*,
+			RE::TESObjectREFR*,
+			RE::Script*,
+			RE::ScriptLocals*,
+			float&,
+			std::uint32_t&)
+		{
+			MCM::Settings::Update();
+			return true;
+		}
+
+		[[nodiscard]] static const std::string& HelpString()
+		{
+			static auto help = []()
+			{
+				std::string buf;
+				buf += ""sv;
+				return buf;
+			}();
+			return help;
+		}
+
+		static constexpr auto LONG_NAME = "UpdateSettings"sv;
+		static constexpr auto SHORT_NAME = "bus"sv;
+	};
+}
+
 class Hooks
 {
 public:
@@ -17,7 +78,7 @@ class Hooks
 
 		if (!MCM::Settings::Setting::bAmmoWeight)
 		{
-			hkcmpEAX<1321341, 0x121>::Install();  // TESWeightForm::GetFormWeight
+		//	hkcmpEAX<1321341, 0x121>::Install();  // TESWeightForm::GetFormWeight
 		}
 
 		if (!MCM::Settings::Setting::bConsole)
@@ -98,6 +159,8 @@ class Hooks
 			hkcmpEAX<1111932, 0x3E>::Install();  // PlayerCharacter::IsInvulnerable
 			hkcmpEAX<1240293, 0x7A>::Install();  // PlayerCharacter::KillImpl
 		}
+
+		hkTest::Install();
 	}
 
 private:
@@ -172,6 +235,46 @@ class Hooks
 			}
 		};
 	};
+
+class hkTest
+{
+public:
+	static void Install()
+	{
+		static REL::Relocation<std::uintptr_t> hook{ REL::ID(1321341), 0x121 };
+		static REL::Relocation<std::uintptr_t> retn{ REL::ID(1321341), 0x12D };
+		static REL::Relocation<std::uintptr_t> jnzA{ REL::ID(1321341), 0xB4 };
+
+		REL::safe_fill(hook.address(), REL::NOP, 0x0C);
+		auto code = Example{ retn.address(), jnzA.address() };
+
+		auto& trampoline = F4SE::GetTrampoline();
+		auto patch = trampoline.allocate(code);
+
+		trampoline.write_branch<6>(hook.address(), patch);
+	}
+
+private:
+	struct Example : Xbyak::CodeGenerator
+	{
+		Example(std::uintptr_t a_retn, std::uintptr_t a_jnz)
+		{
+			mov(rcx, reinterpret_cast<std::uintptr_t>(std::addressof(cmpValue)));
+			mov(ecx, ptr[rcx]);
+			cmp(eax, ecx);
+			jnz("nyo");
+			add(rbx, 0x150);
+			mov(rcx, a_retn);
+			jmp(rcx);
+
+			L("nyo");
+			mov(rcx, a_jnz);
+			jmp(rcx);
+		}
+	};
+};
+
+inline static std::int32_t cmpValue{ 6 };
 };
 
 namespace
@@ -230,8 +333,12 @@ extern "C" DLLEXPORT bool F4SEAPI F4SEPlugin_Load(const F4SE::LoadInterface* a_F
 	logger::debug("Debug logging enabled."sv);
 
 	F4SE::Init(a_F4SE);
+	F4SE::AllocTrampoline(1u << 10);
 
 	MCM::Settings::Update();
+
+	ObScript::UpdateSettings::Install();
+
 	Hooks::Install();
 
 	return true;