.github/dependabot.yml

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

.github/workflows/build.yml

@@ -1,45 +0,0 @@
-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,13 +4,12 @@
 [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/GSL

@@ -1 +1 @@
-Subproject commit b39e7e4b0987859f5b19ff7686b149c916588658
+Subproject commit c31a9ad5e8e99da8567237a7ba51a7d8f419e5bf

deps/gsc-tool

@@ -1 +0,0 @@
-Subproject commit 0e6238a6ab8643df6404f7c0280242df2812f6c8

deps/json

@@ -1 +1 @@
-Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7
+Subproject commit e10a3fac8a255433146e3f06a703dc110fc3c3da

deps/minhook

@@ -1 +1 @@
-Subproject commit f5485b8454544c2f034c78f8f127c1d03dea3636
+Subproject commit 423d1e45af2ed2719a5c31e990e935ef301ed9c3

deps/premake/gsc-tool.lua

@@ -1,62 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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)

deps/zlib

@@ -1 +0,0 @@
-Subproject commit 5c42a230b7b468dff011f444161c0145b5efae59

generate.bat

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

premake5.lua

@@ -36,35 +36,32 @@ 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"
 	
-	filter "configurations:Release"
+	configuration "Release"
 		optimize "Full"
 		defines { "NDEBUG" }
-	filter {}
+	configuration{}
 
-	filter "configurations:Debug"
+	configuration "Debug"
 		optimize "Debug"
 		defines { "DEBUG", "_DEBUG" }
-	filter {}
+	configuration {}
 
 	startproject "iw5-gsc-utils"
 

src/component/gsc.cpp

@@ -21,13 +21,13 @@ namespace gsc
 	{
 		std::string method_name(unsigned int id)
 		{
-			const auto& map = (*game::plutonium::gsc_ctx)->meth_map();
+			const auto map = *game::plutonium::method_map_rev;
 
 			for (const auto& function : map)
 			{
 				if (function.second == id)
 				{
-					return function.first.data();
+					return function.first;
 				}
 			}
 
@@ -36,13 +36,13 @@ namespace gsc
 
 		std::string function_name(unsigned int id)
 		{
-			const auto& map = (*game::plutonium::gsc_ctx)->func_map();
+			const auto map = *game::plutonium::function_map_rev;
 
 			for (const auto& function : map)
 			{
 				if (function.second == id)
 				{
-					return function.first.data();
+					return function.first;
 				}
 			}
 
@@ -53,6 +53,8 @@ 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];
@@ -192,7 +194,7 @@ namespace gsc
 				return scr_get_object_field_hook.invoke<void>(classnum, entnum, offset);
 			}
 
-			const auto& field = custom_fields[classnum][offset];
+			const auto field = custom_fields[classnum][offset];
 
 			try
 			{
@@ -217,7 +219,7 @@ namespace gsc
 			}
 
 			const auto args = get_arguments();
-			const auto& field = custom_fields[classnum][offset];
+			const auto field = custom_fields[classnum][offset];
 
 			try
 			{
@@ -248,21 +250,10 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_function& func)
 		{
-			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);
-			}
+			const auto index = function_map_start++;
 
-			functions.insert(std::make_pair(index, func));
+			functions[index] = func;
+			(*game::plutonium::function_map_rev)[name] = index;
 		}
 	}
 
@@ -270,21 +261,10 @@ namespace gsc
 	{
 		void add(const std::string& name, const script_method& func)
 		{
-			auto index = 0u;
-			auto& ctx = (*game::plutonium::gsc_ctx);
+			const auto index = method_map_start++;
 
-			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));
+			methods[index] = func;
+			(*game::plutonium::method_map_rev)[name] = index;
 		}
 	}
 
