Bump deps/minhook from f5485b8 to 1cc4610

Bumps [deps/minhook](https://github.com/TsudaKageyu/minhook) from `f5485b8` to `1cc4610`.
- [Release notes](https://github.com/TsudaKageyu/minhook/releases)
- [Commits](f5485b8454...1cc46107ee)

---
updated-dependencies:
- dependency-name: deps/minhook
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "*"
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build binaries
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        configuration:
+          - Debug
+          - Release
+    steps:
+      - name: Check out files
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+          lfs: false
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.1.3
+
+      - name: Generate project files
+        run: tools/premake5 vs2022
+
+      - name: Set up problem matching
+        uses: ammaraskar/msvc-problem-matcher@master
+
+      - name: Build ${{matrix.configuration}} binaries
+        run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:PlatformTarget=x86 build/iw5-gsc-utils.sln
+
+      - name: Upload ${{matrix.configuration}} binaries
+        uses: actions/upload-artifact@v3.1.0
+        with:
+          name: ${{matrix.configuration}} binaries
+          path: |
+            build/bin/${{matrix.configuration}}/iw5-gsc-utils.dll

.gitmodules

@@ -4,12 +4,13 @@
 [submodule "deps/GSL"]
 	path = deps/GSL
 	url = https://github.com/microsoft/GSL.git
-[submodule "deps/sol2"]
-	path = deps/sol2
-	url = https://github.com/ThePhD/sol2.git
-[submodule "deps/lua"]
-	path = deps/lua
-	url = https://github.com/lua/lua.git
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json.git
+	branch = develop
+[submodule "deps/gsc-tool"]
+	path = deps/gsc-tool
+	url = https://github.com/xensik/gsc-tool.git
+[submodule "deps/zlib"]
+	path = deps/zlib
+	url = https://github.com/madler/zlib.git

deps/premake/gsc-tool.lua

@@ -0,0 +1,62 @@
+gsc_tool = {
+	source = path.join(dependencies.basePath, "gsc-tool"),
+}
+
+function gsc_tool.import()
+	links { "xsk-gsc-iw5-pc", "xsk-gsc-utils" }
+	gsc_tool.includes()
+end
+
+function gsc_tool.includes()
+	includedirs {
+		path.join(gsc_tool.source, "include"),
+	}
+end
+
+function gsc_tool.project()
+	project "xsk-gsc-utils"
+		kind "StaticLib"
+		language "C++"
+
+		files {
+			path.join(gsc_tool.source, "include/xsk/utils/*.hpp"),
+			path.join(gsc_tool.source, "src/utils/*.cpp"),
+		}
+
+		includedirs {
+			path.join(gsc_tool.source, "include"),
+		}
+
+		zlib.includes()
+
+	project "xsk-gsc-iw5-pc"
+		kind "StaticLib"
+		language "C++"
+
+		filter "action:vs*"
+			buildoptions "/Zc:__cplusplus"
+		filter {}
+
+		files {
+			path.join(gsc_tool.source, "include/xsk/stdinc.hpp"),
+
+			path.join(gsc_tool.source, "include/xsk/gsc/engine/iw5_pc.hpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_code.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_func.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_meth.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/iw5_pc_token.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/*.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/common/*.cpp"),
+			path.join(gsc_tool.source, "include/xsk/gsc/common/*.hpp"),
+		}
+
+		includedirs {
+			path.join(gsc_tool.source, "include"),
+		}
+end
+
+table.insert(dependencies, gsc_tool)

deps/premake/zlib.lua

@@ -0,0 +1,39 @@
+zlib = {
+	source = path.join(dependencies.basePath, "zlib"),
+}
+
+function zlib.import()
+	links { "zlib" }
+	zlib.includes()
+end
+
+function zlib.includes()
+	includedirs {
+		zlib.source
+	}
+
+	defines {
+		"ZLIB_CONST",
+	}
+end
+
+function zlib.project()
+	project "zlib"
+		language "C"
+
+		zlib.includes()
+
+		files {
+			path.join(zlib.source, "*.h"),
+			path.join(zlib.source, "*.c"),
+		}
+
+		defines {
+			"_CRT_SECURE_NO_DEPRECATE",
+		}
+
+		warnings "Off"
+		kind "StaticLib"
+end
+
+table.insert(dependencies, zlib)

generate.bat

@@ -1,2 +1,3 @@
 @echo off
-tools\windows\premake5.exe vs2019
+call git submodule update --init --recursive
+tools\premake5.exe vs2022

premake5.lua

@@ -36,32 +36,35 @@ workspace "iw5-gsc-utils"
 	targetdir "%{wks.location}/bin/%{cfg.buildcfg}"
 	targetname "%{prj.name}"
 
+	configurations { "Debug", "Release", }
+
 	language "C++"
+	cppdialect "C++20"
 
 	architecture "x86"
 
-	buildoptions "/std:c++latest"
 	systemversion "latest"
+	symbols "On"
+	staticruntime "On"
+	editandcontinue "Off"
+	warnings "Extra"
+	characterset "ASCII"
 
 	flags
 	{
 		"NoIncrementalLink",
 		"MultiProcessorCompile",
 	}
-
-	configurations { "Debug", "Release", }
-
-	symbols "On"
 	
-	configuration "Release"
+	filter "configurations:Release"
 		optimize "Full"
 		defines { "NDEBUG" }
-	configuration{}
+	filter {}
 
-	configuration "Debug"
+	filter "configurations:Debug"
 		optimize "Debug"
 		defines { "DEBUG", "_DEBUG" }
-	configuration {}
+	filter {}
 
 	startproject "iw5-gsc-utils"
 

src/component/command.cpp

@@ -49,6 +49,7 @@ namespace command
 			if (i > index) result.append(" ");
 			result.append(this->get(i));
 		}
+
 		return result;
 	}
 
@@ -96,7 +97,6 @@ namespace command
 	public:
 		void post_unpack() override
 		{
-
 		}
 	};
 }

src/component/gsc.cpp

@@ -14,32 +14,6 @@
 
 namespace gsc
 {
-	function_args::function_args(std::vector<scripting::script_value> values)
-		: values_(values)
-	{
-	}
-
-	unsigned int function_args::size() const
-	{
-		return this->values_.size();
-	}
-
-	std::vector<scripting::script_value> function_args::get_raw() const
-	{
-		return this->values_;
-	}
-
-	scripting::script_value function_args::get(const int index) const
-	{
-		if (index >= this->values_.size())
-		{
-			throw std::runtime_error(utils::string::va("Insufficient arguments, got %i expected %i", 
-				this->values_.size(), index + 1));
-		}
-		
-		return this->values_[index];
-	}
-
 	std::unordered_map<unsigned, script_function> functions;
 	std::unordered_map<unsigned, script_method> methods;
 
@@ -47,13 +21,13 @@ namespace gsc
 	{
 		std::string method_name(unsigned int id)
 		{
-			const auto map = *game::plutonium::method_map_rev;
+			const auto& map = (*game::plutonium::gsc_ctx)->meth_map();
 
 			for (const auto& function : map)
 			{
 				if (function.second == id)
 				{
-					return function.first;
+					return function.first.data();
 				}
 			}
 
@@ -62,13 +36,13 @@ namespace gsc
 
 		std::string function_name(unsigned int id)
 		{
-			const auto map = *game::plutonium::function_map_rev;
+			const auto& map = (*game::plutonium::gsc_ctx)->func_map();
 
 			for (const auto& function : map)
 			{
 				if (function.second == id)
 				{
-					return function.first;
+					return function.first.data();
 				}
 			}
 
@@ -79,8 +53,6 @@ namespace gsc
 		{
 			std::vector<scripting::script_value> args;
 
-			const auto top = game::scr_VmPub->top;
-
 			for (auto i = 0; i < game::scr_VmPub->outparamcount; i++)
 			{
 				const auto value = game::scr_VmPub->top[-i];
@@ -102,12 +74,24 @@ namespace gsc
 
 		auto function_map_start = 0x200;
 		auto method_map_start = 0x8400;
+		auto token_map_start = 0x8000;
+		auto field_offset_start = 0xA000;
+
+		struct entity_field
+		{
+			std::string name;
+			std::function<scripting::script_value(unsigned int entnum)> getter;
+			std::function<void(unsigned int entnum, scripting::script_value)> setter;
+		};
+
+		std::vector<std::function<void()>> post_load_callbacks;
+		std::unordered_map<unsigned int, std::unordered_map<unsigned int, entity_field>> custom_fields;
 
 		void call_function(unsigned int id)
 		{
 			if (id < 0x200)
 			{
-				return reinterpret_cast<builtin_function*>(0x20689DD8)[id]();
+				return reinterpret_cast<builtin_function*>(game::plutonium::function_table.get())[id]();
 			}
 
 			try
@@ -123,8 +107,8 @@ namespace gsc
 			catch (const std::exception& e)
 			{
 				printf("************** Script execution error **************\n");
-				printf("Error executing function %s\n", function_name(id).data());
-				printf("%s\n", e.what());
+				printf("Error executing function %s:\n", function_name(id).data());
+				printf("    %s\n", e.what());
 				printf("****************************************************\n");
 			}
 		}
@@ -133,7 +117,7 @@ namespace gsc
 		{
 			if (id < 0x8400)
 			{
-				return reinterpret_cast<builtin_method*>(0x2068A5A8)[id - 0x8000](ent);
+				return reinterpret_cast<builtin_method*>(game::plutonium::method_table.get())[id - 0x8000](ent);
 			}
 
 			try
@@ -149,8 +133,8 @@ namespace gsc
 			catch (const std::exception& e)
 			{
 				printf("************** Script execution error **************\n");
-				printf("Error executing method %s\n", method_name(id).data());
-				printf("%s\n", e.what());
+				printf("Error executing method %s:\n", method_name(id).data());
+				printf("    %s\n", e.what());
 				printf("****************************************************\n");
 			}
 		}
@@ -199,16 +183,86 @@ namespace gsc
 				retn
 			}
 		}
+
+		utils::hook::detour scr_get_object_field_hook;
+		void scr_get_object_field_stub(unsigned int classnum, int entnum, unsigned int offset)
+		{
+			if (custom_fields[classnum].find(offset) == custom_fields[classnum].end())
+			{
+				return scr_get_object_field_hook.invoke<void>(classnum, entnum, offset);
+			}
+
+			const auto& field = custom_fields[classnum][offset];
+
+			try
+			{
+				const auto result = field.getter(entnum);
+				return_value(result);
+			}
+			catch (const std::exception& e)
+			{
+				printf("************** Script execution error **************\n");
+				printf("Error getting field %s:\n", field.name.data());
+				printf("    %s\n", e.what());
+				printf("****************************************************\n");
+			}
+		}
+
+		utils::hook::detour scr_set_object_field_hook;
+		void scr_set_object_field_stub(unsigned int classnum, int entnum, unsigned int offset)
+		{
+			if (custom_fields[classnum].find(offset) == custom_fields[classnum].end())
+			{
+				return scr_set_object_field_hook.invoke<void>(classnum, entnum, offset);
+			}
+
+			const auto args = get_arguments();
+			const auto& field = custom_fields[classnum][offset];
+
+			try
+			{
+				field.setter(entnum, args[0]);
+			}
+			catch (const std::exception& e)
+			{
+				printf("************** Script execution error **************\n");
+				printf("Error setting field %s:\n", field.name.data());
+				printf("    %s\n", e.what());
+				printf("****************************************************\n");
+			}
+		}
+
+		utils::hook::detour scr_post_load_scripts_hook;
+		void scr_post_load_scripts_stub()
+		{
+			for (const auto& callback : post_load_callbacks)
+			{
+				callback();
+			}
+
+			return scr_post_load_scripts_hook.invoke<void>();
+		}
 	}
 
 	namespace function
 	{
 		void add(const std::string& name, const script_function& func)
 		{
-			const auto index = function_map_start++;
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
+			
+			if (ctx->func_exists(name))
+			{
+				printf("[iw5-gsc-utils] Warning: function '%s' already defined\n", name.data());
+				index = ctx->func_id(name);
+			}
+			else
+			{
+				index = function_map_start++;
+				ctx->func_add(name, index);
+			}
 
-			functions[index] = func;
-			(*game::plutonium::function_map_rev)[name] = index;
+			functions.insert(std::make_pair(index, func));
 		}
 	}
 
@@ -216,18 +270,101 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func)
 		{
-			const auto index = method_map_start++;
+			auto index = 0u;
+			auto& ctx = (*game::plutonium::gsc_ctx);
 
-			methods[index] = func;
-			(*game::plutonium::method_map_rev)[name] = index;
+			if (ctx->meth_exists(name))
+			{
+				printf("[iw5-gsc-utils] Warning: method '%s' already defined\n", name.data());
+				index = ctx->meth_id(name);
+			}
+			else
+			{
+				index = method_map_start++;
+				ctx->meth_add(name, index);
+			}
+
+			methods.insert(std::make_pair(index, func));
 		}
 	}
 
+	namespace field
+	{
+		void add(const classid classnum, const std::string& name,
+			const std::function<scripting::script_value(unsigned int entnum)>& getter,
+			const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter)
+		{
+			const auto offset = field_offset_start++;
+			custom_fields[classnum][offset] = {name, getter, setter};
+
+			post_load_callbacks.push_back([=]()
+			{
+				const auto name_str = game::SL_GetString(name.data(), 0);
+				game::Scr_AddClassField(classnum, name_str, game::SL_GetCanonicalString(name.data()), offset);
+			});
+		}
+	}
+
+	function_args::function_args(std::vector<scripting::script_value> values)
+		: values_(values)
+	{
+	}
+
+	unsigned int function_args::size() const
+	{
+		return this->values_.size();
+	}
+
+	std::vector<scripting::script_value> function_args::get_raw() const
+	{
+		return this->values_;
+	}
+
+	scripting::value_wrap function_args::get(const int index) const
+	{
+		if (index >= this->values_.size())
+		{
+			throw std::runtime_error(utils::string::va("parameter %d does not exist", index));
+		}
+
+		return {this->values_[index], index};
+	}
+
 	class component final : public component_interface
 	{
 	public:
 		void post_unpack() override
 		{
+			scr_get_object_field_hook.create(0x52BDB0, scr_get_object_field_stub);
+			scr_set_object_field_hook.create(0x52BCC0, scr_set_object_field_stub);
+			scr_post_load_scripts_hook.create(0x628B50, scr_post_load_scripts_stub);
+
+			field::add(classid::entity, "entityflags",
+				[](unsigned int entnum) -> scripting::script_value
+				{
+					const auto entity = &game::g_entities[entnum];
+					return entity->flags;
+				},
+				[](unsigned int entnum, const scripting::script_value& value)
+				{
+					const auto entity = &game::g_entities[entnum];
+					entity->flags = value.as<int>();
+				}
+			);
+
+			field::add(classid::entity, "clientflags",
+				[](unsigned int entnum) -> scripting::script_value
+				{
+					const auto entity = &game::g_entities[entnum];
+					return entity->client->flags;
+				},
+				[](unsigned int entnum, const scripting::script_value& value)
+				{
+					const auto entity = &game::g_entities[entnum];
+					entity->client->flags = value.as<int>();
+				}
+			);
+
 			function::add("executecommand", [](const function_args& args) -> scripting::script_value
 			{
 				game::Cbuf_AddText(0, args[0].as<const char*>());
@@ -260,6 +397,20 @@ namespace gsc
 				return {};
 			});
 
+			function::add("dropallbots", [](const function_args&) -> scripting::script_value
+			{
+				for (auto i = 0; i < *game::svs_clientCount; i++)
+				{
+					if (game::svs_clients[i].header.state != game::CS_FREE
+						&& game::svs_clients[i].header.netchan.remoteAddress.type == game::NA_BOT)
+					{
+						game::SV_GameDropClient(i, "GAME_GET_TO_COVER");
+					}
+				}
+
+				return {};
+			});
+
 			method::add("tell", [](const game::scr_entref_t ent, const function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
@@ -268,8 +419,13 @@ namespace gsc
 				}
 
 				const auto client = ent.entnum;
-				const auto message = args[0].as<std::string>();
 
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto message = args[0].as<std::string>();
 				game::SV_GameSendServerCommand(client, 0, utils::string::va("%c \"%s\"", 84, message.data()));
 
 				return {};
@@ -282,22 +438,62 @@ namespace gsc
 					throw std::runtime_error("Invalid entity");
 				}
 
-				const auto num = ent.entnum;
+				const auto client = ent.entnum;
+
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				const auto toggle = args[0].as<int>();
+				auto flags = game::g_entities[client].client->ps.perks[0];
 
-				auto g_client = game::g_entities[num].client;
-				auto playerState = &g_client->ps;
-				auto flags = playerState->perks[0];
-
-				playerState->perks[0] = toggle
-					? flags | 0x4000u
-					: flags & ~0x4000u;
+				game::g_entities[client].client->ps.perks[0] = toggle
+					? flags | 0x4000u : flags & ~0x4000u;
 
 				return {};
 			});
 
-			utils::hook::jump(0x56C8EB, call_builtin_stub);
-			utils::hook::jump(0x56CBDC, call_builtin_method_stub);
+			method::add("isbot", [](const game::scr_entref_t ent, const function_args&) -> scripting::script_value
+			{
+				if (ent.classnum != 0)
+				{
+					throw std::runtime_error("Invalid entity");
+				}
+
+				const auto client = ent.entnum;
+
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				return game::svs_clients[client].bIsTestClient;
+			});
+
+			method::add("arecontrolsfrozen", [](const game::scr_entref_t ent, const function_args&) -> scripting::script_value
+			{
+				if (ent.classnum != 0)
+				{
+					throw std::runtime_error("Invalid entity");
+				}
+
+				const auto client = ent.entnum;
+
+				if (game::g_entities[client].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				return {(game::g_entities[client].client->flags & 4) != 0};
+			});
+
+			// let other plugins read the pointers
+			post_load_callbacks.push_back([]()
+			{
+				utils::hook::jump(0x56C8EB, call_builtin_stub);
+				utils::hook::jump(0x56CBDC, call_builtin_method_stub);
+			});
 		}
 	};
 }

src/component/gsc.hpp

@@ -1,7 +1,18 @@
 #pragma once
+#include "game/scripting/array.hpp"
+#include "game/scripting/execution.hpp"
 
 namespace gsc
 {
+	enum classid
+	{
+		entity,
+		hudelem,
+		pathnode,
+		node,
+		count
+	};
+
 	class function_args
 	{
 	public:
@@ -9,9 +20,9 @@ namespace gsc
 
 		unsigned int size() const;
 		std::vector<scripting::script_value> get_raw() const;
-		scripting::script_value get(const int index) const;
+		scripting::value_wrap get(const int index) const;
 
-		scripting::script_value operator[](const int index) const
+		scripting::value_wrap operator[](const int index) const
 		{
 			return this->get(index);
 		}
@@ -34,4 +45,11 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func);
 	}
+
+	namespace field
+	{
+		void add(const classid classnum, const std::string& name,
+			const std::function<scripting::script_value(unsigned int entnum)>& getter,
+			const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter);
+	}
 }

src/component/io.cpp

@@ -2,12 +2,6 @@
 #include "loader/component_loader.hpp"
 
 #include "scheduler.hpp"
-
-#include "game/scripting/event.hpp"
-#include "game/scripting/execution.hpp"
-#include "game/scripting/functions.hpp"
-#include "game/scripting/array.hpp"
-
 #include "gsc.hpp"
 #include "json.hpp"
 
@@ -185,4 +179,4 @@ namespace io
 	};
 }
 
-REGISTER_COMPONENT(io::component)
+REGISTER_COMPONENT(io::component)

src/component/json.cpp

@@ -2,12 +2,6 @@
 #include "loader/component_loader.hpp"
 
 #include "scheduler.hpp"
-
-#include "game/scripting/event.hpp"
-#include "game/scripting/execution.hpp"
-#include "game/scripting/functions.hpp"
-#include "game/scripting/array.hpp"
-
 #include "gsc.hpp"
 #include "json.hpp"
 
@@ -28,18 +22,23 @@ namespace json
 			const auto keys = array.get_keys();
 			for (auto i = 0; i < keys.size(); i++)
 			{
+				const auto is_int = keys[i].is<int>();
+				const auto is_string = keys[i].is<std::string>();
+
 				if (string_indexed == -1)
 				{
-					string_indexed = keys[i].is_string;
+					string_indexed = is_string;
 				}
 
-				if (!string_indexed && keys[i].is_integer)
+				if (!string_indexed && is_int)
 				{
-					obj[keys[i].index] = gsc_to_json(array[keys[i].index]);
+					const auto index = keys[i].as<int>();
+					obj[index] = gsc_to_json(array[index]);
 				}
-				else if (string_indexed && keys[i].is_string)
+				else if (string_indexed && is_string)
 				{
-					obj.emplace(keys[i].key, gsc_to_json(array[keys[i].key]));
+					const auto key = keys[i].as<std::string>();
+					obj.emplace(key, gsc_to_json(array[key]));
 				}
 			}
 
@@ -195,4 +194,4 @@ namespace json
 	};
 }
 
-REGISTER_COMPONENT(json::component)
+REGISTER_COMPONENT(json::component)

src/component/notifies.cpp

@@ -1,35 +1,51 @@
 #include <stdinc.hpp>
 #include "loader/component_loader.hpp"
-#include "scheduler.hpp"
 
-#include "game/scripting/entity.hpp"
-#include "game/scripting/execution.hpp"
+#include "scheduler.hpp"
+#include "gsc.hpp"
+#include "scripting.hpp"
 
 namespace notifies
 {
 	namespace
 	{
+		std::vector<scripting::function> say_callbacks;
 		utils::hook::detour client_command_hook;
 
 		void client_command_stub(int clientNum)
 		{
-			char cmd[1024] = { 0 };
+			char cmd[1024] = {0};
+			const auto* entity = &game::g_entities[clientNum];
+
+			if (entity->client == nullptr)
+			{
+				return; // Client is not fully in game yet
+			}
 
 			game::SV_Cmd_ArgvBuffer(0, cmd, 1024);
 
+			auto hidden = false;
 			if (cmd == "say"s || cmd == "say_team"s)
 			{
 				std::string message = game::ConcatArgs(1);
 				message.erase(0, 1);
 
-				const scripting::entity level{*game::levelEntityId};
-				const auto player = scripting::call("getEntByNum", {clientNum}).as<scripting::entity>();
+				for (const auto& callback : say_callbacks)
+				{
+					const auto entity_id = game::Scr_GetEntityId(clientNum, 0);
+					const auto result = callback(entity_id, {message, cmd == "say_team"s});
 
-				scripting::notify(level, cmd, {player, message});
-				scripting::notify(player, cmd, {message});
+					if (result.is<int>() && !hidden)
+					{
+						hidden = result.as<int>() == 0;
+					}
+				}
 			}
 
-			return client_command_hook.invoke<void>(clientNum);
+			if (!hidden)
+			{
+				client_command_hook.invoke<void>(clientNum);
+			}
 		}
 	}
 
@@ -39,8 +55,20 @@ namespace notifies
 		void post_unpack() override
 		{
 			client_command_hook.create(0x502CB0, client_command_stub);
+
+			scripting::on_shutdown([]()
+			{
+				say_callbacks.clear();
+			});
+
+			gsc::function::add("onplayersay", [](const gsc::function_args& args) -> scripting::script_value
+			{
+				const auto function = args[0].as<scripting::function>();
+				say_callbacks.push_back(function);
+				return {};
+			});
 		}
 	};
 }
 
-REGISTER_COMPONENT(notifies::component)
+REGISTER_COMPONENT(notifies::component)

src/component/scripting.cpp

@@ -29,6 +29,8 @@ namespace scripting
 
 		std::string current_file;
 
+		std::vector<std::function<void()>> shutdown_callbacks;
+
 		void vm_notify_stub(const unsigned int notify_list_owner_id, const unsigned int string_value,
 			                game::VariableValue* top)
 		{
@@ -77,6 +79,12 @@ namespace scripting
 		{
 			userinfo::clear_overrides();
 			command::clear_script_commands();
+
+			for (const auto& callback : shutdown_callbacks)
+			{
+				callback();
+			}
+
 			g_shutdown_game_hook.invoke<void>(free_scripts);
 		}
 
@@ -87,7 +95,7 @@ namespace scripting
 			const auto file_id = atoi(filename);
 			if (file_id)
 			{
-				current_file = scripting::file_list[file_id];
+				current_file = scripting::find_file(file_id);
 			}
 
 			process_script_hook.invoke<void>(filename);
@@ -106,6 +114,11 @@ namespace scripting
 		}
 	}
 
+	void on_shutdown(const std::function<void()>& callback)
+	{
+		shutdown_callbacks.push_back(callback);
+	}
+
 	class component final : public component_interface
 	{
 	public:
@@ -123,4 +136,4 @@ namespace scripting
 	};
 }
 
-REGISTER_COMPONENT(scripting::component)
+REGISTER_COMPONENT(scripting::component)

src/component/scripting.hpp

@@ -4,4 +4,6 @@ namespace scripting
 {
 	extern std::unordered_map<int, std::unordered_map<std::string, int>> fields_table;
 	extern std::unordered_map<std::string, std::unordered_map<std::string, const char*>> script_function_table;
+
+	void on_shutdown(const std::function<void()>& callback);
 }

src/component/signatures.cpp

@@ -0,0 +1,106 @@
+#include <stdinc.hpp>
+#include "signatures.hpp"
+#include <utils/hook.hpp>
+
+namespace signatures
+{
+	size_t load_image_size()
+	{
+		MODULEINFO info{};
+		GetModuleInformation(GetCurrentProcess(),
+			GetModuleHandle("plutonium-bootstrapper-win32.exe"), &info, sizeof(MODULEINFO));
+		return info.SizeOfImage;
+	}
+
+	size_t get_image_size()
+	{
+		static const auto image_size = load_image_size();
+		return image_size;
+	}
+
+	void load_function_tables()
+	{
+		static const auto ptr = *reinterpret_cast<size_t*>(0x56CBDC + 0x1) + 0x56CBDC + 0x5;
+		static const auto function_table = *reinterpret_cast<size_t*>(0x56C8EB + 0x3);
+		static const auto method_table = *reinterpret_cast<size_t*>(ptr + 0xA);
+
+		game::plutonium::function_table.set(function_table);
+		game::plutonium::method_table.set(method_table);
+	}
+
+	size_t find_string_ptr(const std::string& string)
+	{
+		const char* string_ptr = nullptr;
+		std::string mask(string.size(), 'x');
+		const auto base = reinterpret_cast<size_t>(GetModuleHandle("plutonium-bootstrapper-win32.exe"));
+		utils::hook::signature signature(base, get_image_size() - base);
+
+		auto found = false;
+		signature.add({
+			string,
+			mask,
+			[&](char* address)
+			{
+				if (found)
+				{
+					return;
+				}
+
+				found = true;
+				string_ptr = address;
+			}
+		});
+
+		signature.process();
+		return reinterpret_cast<size_t>(string_ptr);
+	}
+
+	size_t find_string_ref(const std::string& string)
+	{
+		char bytes[4] = {0};
+		const auto string_ptr = find_string_ptr(string);
+		if (!string_ptr)
+		{
+			return 0;
+		}
+
+		std::memcpy(bytes, &string_ptr, sizeof(bytes));
+		return find_string_ptr({bytes, 4});
+	}
+
+	bool process_gsc_ctx()
+	{
+		const auto string_ref = find_string_ref("in call to builtin %s \"%s\"");
+		if (!string_ref)
+		{
+			return false;
+		}
+		
+		const auto gsc_ctx_ptr = *reinterpret_cast<size_t*>(string_ref - 0xAD);
+		OutputDebugString(utils::string::va("gsc_ctx_ptr: %p\n", gsc_ctx_ptr));
+		game::plutonium::gsc_ctx.set(gsc_ctx_ptr);
+		return true;
+	}
+
+	bool process_printf()
+	{
+		const auto string_ref = find_string_ref("A critical exception occured!\n");
+		if (!string_ref)
+		{
+			return false;
+		}
+
+		const auto offset = *reinterpret_cast<size_t*>(string_ref + 5);
+		const auto printf_ptr = string_ref + 4 + 5 + offset;
+		OutputDebugString(utils::string::va("printf_ptr: %p\n", printf_ptr));
+		game::plutonium::printf.set(printf_ptr);
+
+		return true;
+	}
+
+	bool process()
+	{
+		load_function_tables();
+		return process_printf() && process_gsc_ctx();
+	}
+}

src/component/signatures.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace signatures
+{
+	bool process();
+}

src/component/string.cpp

@@ -0,0 +1,46 @@
+#include <stdinc.hpp>
+#include "loader/component_loader.hpp"
+
+#include "gsc.hpp"
+
+#include <utils/string.hpp>
+
+namespace string
+{
+	class component final : public component_interface
+	{
+	public:
+		void post_unpack() override
+		{
+			gsc::function::add("toupper", [](const gsc::function_args& args)
+			{
+				return utils::string::to_upper(args[0].as<std::string>());
+			});
+
+			gsc::function::add("getchar", [](const gsc::function_args& args)
+			{
+				auto index = 0;
+				if (args.size() > 1)
+				{
+					index = args[1].as<int>();
+				}
+
+				const auto string = args[0].as<std::string>();
+				if (index >= static_cast<int>(string.size()))
+				{
+					throw std::runtime_error("Char index out of bounds");
+				}
+
+				return static_cast<int>(string[index]);
+			});
+
+			gsc::function::add("chartostring", [](const gsc::function_args& args)
+			{
+				const auto char_ = static_cast<char>(args[0].as<int>());
+				return std::string(1, char_);
+			});
+		}
+	};
+}
+
+REGISTER_COMPONENT(string::component)

src/component/userinfo.cpp

@@ -2,12 +2,6 @@
 #include "loader/component_loader.hpp"
 
 #include "scheduler.hpp"
-
-#include "game/scripting/event.hpp"
-#include "game/scripting/execution.hpp"
-#include "game/scripting/functions.hpp"
-#include "game/scripting/array.hpp"
-
 #include "gsc.hpp"
 
 namespace userinfo
