From 222561152d028a7b293b177addbdd6076d5f90f1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 Mar 2018 21:34:52 +0300 Subject: [PATCH 1/5] Fixed reseting delayed hooks after reloading --- vmf_source/scripts/mods/vmf/modules/core/hooks.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vmf_source/scripts/mods/vmf/modules/core/hooks.lua b/vmf_source/scripts/mods/vmf/modules/core/hooks.lua index 424f0f9..a31d2e6 100644 --- a/vmf_source/scripts/mods/vmf/modules/core/hooks.lua +++ b/vmf_source/scripts/mods/vmf/modules/core/hooks.lua @@ -1,7 +1,12 @@ local vmf = get_mod("VMF") HOOKED_FUNCTIONS = {} -- global, because 'loadstring' doesn't see local variables -DELAYED_HOOKING_ENABLED = true + +if type(DELAYED_HOOKING_ENABLED) == "boolean" then + DELAYED_HOOKING_ENABLED = DELAYED_HOOKING_ENABLED +else + DELAYED_HOOKING_ENABLED = true +end local _DELAYED_HOOKS = {} -- _DELAYED_HOOKS[hook_name] = {{mod_name, hooked_function},{}} From 8c1515e0f4e97b8ec5026785d9679c628c68dc8b Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 Mar 2018 21:35:43 +0300 Subject: [PATCH 2/5] Changed rpc_send arguments order --- vmf_source/scripts/mods/vmf/modules/core/network.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmf_source/scripts/mods/vmf/modules/core/network.lua b/vmf_source/scripts/mods/vmf/modules/core/network.lua index aa83318..a57e81b 100644 --- a/vmf_source/scripts/mods/vmf/modules/core/network.lua +++ b/vmf_source/scripts/mods/vmf/modules/core/network.lua @@ -138,7 +138,7 @@ VMFMod.rpc_register = function (self, rpc_name, rpc_function) end -- recipient = "all", "local", "others", peer_id -VMFMod.rpc_send = function (self, recipient, rpc_name, ...) +VMFMod.rpc_send = function (self, rpc_name, recipient, ...) if not is_rpc_registered(self:get_name(), rpc_name) then From bd3a60aca75db155dcee880604351fc08f197a69 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 Mar 2018 21:36:08 +0300 Subject: [PATCH 3/5] Fixed not showing debug text --- vmf_source/scripts/mods/vmf/modules/core/network.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmf_source/scripts/mods/vmf/modules/core/network.lua b/vmf_source/scripts/mods/vmf/modules/core/network.lua index a57e81b..5899609 100644 --- a/vmf_source/scripts/mods/vmf/modules/core/network.lua +++ b/vmf_source/scripts/mods/vmf/modules/core/network.lua @@ -97,7 +97,7 @@ local function send_rpc_vmf_data_local(mod_name, rpc_name, ...) if not success then get_mod(mod_name):error("(local rpc) in rpc '%s': %s", rpc_name, error_message) - + else local success, data = pcall(serialize_data, ...) -- @DEBUG: if success then -- @DEBUG: vmf:info("[NETWORK][LOCAL RPC] '%s': %s", rpc_name, data) -- @DEBUG: From 85d5a747d69242c121d0f4ef1cc4a1336f8c18a0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 Mar 2018 21:38:33 +0300 Subject: [PATCH 4/5] Added sender peer_id to arguments --- vmf_source/scripts/mods/vmf/modules/core/network.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vmf_source/scripts/mods/vmf/modules/core/network.lua b/vmf_source/scripts/mods/vmf/modules/core/network.lua index 5899609..99ecfb0 100644 --- a/vmf_source/scripts/mods/vmf/modules/core/network.lua +++ b/vmf_source/scripts/mods/vmf/modules/core/network.lua @@ -93,7 +93,7 @@ end local function send_rpc_vmf_data_local(mod_name, rpc_name, ...) - local success, error_message = pcall(_RPC_CALLBACKS[mod_name][rpc_name], ...) + local success, error_message = pcall(_RPC_CALLBACKS[mod_name][rpc_name], Network.peer_id(), ...) if not success then get_mod(mod_name):error("(local rpc) in rpc '%s': %s", rpc_name, error_message) @@ -231,7 +231,7 @@ vmf:hook("ChatManager.rpc_chat_message", function(func, self, sender, channel_id vmf:info("[NETWORK][RECEIVED RPC] '%s.%s' [%s]: %s", mod_name, rpc_name, sender, message) -- @DEBUG: -- can be error in both callback_function() and deserialize_data() - local success, error_message = pcall(function() _RPC_CALLBACKS[mod_name][rpc_name](deserialize_data(localization_param)) end) + local success, error_message = pcall(function() _RPC_CALLBACKS[mod_name][rpc_name](sender, deserialize_data(localization_param)) end) if not success then get_mod(mod_name):error("(network) in rpc function '%s': %s", rpc_name, tostring(error_message)) end From 253ffe16195c7a1a223a781cdbb0537c104bcc69 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 1 Mar 2018 21:48:00 +0300 Subject: [PATCH 5/5] Made COMPILE_VMF.bat work with the new mod system --- COMPILE_VMF.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COMPILE_VMF.bat b/COMPILE_VMF.bat index 31dfcd1..af67e42 100644 --- a/COMPILE_VMF.bat +++ b/COMPILE_VMF.bat @@ -6,11 +6,11 @@ set SOUCE_CODE_DIR=.\vmf_source set TEMP_DIR=.\TEMP set ORIGINAL_VMF_BUNDLE_FILE_NAME=98161451961848df -set NEW_VMF_BUNDLE_FILE_NAME=000_VMF_Main_Bundle +set NEW_VMF_BUNDLE_FILE_NAME=VMF :: manual setting pathes (in case this batch file won't be able to find steam installation folders) [you can change them :D] -set MANUAL_MODS_DIR=C:\Program Files (x86)\Steam\steamapps\common\Warhammer End Times Vermintide\bundle\mods +set MANUAL_MODS_DIR=C:\Program Files (x86)\Steam\steamapps\workshop\content\235540\1289946781 set MANUAL_STINGRAY_EXE=C:\Program Files (x86)\Steam\steamapps\common\Warhammer End Times Vermintide Mod Tools\bin\stingray_win64_dev_x64.exe :: find Vermintide folder @@ -19,7 +19,7 @@ set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Unins set VALUE_NAME=InstallLocation for /F "usebackq skip=2 tokens=1-2*" %%A in (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) do ( - set MODS_DIR=%%C\bundle\mods + set MODS_DIR=%%C\..\..\workshop\content\235540\1289946781 ) :: find Stingray SDK folder