@@ -294,13 +274,16 @@ namespace gsc
 			const std::function<scripting::script_value(unsigned int entnum)>& getter,
 			const std::function<void(unsigned int entnum, const scripting::script_value&)>& setter)
 		{
+			const auto token_id = token_map_start++;
 			const auto offset = field_offset_start++;
-			custom_fields[classnum][offset] = {name, getter, setter};
 
-			post_load_callbacks.push_back([=]()
+			custom_fields[classnum][offset] = {name, getter, setter};
+			(*game::plutonium::token_map_rev)[name] = token_id;
+
+			post_load_callbacks.push_back([classnum, name, token_id, offset]()
 			{
 				const auto name_str = game::SL_GetString(name.data(), 0);
-				game::Scr_AddClassField(classnum, name_str, game::SL_GetCanonicalString(name.data()), offset);
+				game::Scr_AddClassField(classnum, name_str, token_id, offset);
 			});
 		}
 	}
@@ -339,7 +322,7 @@ namespace gsc
 			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",
+			field::add(classid::entity, "flags",
 				[](unsigned int entnum) -> scripting::script_value
 				{
 					const auto entity = &game::g_entities[entnum];
@@ -397,7 +380,7 @@ namespace gsc
 				return {};
 			});
 
-			function::add("dropallbots", [](const function_args&) -> scripting::script_value
+			function::add("dropallbots", [](const function_args& args) -> scripting::script_value
 			{
 				for (auto i = 0; i < *game::svs_clientCount; i++)
 				{
@@ -454,7 +437,7 @@ namespace gsc
 				return {};
 			});
 
-			method::add("isbot", [](const game::scr_entref_t ent, const function_args&) -> scripting::script_value
+			method::add("isbot", [](const game::scr_entref_t ent, const function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
 				{
@@ -471,29 +454,8 @@ namespace gsc
 				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);
-			});
+			utils::hook::jump(0x56C8EB, call_builtin_stub);
+			utils::hook::jump(0x56CBDC, call_builtin_method_stub);
 		}
 	};
 }

src/component/io.cpp

@@ -179,4 +179,4 @@ namespace io
 	};
 }
 
-REGISTER_COMPONENT(io::component)
+REGISTER_COMPONENT(io::component)

src/component/json.cpp

@@ -194,4 +194,4 @@ namespace json
 	};
 }
 
-REGISTER_COMPONENT(json::component)
+REGISTER_COMPONENT(json::component)

src/component/notifies.cpp

@@ -71,4 +71,4 @@ namespace notifies
 	};
 }
 
-REGISTER_COMPONENT(notifies::component)
+REGISTER_COMPONENT(notifies::component)

src/component/scripting.cpp

@@ -95,7 +95,7 @@ namespace scripting
 			const auto file_id = atoi(filename);
 			if (file_id)
 			{
-				current_file = scripting::find_file(file_id);
+				current_file = scripting::file_list[file_id];
 			}
 
 			process_script_hook.invoke<void>(filename);
@@ -136,4 +136,4 @@ namespace scripting
 	};
 }
 
-REGISTER_COMPONENT(scripting::component)
+REGISTER_COMPONENT(scripting::component)

src/component/signatures.cpp

@@ -1,106 +0,0 @@
-#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

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

src/component/string.cpp

@@ -1,46 +0,0 @@
-#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

@@ -110,7 +110,7 @@ namespace userinfo
 				return {};
 			});
 
-			gsc::method::add("resetname", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
+			gsc::method::add("resetname", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
 				{
@@ -150,7 +150,7 @@ namespace userinfo
 				return {};
 			});
 
-			gsc::method::add("resetclantag", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
+			gsc::method::add("resetclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
 				{
@@ -170,7 +170,7 @@ namespace userinfo
 				return {};
 			});
 
-			gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args&) -> scripting::script_value
+			gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
 			{
 				if (ent.classnum != 0)
 				{
@@ -193,4 +193,4 @@ namespace userinfo
 	};
 }
 
-REGISTER_COMPONENT(userinfo::component)
+REGISTER_COMPONENT(userinfo::component)

src/dllmain.cpp

@@ -1,27 +1,22 @@
 #include <stdinc.hpp>
 #include "loader/component_loader.hpp"
 
-#include "component/signatures.hpp"
-
-BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     if (ul_reason_for_call == DLL_PROCESS_ATTACH)
     {
-        if (!signatures::process())
+        const auto value = *reinterpret_cast<DWORD*>(0x21600000);
+        if (value != 0x8A94852)
         {
             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",
+                "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);
-        }
-
+        utils::hook::jump(reinterpret_cast<uintptr_t>(&printf), game::plutonium::printf);
         component_loader::post_unpack();
     }
 

src/game/game.hpp

@@ -16,11 +16,6 @@ namespace game
 			return dedi_;
 		}
 
-		void set(const size_t dedi)
-		{
-			this->dedi_ = reinterpret_cast<T*>(dedi);
-		}
-
 		operator T* () const
 		{
 			return this->get();

src/game/scripting/array.cpp

@@ -263,9 +263,11 @@ namespace scripting
 		}
 	}
 
-	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 value = _value.get_raw();
+
+		const auto string_value = game::SL_GetString(key.data(), 0);
 		const auto variable_id = this->get_value_id(key);
 
 		if (!variable_id)
@@ -282,9 +284,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/execution.cpp

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

src/game/scripting/functions.cpp

@@ -7,20 +7,51 @@ namespace scripting
 {
 	namespace
 	{
-		int find_function_index(const std::string& name, [[maybe_unused]] const bool prefer_global)
+		std::unordered_map<std::string, unsigned> lowercase_map(
+			const std::unordered_map<std::string, unsigned>& old_map)
 		{
-			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();
-
-			if (const auto itr = first.find(name); itr != first.end())
+			std::unordered_map<std::string, unsigned> new_map{};
+			for (auto& entry : old_map)
 			{
-				return static_cast<int>(itr->second);
+				new_map[utils::string::to_lower(entry.first)] = entry.second;
 			}
 
-			if (const auto itr = second.find(name); itr != second.end())
+			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)
+		{
+			const auto target = utils::string::to_lower(name);
+
+			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())
 			{
-				return static_cast<int>(itr->second);
+				return function_entry->second;
+			}
+
+			function_entry = secondary_map.find(target);
+			if (function_entry != secondary_map.end())
+			{
+				return function_entry->second;
 			}
 
 			return -1;
@@ -42,26 +73,33 @@ namespace scripting
 
 	std::string find_token(unsigned int id)
 	{
-		return (*game::plutonium::gsc_ctx)->token_name(id);
-	}
+		for (const auto& token : token_map)
+		{
+			if (token.second == id)
+			{
+				return token.first;
+			}
+		}
 
-	std::string find_file(unsigned int id)
-	{
-		return find_token(id);
+		return {};
 	}
 
 	int find_token_id(const std::string& name)
 	{
-		return (*game::plutonium::gsc_ctx)->token_id(name);
+		const auto result = token_map.find(name);
+
+		if (result != token_map.end())
+		{
+			return result->second;
+		}
+
+		return -1;
 	}
 
 	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,10 +3,14 @@
 
 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/symbols.hpp

@@ -86,9 +86,11 @@ namespace game
 
 	namespace plutonium
 	{
-		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};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> function_map_rev{0x2074C520};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> method_map_rev{0x2074C540};
+		WEAK symbol<std::unordered_map<std::string, std::uint16_t>> token_map_rev{0x2074C580};
+		WEAK symbol<int(const char* fmt, ...)> printf{0x2093E120};
+		WEAK symbol<void*> function_table{0x206FAA70};
+		WEAK symbol<void*> method_table{0x206FB240};
 	}
-}
+}

src/stdinc.hpp

@@ -8,8 +8,6 @@
 #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>
@@ -30,7 +28,6 @@
 #include <map>
 #include <csetjmp>
 #include <atlcomcli.h>
-#include <Psapi.h>
 
 #pragma comment(lib, "urlmon.lib")
 
@@ -39,7 +36,6 @@ using namespace std::literals;
 #include <gsl/gsl>
 #include <MinHook.h>
 
-
 #include "utils/memory.hpp"
 #include "utils/string.hpp"
 #include "utils/hook.hpp"
@@ -49,4 +45,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,48 +4,6 @@
 
 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,37 +4,6 @@
 
 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,14 +1,8 @@
 #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,7 +6,6 @@
 
 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);