add ai turn event as insertion point for ai stuff

youneuoy · Nov 25, 2023 · 29bd9de · 29bd9de
1 parent 946bc05
commit 29bd9de
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 4 deletions.
diff --git a/M2TWEOP Code/M2TWEOP library/Injects.cpp b/M2TWEOP Code/M2TWEOP library/Injects.cpp
@@ -3159,6 +3159,63 @@ void OnCreateMercUnitCheck::SetNewCode()
 
 
 
+	a->ret();
+	m_cheatBytes = (unsigned char*)a->make();
+
+	delete a;
+}
+
+
+onAiTurn::onAiTurn(MemWork* mem, LPVOID addr, int ver)
+	:AATemplate(mem), funcAddress(addr)
+{
+	if (ver == 2)//steam
+	{
+		m_adress = 0x0052B074;
+		otherFunc = 0x005D2F00;
+	}
+	else if (ver == 1)//kingdoms
+	{
+		m_adress = 0x0052AA74;
+		otherFunc = 0x005D2A70;
+	}
+}
+
+onAiTurn::~onAiTurn()
+{
+}
+
+void onAiTurn::SetOriginalCode()
+{
+	Assembler* a = new Assembler();
+
+	a->cmp(eax, ecx);
+
+	a->ret();
+	m_originalBytes = (unsigned char*)a->make();
+	m_originalSize = m_memory->GetASMSize(m_originalBytes);
+
+	delete a;
+}
+
+void onAiTurn::SetNewCode()
+{
+	Assembler* a = new Assembler();
+
+
+	a->pushad();
+	a->pushf();
+
+	a->mov(ecx, esi);
+	a->mov(eax, (DWORD)funcAddress);
+	a->call(eax);
+	a->popf();
+	a->popad();
+	a->mov(ecx, dword_ptr(esi, 0x24));
+	a->mov(eax, (DWORD)otherFunc);
+	a->call(eax);
+
+
 	a->ret();
 	m_cheatBytes = (unsigned char*)a->make();
 

diff --git a/M2TWEOP Code/M2TWEOP library/Injects.h b/M2TWEOP Code/M2TWEOP library/Injects.h
@@ -684,6 +684,20 @@ class onGameInitialized
 	LPVOID funcAddress;
 };
 
+class onAiTurn
+	:public AATemplate
+{
+public:
+	onAiTurn(MemWork* mem, LPVOID adr, int ver);
+	~onAiTurn();
+
+	void SetOriginalCode();
+	void SetNewCode();
+private:
+	LPVOID funcAddress;
+	DWORD otherFunc;
+};
+
 class onGameConsoleCommandFromConsole
 	:public AATemplate
 {

diff --git a/M2TWEOP Code/M2TWEOP library/managerF.cpp b/M2TWEOP Code/M2TWEOP library/managerF.cpp
@@ -488,6 +488,12 @@ void managerF::doPachs()
 	toCreateMercUnit->Enable();
 	f1 << "Done" << endl;
 
+	f1 << "Start applying toCreateMercUnit patch" << endl;
+	onAiTurn* toAiTurn = new onAiTurn(mem, (LPVOID)patchesForGame::onAiTurn, globals::dataS.gamever);
+	toAiTurn->SetNewCode();
+	toAiTurn->Enable();
+	f1 << "Done" << endl;
+
 	f1 << "Start applying OnCreateUnitWrapper patch" << endl;
 	OnCreateUnitWrapper* toCreateUnitWrapper = new OnCreateUnitWrapper(mem, (LPVOID)patchesForGame::OnCreateUnitWrapper, globals::dataS.gamever);
 	toCreateUnitWrapper->SetNewCode();

diff --git a/M2TWEOP Code/M2TWEOP library/patchesForGame.cpp b/M2TWEOP Code/M2TWEOP library/patchesForGame.cpp
@@ -350,6 +350,11 @@ void __stdcall patchesForGame::onGameInit()
 	plugins::onGameInit();
 }
 
+void __fastcall patchesForGame::onAiTurn(aiFaction* aifaction)
+{
+	plugins::onAiTurn(aifaction);
+}
+
 void __stdcall patchesForGame::onChangeTurnNum()
 {
 #if defined TESTPATCHES

diff --git a/M2TWEOP Code/M2TWEOP library/patchesForGame.h b/M2TWEOP Code/M2TWEOP library/patchesForGame.h
@@ -35,6 +35,7 @@ class patchesForGame
 	//after reading EDU
 	static void WINAPI afterEDUread();
 	static void WINAPI onGameInit();
+	static void __fastcall onAiTurn(aiFaction* aifaction);
 
 
 	//before start of a first faction turn

diff --git a/M2TWEOP Code/M2TWEOP library/plugins.cpp b/M2TWEOP Code/M2TWEOP library/plugins.cpp
@@ -235,6 +235,14 @@ void plugins::onGameInit()
 	}
 }
 
+void plugins::onAiTurn(aiFaction* aifaction)
+{
+	for (plugin* pl : pluginsCfg.plugins)
+	{
+		(*(*pl->onAiTurn))(aifaction);
+	}
+}
+
 void plugins::onWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	for (plugin* pl : pluginsCfg.plugins)
@@ -381,11 +389,14 @@ int plugin::init(string* nameP)
 	fName = "onfortificationlevelS";
 	onfortificationlevelS.Load(&plPath, &fName);
 
