Updated LuaFunctions to check if it needs to wait first.

Added timedatestamp to Log function.
Added LUA_ERRRUN scenario to ExecuteLua.
Updated files.

Author: Evasion3356

M2DEScriptHook/src/LuaFunctions.cpp

@@ -220,7 +220,6 @@ int32_t LuaFunctions::PrintToLog(lua_State *L)
 
 int32_t LuaFunctions::BindKey(lua_State *L)
 {
-	M2DEScriptHook::instance()->Log(__FUNCTION__);
 	const char *key = "";
 	const char *context = "";
 
@@ -238,7 +237,6 @@ int32_t LuaFunctions::BindKey(lua_State *L)
 
 int32_t LuaFunctions::UnbindKey(lua_State *L)
 {
-	M2DEScriptHook::instance()->Log(__FUNCTION__);
 	const char *key = "";
 	const char *context = "";
 
@@ -309,11 +307,12 @@ LuaFunctions::LuaFunctions()
 {
 	M2DEScriptHook::instance()->Log(__FUNCTION__);
 	// Yep, it's thread blocking, but that's what I want, no processing of other stuff until this shit's ready..
-	do {
+	while (!LoadPointers())
+	{
 		M2DEScriptHook::instance()->Log(__FUNCTION__ " Game is not ready, script engine not initialized, retry");
 		std::this_thread::sleep_for(std::chrono::milliseconds(100));
 		std::this_thread::yield();
-	} while (!LoadPointers());
+	}
 } 
 
 bool LuaFunctions::IsMainScriptMachineReady()

M2DEScriptHook/src/M2DEScriptHook.cpp

@@ -36,6 +36,7 @@
 #include <fstream>
 #include <thread>
 #include <chrono>
+#include <iomanip>
 #include <algorithm>
 
 #include <M2DEScriptHook.h>
@@ -111,11 +112,16 @@ void M2DEScriptHook::Log(const char* string, ...)
 
 	currentBuffer = (currentBuffer + 1) % BUFFER_COUNT;
 
-	const char* msg =  &buffer[thisBuffer * BUFFER_LENGTH];
+	const char* msg = &buffer[thisBuffer * BUFFER_LENGTH];
 
 	std::fstream file("ScriptHook.log", std::ios::out | std::ios::app);
-	file << msg;
-	file << "\n";
+
+	auto now = std::chrono::system_clock::now();
+	auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) % 1000;
+	auto timer = std::chrono::system_clock::to_time_t(now);
+	auto local_time = *std::localtime(&timer);
+
+	file << "[" << std::put_time(&local_time, "%m/%d/%Y %I:%M:%S") << ":" << std::setfill('0') << std::setw(3) << ms.count() << " " << std::put_time(&local_time, "%p") << "] " << msg << std::endl;
 	file.close();
 }
 
@@ -215,6 +221,15 @@ bool M2DEScriptHook::ExecuteLua(lua_State *L, const std::string &lua)
 			this->Log("Error loading Lua code into buffer with (Memory Allocation Error)");
 			return false;
 		}
+		else if (LUA_ERRRUN == result)
+		{
+			std::stringstream ss;
+			ss << "Runtime Lua error. Message: ";
+			const char* error = lua_tostring_(L, -1);
+			ss << error;
+			this->Log(ss.str());
+			return false;
+		}
 		else
 		{
 			std::stringstream ss;
@@ -229,12 +244,13 @@ bool M2DEScriptHook::ExecuteLua(lua_State *L, const std::string &lua)
 	return true;
 }
 
+
 uint32_t WINAPI M2DEScriptHook::mainThread(LPVOID) {
 	static M2DEScriptHook *instance = M2DEScriptHook::instance();
 
 	instance->Log(__FUNCTION__);
 
-	std::this_thread::sleep_for(std::chrono::milliseconds(10000));
+	std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
 	while (!instance->HasEnded()) {
 		std::this_thread::sleep_for(std::chrono::milliseconds(10));
@@ -274,7 +290,7 @@ void M2DEScriptHook::Shutdown()
 
 void M2DEScriptHook::CreateKeyBind(const char *key, const char *context)
 {
-	this->Log(__FUNCTION__);
+	M2DEScriptHook::instance()->Log("Binding key %s to function %s", key, context);
 	std::unique_lock<std::recursive_mutex> lkScr(_keyBindMutex);
 
 	bool found = false;
@@ -296,7 +312,7 @@ void M2DEScriptHook::CreateKeyBind(const char *key, const char *context)
 
 void M2DEScriptHook::DestroyKeyBind(const char *key, const char *context)
 {
-	this->Log(__FUNCTION__);
+	M2DEScriptHook::instance()->Log("Unbinding key %", key);
 	//std::lock_guard<std::mutex> lk{ _keyBindMutex };
 	std::unique_lock<std::recursive_mutex> lkScr(_keyBindMutex);
 

files/README.txt

@@ -2,8 +2,7 @@ Place the files in the Mafia 2 Definitive Edition *pc* folder so the structure l
 
 | pc
 | - Mafia 2 Definitive Edition.exe
-| - M2DEScriptHook.dll
-| - M2DEScriptHookLauncher.exe
+| - dxgi.dll
 | - scripts/*.lua
 | - plugins/*.dll
 

files/scripts/dev.lua

@@ -1,38 +1,81 @@
-godMode = [[
+function DoGodmode()
 	game.game:GetActivePlayer():SetDemigod(true)
 	game.game:GetActivePlayer():EnableInjury(false)
 	game.game:GetActivePlayer().invulnerability = true
-]]
-
-
-allWeapons = [[
-	game.game:GetActivePlayer():InventoryAddWeapon(2,42)
-	game.game:GetActivePlayer():InventoryAddWeapon(3,60)
-	game.game:GetActivePlayer():InventoryAddWeapon(4,56)
-	game.game:GetActivePlayer():InventoryAddWeapon(5,96)
-	game.game:GetActivePlayer():InventoryAddWeapon(6,42)
-	game.game:GetActivePlayer():InventoryAddWeapon(8,56)
-	game.game:GetActivePlayer():InventoryAddWeapon(9,120)
-	game.game:GetActivePlayer():InventoryAddWeapon(10,128)
-	game.game:GetActivePlayer():InventoryAddWeapon(11,150)
-	game.game:GetActivePlayer():InventoryAddWeapon(12,120)
-	game.game:GetActivePlayer():InventoryAddWeapon(13,120)
-	game.game:GetActivePlayer():InventoryAddWeapon(15,40)
-	game.game:GetActivePlayer():InventoryAddWeapon(17,35)
-	game.game:GetActivePlayer():InventoryAddWeapon(20,6)
-	game.game:GetActivePlayer():InventoryAddWeapon(21,6)
-]]
-
-addMoney = [[
+end
+
+function giveGuns()
+	local weapons = {
+		{ ID = 2, ammo = 42 },   -- Model_12_Revolver
+		{ ID = 3, ammo = 60 },   -- Mauser_C96
+		{ ID = 4, ammo = 56 },   -- Colt_M1911A1
+		{ ID = 5, ammo = 92 },   -- Colt_M1911_Special
+		{ ID = 6, ammo = 42 },   -- Model_19_Revolver
+		{ ID = 8, ammo = 56 },   -- Remington_Model_870_Field_gun
+		{ ID = 9, ammo = 120 },  -- M3_Grease_Gun
+		{ ID = 10, ammo = 128 }, -- MP40
+		{ ID = 11, ammo = 200 }, -- Thompson_1928
+		{ ID = 12, ammo = 120 }, -- M1A1_Thompson
+		{ ID = 13, ammo = 120 }, -- Beretta_Model_38A
+		{ ID = 15, ammo = 40 },  -- M1_Garand
+		{ ID = 17, ammo = 35 },  -- Kar98k
+		{ ID = 20, ammo = 6 },   -- MK2_Frag_Grenade
+		{ ID = 21, ammo = 6 }    -- Molotov_Cocktail
+	}
+	
+	local player = game.game:GetActivePlayer()
+	for _, weapon in pairs(weapons) do
+		player:InventoryAddWeapon(weapon.ID, weapon.ammo)
+		player:InventoryReload(weapon.ID, weapon.ammo) --Praise the lord, and pass the ammunition.
+	end
+end
+
+function FixCar()
+	local veh = game.game:GetActivePlayer():GetOwner()
+	if veh then
+		local level = veh:GetActualTuningTable()
+		if level < 3 then
+			veh:SetActualTuningTable(3)
+		end
+		local damage = veh:GetDamage()
+		ai.police:ClearKnownCars()
+		if damage > 0 then
+			local carSpeed = veh:GetSpeedFloat()
+			veh:RepairAndClear()
+			if carSpeed > 1 then
+				veh:SetSpeed(carSpeed)
+			end
+		end
+		local dirt = veh:GetDirty()
+		if (dirt > 0) then
+			veh:SetDirty(0)
+		end
+		local motorDamage = veh:GetMotorDamage()
+		if motorDamage > 0 then
+			veh:SetMotorDamage(0)
+		end
+	end
+end
+
+function AddMoneyToPlayer()
 	game.game:GetActivePlayer():InventoryAddMoney(100*1000000)
-]]
+end
+
+RepairCar = [[DelayBuffer:Insert(FixCar, nil, 100, 1, false)]] --We must use DelayBuffer, or else the user could execute too many scripts and crash the game.
+allWeapons = [[DelayBuffer:Insert(giveGuns, nil, 100, 1, false)]] --We must use DelayBuffer, or else the user could execute too many scripts and crash the game.
+godMode = [[DelayBuffer:Insert(DoGodmode, nil, 100, 1, false)]] --We must use DelayBuffer, or else the user could execute too many scripts and crash the game.
+addMoney = [[DelayBuffer:Insert(AddMoneyToPlayer, nil, 100, 1, false)]] --We must use DelayBuffer, or else the user could execute too many scripts and crash the game.
+
+--For a list of functions and how to use them, please see this github documentation by NobleFalcon:
+--https://github.com/NobleFalcon/mafia2-scripts?tab=readme-ov-file#core-objects
 
--- More scripting funcs can be found here: https://www.nexusmods.com/mafia2/mods/130
 
 unbindKey("p")
+bindKey("p", godMode)
 unbindKey("o")
+bindKey("o", allWeapons)
 unbindKey("i")
+bindKey("i", addMoney)
 
-bindKey("p", godMode)
-bindKey("o", allWeapons)
-bindKey("i", addMoney)
+unbindKey("VK_MULTIPLY")
+bindKey("VK_MULTIPLY", RepairCar)