@@ -19,12 +13,17 @@ namespace userinfo
 	{
 		utils::hook::detour sv_getuserinfo_hook;
 
-		userinfo_map userinfo_to_map(const std::string& userinfo)
+		userinfo_map userinfo_to_map(std::string userinfo)
 		{
-			userinfo_map map;
-			const auto args = utils::string::split(userinfo, '\\');
+			userinfo_map map{};
 
-			for (auto i = 1; i < args.size() - 1; i += 2)
+			if (userinfo[0] == '\\')
+			{
+				userinfo = userinfo.substr(1);
+			}
+
+			const auto args = utils::string::split(userinfo, '\\');
+			for (size_t i = 0; !args.empty() && i < (args.size() - 1); i += 2)
 			{
 				map[args[i]] = args[i + 1];
 			}
@@ -34,7 +33,7 @@ namespace userinfo
 
 		std::string map_to_userinfo(const userinfo_map& map)
 		{
-			std::string buffer;
+			std::string buffer{};
 
 			for (const auto& value : map)
 			{
@@ -49,9 +48,8 @@ namespace userinfo
 
 		void sv_getuserinfo_stub(int index, char* buffer, int bufferSize)
 		{
-			char _buffer[1024];
-			sv_getuserinfo_hook.invoke<void>(index, _buffer, 1024);
-			auto map = userinfo_to_map(_buffer);
+			sv_getuserinfo_hook.invoke<void>(index, buffer, bufferSize);
+			auto map = userinfo_to_map(buffer);
 
 			if (userinfo_overrides.find(index) == userinfo_overrides.end())
 			{
@@ -94,28 +92,36 @@ namespace userinfo
 
 			gsc::method::add("setname", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto name = args[0].as<std::string>();
+
 				userinfo_overrides[ent.entnum]["name"] = name;
 				game::ClientUserinfoChanged(ent.entnum);
 
 				return {};
 			});
 
-			gsc::method::add("resetname", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
+			gsc::method::add("resetname", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum].erase("name");
 				game::ClientUserinfoChanged(ent.entnum);
 
@@ -124,13 +130,18 @@ namespace userinfo
 
 			gsc::method::add("setclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
+				const auto name = args[0].as<std::string>();
+
 				userinfo_overrides[ent.entnum]["clantag"] = name;
 				userinfo_overrides[ent.entnum]["ec_TagText"] = name;
 				userinfo_overrides[ent.entnum]["ec_usingTag"] = "1";
@@ -139,15 +150,18 @@ namespace userinfo
 				return {};
 			});
 
-			gsc::method::add("resetclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
+			gsc::method::add("resetclantag", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
 			{
-				const auto name = args[0].as<std::string>();
-
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum].erase("clantag");
 				userinfo_overrides[ent.entnum].erase("ec_TagText");
 				userinfo_overrides[ent.entnum].erase("ec_usingTag");
@@ -156,13 +170,18 @@ namespace userinfo
 				return {};
 			});
 
-			gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
+			gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
 			{
-				if (ent.classnum != 0 || ent.entnum > 17)
+				if (ent.classnum != 0)
 				{
 					throw std::runtime_error("Invalid entity");
 				}
 
+				if (game::g_entities[ent.entnum].client == nullptr)
+				{
+					throw std::runtime_error("Not a player entity");
+				}
+
 				userinfo_overrides[ent.entnum]["clantag"] = "";
 				userinfo_overrides[ent.entnum]["ec_TagText"] = "";
 				userinfo_overrides[ent.entnum]["ec_usingTag"] = "0";
@@ -174,4 +193,4 @@ namespace userinfo
 	};
 }
 
-REGISTER_COMPONENT(userinfo::component)
+REGISTER_COMPONENT(userinfo::component)

src/dllmain.cpp

@@ -1,20 +1,27 @@
 #include <stdinc.hpp>
 #include "loader/component_loader.hpp"
 
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+#include "component/signatures.hpp"
+
+BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
 {
     if (ul_reason_for_call == DLL_PROCESS_ATTACH)
     {
-        const auto value = *reinterpret_cast<DWORD*>(0x20800000);
-        if (value != 0xB9C9566)
+        if (!signatures::process())
         {
-            printf("\x1b[31m\n**************************************************************************************\n\n");
-            printf("This version of \x1b[33miw5-gsc-utils\x1b[31m is outdated.\n");
-            printf("Download the latest dll from here:\x1b[34m https://github.com/fedddddd/iw5-gsc-utils/releases \x1b[31m\n");
-            printf("\n**************************************************************************************\n\n\x1b[37m");
+            MessageBoxA(NULL,
+                "This version of iw5-gsc-utils is outdated.\n" \
+                "Download the latest dll from here: https://github.com/fedddddd/iw5-gsc-utils/releases",
+                "ERROR", MB_ICONERROR);
+
             return FALSE;
         }
 
+        if (game::plutonium::printf.get() != nullptr)
+        {
+            utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
+        }
+
         component_loader::post_unpack();
     }
 

src/game/game.cpp

@@ -2,5 +2,11 @@
 
 namespace game
 {
-
+	void SV_GameDropClient(int clientNum, const char* reason)
+	{
+		if (clientNum >= 0 && clientNum < sv_maxclients->current.integer)
+		{
+			SV_DropClient(&svs_clients[clientNum], reason, true);
+		}
+	}
 }

src/game/game.hpp

@@ -16,6 +16,11 @@ namespace game
 			return dedi_;
 		}
 
+		void set(const size_t dedi)
+		{
+			this->dedi_ = reinterpret_cast<T*>(dedi);
+		}
+
 		operator T* () const
 		{
 			return this->get();
@@ -29,6 +34,8 @@ namespace game
 	private:
 		T* dedi_;
 	};
+
+	void SV_GameDropClient(int clientNum, const char* reason);
 }
 
 #include "symbols.hpp"

src/game/scripting/array.cpp

@@ -1,5 +1,6 @@
 #include <stdinc.hpp>
 #include "array.hpp"
+#include "script_value.hpp"
 #include "execution.hpp"
 
 namespace scripting
@@ -59,13 +60,11 @@ namespace scripting
 	array::array()
 	{
 		this->id_ = make_array();
-		this->add();
 	}
 	
 	array::array(std::vector<script_value> values)
 	{
 		this->id_ = make_array();
-		this->add();
 
 		for (const auto& value : values)
 		{
@@ -76,7 +75,6 @@ namespace scripting
 	array::array(std::unordered_map<std::string, script_value> values)
 	{
 		this->id_ = make_array();
-		this->add();
 
 		for (const auto& value : values)
 		{
@@ -129,9 +127,9 @@ namespace scripting
 		}
 	}
 
-	std::vector<array_key> array::get_keys() const
+	std::vector<script_value> array::get_keys() const
 	{
-		std::vector<array_key> result;
+		std::vector<script_value> result;
 
 		const auto offset = 0xC800 * (this->id_ & 1);
 		auto current = game::scr_VarGlob->objectVariableChildren[this->id_].firstChild;
@@ -149,16 +147,14 @@ namespace scripting
 			const auto string_value = (unsigned int)((unsigned __int8)var.name_lo + (var.k.keys.name_hi << 8));
 			const auto* str = game::SL_ConvertToString(string_value);
 
-			array_key key;
+			script_value key;
 			if (string_value < 0x40000 && str)
 			{
-				key.is_string = true;
-				key.key = str;
+				key = str;
 			}
 			else
 			{
-				key.is_integer = true;
-				key.index = (string_value - 0x800000) & 0xFFFFFF;
+				key = (string_value - 0x800000) & 0xFFFFFF;
 			}
 
 			result.push_back(key);
@@ -206,16 +202,18 @@ namespace scripting
 		return value;
 	}
 
-	script_value array::get(const array_key& key) const
+	script_value array::get(const script_value& key) const
 	{
-		if (key.is_integer)
+		if (key.is<int>())
 		{
-			return this->get(key.index);
+			return this->get(key.as<int>());
 		}
 		else
 		{
-			return this->get(key.key);
+			return this->get(key.as<std::string>());
 		}
+
+		return {};
 	}
 
 	script_value array::get(const std::string& key) const
@@ -253,23 +251,21 @@ namespace scripting
 		return variable;
 	}
 
-	void array::set(const array_key& key, const script_value& value) const
+	void array::set(const script_value& key, const script_value& value) const
 	{
-		if (key.is_integer)
+		if (key.is<int>())
 		{
-			this->set(key.index, value);
+			this->set(key.as<int>(), value);
 		}
 		else
 		{
-			this->set(key.key, value);
+			this->set(key.as<std::string>(), value);
 		}
 	}
 
-	void array::set(const std::string& key, const script_value& _value) const
+	void array::set(const std::string& key, const script_value& value_) const
 	{
-		const auto value = _value.get_raw();
-
-		const auto string_value = game::SL_GetString(key.data(), 0);
+		const auto value = value_.get_raw();
 		const auto variable_id = this->get_value_id(key);
 
 		if (!variable_id)
@@ -286,9 +282,9 @@ namespace scripting
 		variable->u.u = value.u;
 	}
 
-	void array::set(const unsigned int index, const script_value& _value) const
+	void array::set(const unsigned int index, const script_value& value_) const
 	{
-		const auto value = _value.get_raw();
+		const auto value = value_.get_raw();
 		const auto variable_id = this->get_value_id(index);
 
 		if (!variable_id)

src/game/scripting/array.hpp

@@ -1,16 +1,9 @@
 #pragma once
+#include "game/game.hpp"
 #include "script_value.hpp"
 
 namespace scripting
 {
-	struct array_key
-	{
-		bool is_string = false;
-		bool is_integer = false;
-		unsigned int index{};
-		std::string key{};
-	};
-
 	class array_value : public script_value
 	{
 	public:
@@ -38,7 +31,7 @@ namespace scripting
 		array& operator=(const array& other);
 		array& operator=(array&& other) noexcept;
 
-		std::vector<array_key> get_keys() const;
+		std::vector<script_value> get_keys() const;
 		unsigned int size() const;
 
 		unsigned int push(script_value) const;
@@ -46,11 +39,11 @@ namespace scripting
 		void erase(const std::string&) const;
 		script_value pop() const;
 
-		script_value get(const array_key&) const;
+		script_value get(const script_value&) const;
 		script_value get(const std::string&) const;
 		script_value get(const unsigned int) const;
 
-		void set(const array_key&, const script_value&) const;
+		void set(const script_value&, const script_value&) const;
 		void set(const std::string&, const script_value&) const;
 		void set(const unsigned int, const script_value&) const;
 
@@ -71,15 +64,17 @@ namespace scripting
 			return {this->id_, this->get_value_id(key)};
 		}
 
-		array_value operator[](const array_key& key) const
+		template <typename I = int, typename S = std::string>
+		array_value operator[](const script_value& key) const
 		{
-			if (key.is_integer)
+			if (key.is<I>())
 			{
-				return {this->id_, this->get_value_id(key.index)};
+				return { this->id_, this->get_value_id(key.as<I>()) };
 			}
-			else
+
+			if (key.is<S>())
 			{
-				return {this->id_, this->get_value_id(key.key)};
+				return { this->id_, this->get_value_id(key.as<S>()) };
 			}
 		}
 

src/game/scripting/execution.cpp

@@ -269,8 +269,6 @@ namespace scripting
 		{
 			return get_custom_field(entity, field);
 		}
-
-		return {};
 	}
 
 	unsigned int make_array()

src/game/scripting/execution.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "game/game.hpp"
 #include "entity.hpp"
+#include "array.hpp"
+#include "function.hpp"
 #include "script_value.hpp"
 
 namespace scripting

src/game/scripting/function.cpp

@@ -23,7 +23,7 @@ namespace scripting
 		return this->pos_;
 	}
 
-	script_value function::call(entity self, std::vector<script_value> arguments) const
+	script_value function::call(const entity& self, std::vector<script_value> arguments) const
 	{
 		return exec_ent_thread(self, this->pos_, arguments);
 	}

src/game/scripting/function.hpp

@@ -12,9 +12,9 @@ namespace scripting
 		script_value get_raw() const;
 		const char* get_pos() const;
 
-		script_value call(entity self, std::vector<script_value> arguments) const;
+		script_value call(const entity& self, std::vector<script_value> arguments) const;
 
-		script_value operator()(entity self, std::vector<script_value> arguments) const
+		script_value operator()(const entity& self, std::vector<script_value> arguments) const
 		{
 			return this->call(self, arguments);
 		}

src/game/scripting/functions.cpp

@@ -7,51 +7,20 @@ namespace scripting
 {
 	namespace
 	{
-		std::unordered_map<std::string, unsigned> lowercase_map(
-			const std::unordered_map<std::string, unsigned>& old_map)
-		{
-			std::unordered_map<std::string, unsigned> new_map{};
-			for (auto& entry : old_map)
-			{
-				new_map[utils::string::to_lower(entry.first)] = entry.second;
-			}
-
-			return new_map;
-		}
-
-		const std::unordered_map<std::string, unsigned>& get_methods()
-		{
-			static auto methods = lowercase_map(method_map);
-			return methods;
-		}
-
-		const std::unordered_map<std::string, unsigned>& get_functions()
-		{
-			static auto function = lowercase_map(function_map);
-			return function;
-		}
-
-		int find_function_index(const std::string& name, const bool prefer_global)
+		int find_function_index(const std::string& name, [[maybe_unused]] const bool prefer_global)
 		{
 			const auto target = utils::string::to_lower(name);
+			auto const& first = (*game::plutonium::gsc_ctx)->func_map();
+			auto const& second = (*game::plutonium::gsc_ctx)->meth_map();
 
-			const auto& primary_map = prefer_global
-				                          ? get_functions()
-				                          : get_methods();
-			const auto& secondary_map = !prefer_global
-				                            ? get_functions()
-				                            : get_methods();
-
-			auto function_entry = primary_map.find(target);
-			if (function_entry != primary_map.end())
+			if (const auto itr = first.find(name); itr != first.end())
 			{
-				return function_entry->second;
+				return static_cast<int>(itr->second);
 			}
 
-			function_entry = secondary_map.find(target);
-			if (function_entry != secondary_map.end())
+			if (const auto itr = second.find(name); itr != second.end())
 			{
-				return function_entry->second;
+				return static_cast<int>(itr->second);
 			}
 
 			return -1;
@@ -59,8 +28,8 @@ namespace scripting
 
 		script_function get_function_by_index(const unsigned index)
 		{
-			static const auto function_table = 0x20689DD8;
-			static const auto method_table = 0x2068A5A8;
+			static const auto function_table = game::plutonium::function_table.get();
+			static const auto method_table = game::plutonium::method_table.get();
 
 			if (index < 0x1C7)
 			{
@@ -73,33 +42,26 @@ namespace scripting
 
 	std::string find_token(unsigned int id)
 	{
-		for (const auto& token : token_map)
-		{
-			if (token.second == id)
-			{
-				return token.first;
-			}
-		}
+		return (*game::plutonium::gsc_ctx)->token_name(id);
+	}
 
-		return {};
+	std::string find_file(unsigned int id)
+	{
+		return find_token(id);
 	}
 
 	int find_token_id(const std::string& name)
 	{
-		const auto result = token_map.find(name);
-
-		if (result != token_map.end())
-		{
-			return result->second;
-		}
-
-		return -1;
+		return (*game::plutonium::gsc_ctx)->token_id(name);
 	}
 
 	script_function find_function(const std::string& name, const bool prefer_global)
 	{
 		const auto index = find_function_index(name, prefer_global);
-		if (index < 0) return nullptr;
+		if (index < 0)
+		{
+			return nullptr;
+		}
 
 		return get_function_by_index(index);
 	}

src/game/scripting/functions.hpp

@@ -3,14 +3,10 @@
 
 namespace scripting
 {
-	extern std::unordered_map<std::string, unsigned> method_map;
-	extern std::unordered_map<std::string, unsigned> function_map;
-	extern std::unordered_map<std::string, unsigned> token_map;
-	extern std::unordered_map<unsigned, std::string> file_list;
-
 	using script_function = void(*)(game::scr_entref_t);
 
 	script_function find_function(const std::string& name, const bool prefer_global);
 	int find_token_id(const std::string& name);
 	std::string find_token(unsigned int id);
+	std::string find_file(unsigned int id);
 }

src/game/scripting/safe_execution.cpp

@@ -25,7 +25,7 @@ namespace scripting::safe_execution
 	bool call(const script_function function, const game::scr_entref_t& entref)
 	{
 		*game::g_script_error_level += 1;
-		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
+		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
 		{
 			*game::g_script_error_level -= 1;
 			return false;
@@ -39,7 +39,7 @@ namespace scripting::safe_execution
 	bool set_entity_field(const game::scr_entref_t& entref, const int offset)
 	{
 		*game::g_script_error_level += 1;
-		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
+		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
 		{
 			*game::g_script_error_level -= 1;
 			return false;
@@ -54,7 +54,7 @@ namespace scripting::safe_execution
 	bool get_entity_field(const game::scr_entref_t& entref, const int offset, game::VariableValue* value)
 	{
 		*game::g_script_error_level += 1;
-		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level]))
+		if (game::_setjmp(&game::g_script_error[*game::g_script_error_level], 0, 0, 0))
 		{
 			value->type = game::SCRIPT_NONE;
 			value->u.intValue = 0;

src/game/scripting/script_value.cpp

@@ -15,6 +15,11 @@ namespace scripting
 	{
 	}
 
+	script_value::script_value(const value_wrap& value)
+		: value_(value.get_raw())
+	{
+	}
+
 	script_value::script_value(void* value)
 	{
 		game::VariableValue variable{};
@@ -315,4 +320,10 @@ namespace scripting
 	{
 		return this->value_.get();
 	}
+
+	value_wrap::value_wrap(const scripting::script_value& value, int argument_index)
+		: value_(value)
+		, argument_index_(argument_index)
+	{
+	}
 }

src/game/scripting/script_value.hpp

@@ -8,12 +8,100 @@ namespace scripting
 	class entity;
 	class array;
 	class function;
+	class value_wrap;
+
+	namespace
+	{
+		std::unordered_map<int, std::string> typenames =
+		{
+			{0, "undefined"},
+			{1, "object"},
+			{2, "string"},
+			{3, "localized string"},
+			{4, "vector"},
+			{5, "float"},
+			{6, "integer"},
+			{7, "codepos"},
+			{8, "precodepos"},
+			{9, "function"},
+			{10, "builtin function"},
+			{11, "builtin method"},
+			{12, "stack"},
+			{13, "animation"},
+			{14, "pre animation"},
+			{15, "thread"},
+			{16, "thread"},
+			{17, "thread"},
+			{18, "thread"},
+			{19, "struct"},
+			{20, "removed entity"},
+			{21, "entity"},
+			{22, "array"},
+			{23, "removed thread"},
+			{24, "count"},
+			{25, "<free>"},
+			{26, "thread list"},
+			{27, "endon list"},
+		};
+
+		std::string get_typename(const game::VariableValue& value)
+		{
+			if (value.type == game::SCRIPT_OBJECT)
+			{
+				const auto type = game::scr_VarGlob->objectVariableValue[value.u.uintValue].w.type;
+				return typenames[type];
+			}
+			else
+			{
+				return typenames[value.type];
+			}
+		}
+
+		template <typename T, typename A = array>
+		std::string get_c_typename()
+		{
+			auto& info = typeid(T);
+
+			if (info == typeid(std::string))
+			{
+				return "string";
+			}
+
+			if (info == typeid(const char*))
+			{
+				return "string";
+			}
+
+			if (info == typeid(entity))
+			{
+				return "entity";
+			}
+
+			if (info == typeid(array))
+			{
+				return "array";
+			}
+
+			if (info == typeid(function))
+			{
+				return "function";
+			}
+
+			if (info == typeid(vector))
+			{
+				return "vector";
+			}
+
+			return info.name();
+		}
+	}
 
 	class script_value
 	{
 	public:
 		script_value() = default;
 		script_value(const game::VariableValue& value);
+		script_value(const value_wrap& value);
 
 		script_value(void* value);
 
@@ -43,7 +131,9 @@ namespace scripting
 		{
 			if (!this->is<T>())
 			{
-				throw std::runtime_error("Invalid type");
+				const auto type = get_typename(this->get_raw());
+				const auto c_type = get_c_typename<T>();
+				throw std::runtime_error(std::string("has type '" + type + "' but should be '" + c_type + "'"));
 			}
 
 			return get<T>();
@@ -52,16 +142,12 @@ namespace scripting
 		template <typename T, typename I = int>
 		T* as_ptr()
 		{
-			if (!this->is<I>())
-			{
-				throw std::runtime_error("Invalid type");
-			}
 
-			const auto value = this->get<I>();
+			const auto value = this->as<I>();
 
 			if (!value)
 			{
-				throw std::runtime_error("Null pointer");
+				throw std::runtime_error("is null");
 			}
 
 			return reinterpret_cast<T*>(value);
@@ -74,4 +160,50 @@ namespace scripting
 		template <typename T>
 		T get() const;
 	};
+
+	class value_wrap
+	{
+	public:
+		value_wrap(const scripting::script_value& value, int argument_index);
+
+		template <typename T>
+		T as() const
+		{
+			try
+			{
+				return this->value_.as<T>();
+			}
+			catch (const std::exception& e)
+			{
+				throw std::runtime_error(utils::string::va("parameter %d %s", this->argument_index_, e.what()));
+			}
+		}
+
+		template <typename T, typename I = int>
+		T* as_ptr()
+		{
+			try
+			{
+				return this->value_.as_ptr<T>();
+			}
+			catch (const std::exception& e)
+			{
+				throw std::runtime_error(utils::string::va("parameter %d %s", this->argument_index_, e.what()));
+			}
+		}
+
+		template <typename T>
+		T is() const
+		{
+			return this->value_.is<T>();
+		}
+
+		const game::VariableValue& get_raw() const
+		{
+			return this->value_.get_raw();
+		}
+
+		int argument_index_{};
+		scripting::script_value value_;
+	};
 }

src/game/structs.hpp

@@ -26,20 +26,35 @@ namespace game
 		const char** argv[8];
 	};
 
+	enum netsrc_t
+	{
+		NS_CLIENT1 = 0x0,
+		NS_CLIENT2 = 0x1,
+		NS_CLIENT3 = 0x2,
+		NS_CLIENT4 = 0x3,
+		NS_MAXCLIENTS = 0x4,
+		NS_SERVER = 0x4,
+		NS_PACKET = 0x5,
+		NS_INVALID_NETSRC = 0x6
+	};
+
 	struct msg_t
 	{
 		int overflowed;
 		int readOnly;
-		char* data;
-		char* splitData;
+		unsigned char* data;
+		unsigned char* splitData;
 		int maxsize;
 		int cursize;
 		int splitSize;
 		int readcount;
 		int bit;
 		int lastEntityRef;
+		netsrc_t targetLocalNetID;
 	};
 
+	static_assert(sizeof(msg_t) == 0x2C);
+
 	struct XZoneInfo
 	{
 		const char* name;
@@ -305,21 +320,110 @@ namespace game
 
 	struct playerState_s
 	{
-		char __pad0[1260];
-		unsigned int perks[2];
-		unsigned int perkSlots[9];
-		char __pad1[11752];
+		char __pad0[0x4EC];
+		unsigned int perks[0x2];
+		unsigned int perkSlots[0x9];
+		char __pad1[0x2DE8];
 	};
 
 	struct gclient_s
 	{
 		playerState_s ps;
+		char __pad0[0x2CC];
+		int flags;
 	};
 
 	struct gentity_s
 	{
 		int entnum;
-		char __pad0[340];
+		char __pad0[0x154];
 		gclient_s* client;
+		char __pad1[0x28];
+		int flags;
+		char __pad2[0xEC];
 	};
+
+	enum netadrtype_t
+	{
+		NA_BOT = 0x0,
+		NA_BAD = 0x1,
+		NA_LOOPBACK = 0x2,
+		NA_BROADCAST = 0x3,
+		NA_IP = 0x4
+	};
+
+	struct netadr_s
+	{
+		netadrtype_t type;
+		unsigned char ip[4];
+		unsigned __int16 port;
+		unsigned char ipx[10];
+		unsigned int addrHandleIndex;
+	};
+
+	static_assert(sizeof(netadr_s) == 24);
+
+	struct netchan_t
+	{
+		int outgoingSequence;
+		netsrc_t sock;
+		int dropped;
+		int incomingSequence;
+		netadr_s remoteAddress;
+		int qport;
+		int fragmentSequence;
+		int fragmentLength;
+		unsigned char* fragmentBuffer;
+		int fragmentBufferSize;
+		int unsentFragments;
+		int unsentFragmentStart;
+		int unsentLength;
+		unsigned char* unsentBuffer;
+		int unsentBufferSize;
+		unsigned char __pad0[0x5E0];
+	};
+
+	static_assert(sizeof(netchan_t) == 0x630);
+
+	enum clientState_t
+	{
+		CS_FREE = 0,
+		CS_ZOMBIE = 1,
+		CS_RECONNECTING = 2,
+		CS_CONNECTED = 3,
+		CS_CLIENTLOADING = 4,
+		CS_ACTIVE = 5
+	};
+
+	struct clientHeader_t
+	{
+		clientState_t state; // 0
+		int sendAsActive; // 4
+		int deltaMessage; // 8
+		int rateDealyed; // 12
+		int hasAckedBaselineData; // 16
+		int hugeSnapshotSent; // 20
+		netchan_t netchan; // 24
+		vec3_t predictedOrigin;
+		int predictedOriginServerTime;
+		int migrationState;
+		vec3_t predictedVehicleOrigin;
+		int predictedVehicleServerTime;
+	};
+
+	static_assert(sizeof(clientHeader_t) == 0x66C);
+
+	struct client_s
+	{
+		clientHeader_t header;
+		const char* dropReason;
+		char userinfo[1024];
+		char __pad0[0x41242];
+		unsigned __int16 scriptId; // 269490
+		int bIsTestClient; // 269492
+		int serverId; // 269496
+		char __pad1[0x369DC];
+	};
+
+	static_assert(sizeof(client_s) == 0x78698);
 }

src/game/symbols.hpp

@@ -49,18 +49,21 @@ namespace game
 	WEAK symbol<unsigned int(unsigned int threadId)> Scr_GetSelf{0x5655E0};
 	WEAK symbol<void()> Scr_MakeArray{0x56ADE0};
 	WEAK symbol<void(unsigned int stringValue)> Scr_AddArrayStringIndexed{0x56AE70};
+	WEAK symbol<void(unsigned int classnum, unsigned int name, unsigned int canonicalString, unsigned int offset)> Scr_AddClassField{0x567CD0};
 
 	WEAK symbol<unsigned int(const char* str, unsigned int user)> SL_GetString{0x5649E0};
+	WEAK symbol<unsigned int(const char* str)> SL_GetCanonicalString{0x5619A0};
 	WEAK symbol<const char*(unsigned int stringValue)> SL_ConvertToString{0x564270};
 
 	WEAK symbol<void(int clientNum, int type, const char* command)> SV_GameSendServerCommand{0x573220};
 	WEAK symbol<void(int arg, char* buffer, int bufferLength)> SV_Cmd_ArgvBuffer{0x5459F0};
+	WEAK symbol<void(client_s* drop, const char* reason, bool tellThem)> SV_DropClient{0x570980};
 
 	WEAK symbol<void(unsigned int notifyListOwnerId, unsigned int stringValue, VariableValue* top)> VM_Notify{0x569720};
 	WEAK symbol<unsigned int(unsigned int localId, const char* pos, unsigned int paramcount)> VM_Execute{0x56DFE0};
 
 	WEAK symbol<void* (jmp_buf* Buf, int Value)> longjmp{0x7363BC};
-	WEAK symbol<int(jmp_buf* Buf)> _setjmp{0x734CF8};
+	WEAK symbol<int(jmp_buf* Buf, int a2, int a3, int a4)> _setjmp{0x734CF8};
 
 	// Variables
 
@@ -77,9 +80,15 @@ namespace game
 	WEAK symbol<gentity_s> g_entities{0x1A66E28};
 	WEAK symbol<unsigned int> levelEntityId{0x208E1A4};
 
+	WEAK symbol<dvar_t> sv_maxclients{0x1BA0E4C};
+	WEAK symbol<int> svs_clientCount{0x4B5CF8C};
+	WEAK symbol<client_s> svs_clients{0x4B5CF90};
+
 	namespace plutonium
 	{
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x20691228};
-		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x20691248};
+		WEAK symbol<std::unique_ptr<xsk::gsc::iw5_pc::context>> gsc_ctx{0};
+		WEAK symbol<int(const char* fmt, ...)> printf{0};
+		WEAK symbol<void*> function_table{0};
+		WEAK symbol<void*> method_table{0};
 	}
-}
+}

src/stdinc.hpp

@@ -8,6 +8,8 @@
 #pragma warning(disable: 4996)
 #pragma warning(disable: 26812)
 
+#include <xsk/gsc/engine/iw5_pc.hpp>
+
 #define DLL_EXPORT extern "C" __declspec(dllexport)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -28,6 +30,7 @@
 #include <map>
 #include <csetjmp>
 #include <atlcomcli.h>
+#include <Psapi.h>
 
 #pragma comment(lib, "urlmon.lib")
 
@@ -36,6 +39,7 @@ using namespace std::literals;
 #include <gsl/gsl>
 #include <MinHook.h>
 
+
 #include "utils/memory.hpp"
 #include "utils/string.hpp"
 #include "utils/hook.hpp"
@@ -45,4 +49,4 @@ using namespace std::literals;
 #include "utils/http.hpp"
 
 #include "game/structs.hpp"
-#include "game/game.hpp"
+#include "game/game.hpp"

src/utils/hook.cpp

@@ -4,6 +4,48 @@
 
 namespace utils::hook
 {
+	// open-iw5
+
+	void signature::process()
+	{
+		if (this->signatures_.empty()) return;
+
+		const auto start = static_cast<char*>(this->start_);
+
+		const unsigned int sig_count = this->signatures_.size();
+		const auto containers = this->signatures_.data();
+
+		for (size_t i = 0; i < this->length_; ++i)
+		{
+			const auto address = start + i;
+
+			for (unsigned int k = 0; k < sig_count; ++k)
+			{
+				const auto container = &containers[k];
+
+				unsigned int j;
+				for (j = 0; j < static_cast<unsigned int>(container->mask.size()); ++j)
+				{
+					if (container->mask[j] != '?' && container->signature[j] != address[j])
+					{
+						break;
+					}
+				}
+
+				if (j == container->mask.size())
+				{
+					container->callback(address);
+				}
+			}
+		}
+	}
+
+	void signature::add(const container& container)
+	{
+		signatures_.push_back(container);
+	}
+
+
 	namespace
 	{
 		[[maybe_unused]] class _

src/utils/hook.hpp

@@ -4,6 +4,37 @@
 
 namespace utils::hook
 {
+	class signature final
+	{
+	public:
+		struct container final
+		{
+			std::string signature;
+			std::string mask;
+			std::function<void(char*)> callback;
+		};
+
+		signature(void* start, const size_t length) : start_(start), length_(length)
+		{
+		}
+
+		signature(const DWORD start, const size_t length) : signature(reinterpret_cast<void*>(start), length)
+		{
+		}
+
+		signature() : signature(0x400000, 0x800000)
+		{
+		}
+
+		void process();
+		void add(const container& container);
+
+	private:
+		void* start_;
+		size_t length_;
+		std::vector<container> signatures_;
+	};
+
 	class detour
 	{
 	public:

src/utils/io.cpp

@@ -1,8 +1,14 @@
 #include <stdinc.hpp>
 #include <fstream>
+#include "io.hpp"
 
 namespace utils::io
 {
+	bool remove_file(const std::string& file)
+	{
+		return DeleteFileA(file.data()) == TRUE;
+	}
+
 	bool file_exists(const std::string& file)
 	{
 		return std::ifstream(file).good();

src/utils/io.hpp

@@ -6,6 +6,7 @@
 
 namespace utils::io
 {
+	bool remove_file(const std::string& file);
 	bool file_exists(const std::string& file);
 	bool write_file(const std::string& file, const std::string& data, bool append = false);
 	bool read_file(const std::string& file, std::string* data);