-
-	//onReadGameDbsAtStart
+	//onGameInit
 	fName = "onGameInit";
 	onGameInit.Load(&plPath, &fName);
 
+	//onAiTurn
+	fName = "onAiTurn";
+	onAiTurn.Load(&plPath, &fName);
+
 	//onReadGameDbsAtStart
 	fName = "onReadGameDbsAtStart";
 	onReadGameDbsAtStart.Load(&plPath, &fName);

diff --git a/M2TWEOP Code/M2TWEOP library/plugins.h b/M2TWEOP Code/M2TWEOP library/plugins.h
@@ -98,6 +98,7 @@ class plugin
 	ProcLoader<LRESULT(__cdecl*)(HWND, UINT, WPARAM, LPARAM)> onWndProc;
 	ProcLoader<void(__cdecl*)()> onReadGameDbsAtStart;
 	ProcLoader<void(__cdecl*)()> onGameInit;
+	ProcLoader<void(__cdecl*)(aiFaction*)> onAiTurn;
 
 	ProcLoader<void(__cdecl*)(int, int)> onEndSiege;
 	ProcLoader<void(__cdecl*)(int, int)> onStartSiege;
@@ -138,6 +139,7 @@ class plugins
 
 	static void onReadGameDbsAtStart();
 	static void onGameInit();
+	static void onAiTurn(aiFaction* aifaction);
 
 	static void onWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	static void onEndScene(LPDIRECT3DDEVICE9 pDevice);

diff --git a/M2TWEOP Code/M2TWEOP library/stratModelsChange.cpp b/M2TWEOP Code/M2TWEOP library/stratModelsChange.cpp
@@ -410,7 +410,7 @@ namespace stratModelsChange
 			funcAddr = codes::offsets.assignShadowCasToFlexi;
 			texturepath = nullptr;
 		}
-		float scale = 0.7;
+		float scale = 0.7f;
 		_asm
 		{
 			push 1

diff --git a/M2TWEOP-luaPlugin/luaPlugin/basicEvents.cpp b/M2TWEOP-luaPlugin/luaPlugin/basicEvents.cpp
@@ -698,6 +698,14 @@ void onGameInit()
 	}
 }
 
+void onAiTurn(aiFaction* aifaction)
+{
+	if (plugData::data.luaAll.onAiTurn != nullptr)
+	{
+		tryLua((*plugData::data.luaAll.onAiTurn)(aifaction));
+	}
+}
+
 void onEndSiege(int x, int y)
 {
 	if (plugData::data.luaAll.onEndSiege != nullptr)

diff --git a/M2TWEOP-luaPlugin/luaPlugin/basicEvents.h b/M2TWEOP-luaPlugin/luaPlugin/basicEvents.h
@@ -6,6 +6,7 @@ using namespace std;
 
 extern "C" PLUGINM2TWEOP_API void onReadGameDbsAtStart();
 extern "C" PLUGINM2TWEOP_API void onGameInit();
+extern "C" PLUGINM2TWEOP_API void onAiTurn(aiFaction* aifaction);
 extern "C" PLUGINM2TWEOP_API void onEndSiege(int x, int y);
 extern "C" PLUGINM2TWEOP_API void onStartSiege(int x, int y);
 std::unordered_map<int, const char*> religionNames = {

diff --git a/M2TWEOP-luaPlugin/luaPlugin/luaEvents.cpp b/M2TWEOP-luaPlugin/luaPlugin/luaEvents.cpp
@@ -226,6 +226,7 @@ void luaP::onPluginLoadF()
 	@tfield onNewGameStart onNewGameStart
 	@tfield onReadGameDbsAtStart onReadGameDbsAtStart
 	@tfield onGameInit onGameInit
+	@tfield onAiTurn onAiTurn
 	@tfield onClickAtTile onClickAtTile
 	@tfield onCampaignMapLoaded onCampaignMapLoaded
 	@tfield onCreateSaveFile onCreateSaveFile
@@ -2997,6 +2998,21 @@ void luaP::onPluginLoadF()
 	onGameInit = new sol::function(luaState["onGameInit"]);
 	checkLuaFunc(&onGameInit);
 
+	/***
+	Called on ai initialized on turn start.
+
+	@function onAiTurn
+	@tparam aiFaction aiFaction
+
+	@usage
+	function onAiTurn(aiFaction)
+	--something here
+	end
+	*/
+
+	onAiTurn = new sol::function(luaState["onAiTurn"]);
+	checkLuaFunc(&onAiTurn);
+
 	/***
 	Called on clicking the stratmap.
 

diff --git a/M2TWEOP-luaPlugin/luaPlugin/luaP.h b/M2TWEOP-luaPlugin/luaPlugin/luaP.h
@@ -151,6 +151,7 @@ class luaP
 
 	sol::function* onReadGameDbsAtStart = nullptr;
 	sol::function* onGameInit = nullptr;
+	sol::function* onAiTurn = nullptr;
 	sol::function* onEndSiege = nullptr;
 	sol::function* onStartSiege = nullptr;
 	sol::function* onSelectWorldpkgdesc = nullptr;
@@ -167,7 +168,7 @@ class luaP
 	sol::function* onLoadingFonts = nullptr;
 	sol::function* initDXFunc = nullptr;
 	void checkLuaFunc(sol::function** lRef);
-
+	
 
 
 private: