17 Commits

Author SHA1 Message Date
288fa38dac Fix exceptions 2021-06-20 00:47:44 +02:00
dbc0a928b9 Add jsonPrint function 2021-06-20 00:36:07 +02:00
9ead1676b0 Add functions to change player clantags/name 2021-06-20 00:31:56 +02:00
97371d8f44 Use function class 2021-06-19 22:17:41 +02:00
fed
7ac6443b2c Update README.md 2021-06-19 03:41:47 +02:00
50eb58dfd9 Refactoring + update some stuff 2021-06-19 03:40:28 +02:00
833271b7a1 Add some array methods 2021-06-19 00:30:51 +02:00
517cad33f4 Use FindVariable 2021-06-19 00:17:21 +02:00
fed
d96e28cdcb Update README.md 2021-06-18 23:42:14 +02:00
3d59fd7aa7 More fixes 2021-06-18 23:29:48 +02:00
8e0c68ddf9 Add more IO functions 2021-06-18 23:18:14 +02:00
2a0789692f Catch insufficient arguments 2021-06-18 23:18:04 +02:00
376e7f11ec Small fix 2021-06-18 23:01:15 +02:00
c8063eb0b0 Use array class 2021-06-18 22:42:12 +02:00
7170f863f3 Cleanup 2021-06-18 22:26:30 +02:00
ec9a2ad7fa Also notify say_team 2021-06-18 22:26:18 +02:00
e84cfe54a6 Correct json array indexes 2021-06-18 22:23:37 +02:00
24 changed files with 870 additions and 181 deletions

View File

@ -10,7 +10,7 @@ This plugin adds some useful functions/methods to IW5's GSC VM
```c ```c
init() init()
{ {
replaceFunc(maps\mp\gametypes\_damage::Callback_PlayerDamage, ::callbackPlayerDamage); replaceFunc(maps\mp\gametypes\_damage::Callback_PlayerDamage, ::callbackPlayerDamage);
} }
callbackPlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset) callbackPlayerDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset)
@ -44,6 +44,9 @@ This plugin adds some useful functions/methods to IW5's GSC VM
} }
``` ```
# IO # IO
The basepath for all IO functions is `Plutonium/storage/iw5`
* `fopen(path, mode)`: Opens a file of given name with given mode, returns a file stream. * `fopen(path, mode)`: Opens a file of given name with given mode, returns a file stream.
* `fwrite(stream, text)`: Writes a string to a stream. * `fwrite(stream, text)`: Writes a string to a stream.
* `fread(stream)`: Reads entire file. * `fread(stream)`: Reads entire file.
@ -64,6 +67,15 @@ This plugin adds some useful functions/methods to IW5's GSC VM
fclose(file); fclose(file);
} }
``` ```
* `fileExists(path)`: Returns true if the file exists.
* `writeFile(path, data[, append])`: Creates a file if it doesn't exist and writes/appends text to it.
* `readFile(path)`: Reads a file.
* `fileSize(path)`: Returns file size in bytes.
* `createDirectory(path)`: Creates a directory.
* `directoryExists(path)`: Returns true if the directory exists.
* `directoryIsEmpty(path)`: Returns true if the directory is empty.
* `listFiles(path)`: Returns the list of files in the directory as an array.
* `copyFolder(source, target)`: Copies a folder.
# JSON # JSON

View File

@ -7,11 +7,41 @@
#include "game/scripting/event.hpp" #include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp" #include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp" #include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "game/scripting/function.hpp"
#include "gsc.hpp" #include "gsc.hpp"
namespace gsc namespace gsc
{ {
std::unordered_map<const char*, const char*> replaced_functions;
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_function> functions;
std::unordered_map<unsigned, script_method> methods; std::unordered_map<unsigned, script_method> methods;
@ -49,7 +79,7 @@ namespace gsc
function_args get_arguments() function_args get_arguments()
{ {
function_args args; std::vector<scripting::script_value> args;
const auto top = game::scr_VmPub->top; const auto top = game::scr_VmPub->top;
@ -92,7 +122,7 @@ namespace gsc
return_value(result); return_value(result);
} }
} }
catch (std::exception e) catch (const std::exception& e)
{ {
printf("************** Script execution error **************\n"); printf("************** Script execution error **************\n");
printf("Error executing function %s\n", function_name(id).data()); printf("Error executing function %s\n", function_name(id).data());
@ -118,7 +148,7 @@ namespace gsc
return_value(result); return_value(result);
} }
} }
catch (std::exception e) catch (const std::exception& e)
{ {
printf("************** Script execution error **************\n"); printf("************** Script execution error **************\n");
printf("Error executing method %s\n", method_name(id).data()); printf("Error executing method %s\n", method_name(id).data());
@ -172,13 +202,13 @@ namespace gsc
} }
} }
unsigned int replaced_pos = 0; const char* replaced_pos = 0;
void get_replaced_pos(unsigned int pos) void get_replaced_pos(const char* pos)
{ {
if (scripting::replaced_functions.find(pos) != scripting::replaced_functions.end()) if (replaced_functions.find(pos) != replaced_functions.end())
{ {
replaced_pos = scripting::replaced_functions[pos]; replaced_pos = replaced_functions[pos];
} }
} }
@ -251,60 +281,28 @@ namespace gsc
} }
} }
unsigned int make_array()
{
unsigned int index = 0;
const auto variable = game::AllocVariable(&index);
variable->w.type = game::SCRIPT_ARRAY;
variable->u.f.prev = 0;
variable->u.f.next = 0;
return index;
}
void add_array_key_value(unsigned int parent_id, const std::string& _key, const scripting::script_value& value)
{
const auto key = game::SL_GetString(_key.data(), 0);
scripting::push_value(scripting::entity(parent_id));
scripting::push_value(value);
game::Scr_AddArrayStringIndexed(key);
}
void add_array_value(unsigned int parent_id, const scripting::script_value& value)
{
scripting::push_value(scripting::entity(parent_id));
scripting::push_value(value);
game::Scr_AddArray();
}
class component final : public component_interface class component final : public component_interface
{ {
public: public:
void post_unpack() override void post_unpack() override
{ {
function::add("executecommand", [](function_args args) -> scripting::script_value function::add("executecommand", [](const function_args& args) -> scripting::script_value
{ {
game::Cbuf_AddText(0, args[0].as<const char*>()); game::Cbuf_AddText(0, args[0].as<const char*>());
return {}; return {};
}); });
function::add("replacefunc", [](function_args args) -> scripting::script_value function::add("replacefunc", [](const function_args& args) -> scripting::script_value
{ {
const auto what = args[0].get_raw(); const auto what = args[0].as<scripting::function>();
const auto with = args[1].get_raw(); const auto with = args[1].as<scripting::function>();
if (what.type != game::SCRIPT_FUNCTION || with.type != game::SCRIPT_FUNCTION) replaced_functions[what.get_pos()] = with.get_pos();
{
throw std::runtime_error("Invalid type");
}
scripting::replaced_functions[what.u.uintValue] = with.u.uintValue;
return {}; return {};
}); });
function::add("addcommand", [](function_args args) -> scripting::script_value function::add("addcommand", [](const function_args& args) -> scripting::script_value
{ {
const auto name = args[0].as<std::string>(); const auto name = args[0].as<std::string>();
const auto function = args[1].get_raw(); const auto function = args[1].get_raw();
@ -317,20 +315,19 @@ namespace gsc
const auto pos = function.u.codePosValue; const auto pos = function.u.codePosValue;
command::add_script_command(name, [pos](const command::params& params) command::add_script_command(name, [pos](const command::params& params)
{ {
const auto array = make_array(); scripting::array array;
for (auto i = 0; i < params.size(); i++) for (auto i = 0; i < params.size(); i++)
{ {
add_array_value(array, params[i]); array.push(params[i]);
} }
const auto entity = scripting::entity(array); scripting::exec_ent_thread(*game::levelEntityId, pos, {array.get_raw()});
scripting::exec_ent_thread(*game::levelEntityId, pos, {entity});
}); });
return {}; return {};
}); });
function::add("say", [](function_args args) -> scripting::script_value function::add("say", [](const function_args& args) -> scripting::script_value
{ {
const auto message = args[0].as<std::string>(); const auto message = args[0].as<std::string>();
game::SV_GameSendServerCommand(-1, 0, utils::string::va("%c \"%s\"", 84, message.data())); game::SV_GameSendServerCommand(-1, 0, utils::string::va("%c \"%s\"", 84, message.data()));
@ -338,11 +335,11 @@ namespace gsc
return {}; return {};
}); });
method::add("tell", [](game::scr_entref_t ent, function_args args) -> scripting::script_value method::add("tell", [](const game::scr_entref_t ent, const function_args& args) -> scripting::script_value
{ {
if (ent.classnum != 0) if (ent.classnum != 0)
{ {
throw std::runtime_error("Invalid type"); throw std::runtime_error("Invalid entity");
} }
const auto client = ent.entnum; const auto client = ent.entnum;

View File

@ -2,13 +2,30 @@
namespace gsc namespace gsc
{ {
using function_args = std::vector<scripting::script_value>; extern std::unordered_map<const char*, const char*> replaced_functions;
class function_args
{
public:
function_args(std::vector<scripting::script_value>);
unsigned int function_args::size() const;
std::vector<scripting::script_value> function_args::get_raw() const;
scripting::script_value get(const int index) const;
scripting::script_value operator[](const int index) const
{
return this->get(index);
}
private:
std::vector<scripting::script_value> values_;
};
using builtin_function = void(*)(); using builtin_function = void(*)();
using builtin_method = void(*)(game::scr_entref_t); using builtin_method = void(*)(game::scr_entref_t);
using script_function = std::function<scripting::script_value(function_args)>; using script_function = std::function<scripting::script_value(const function_args&)>;
using script_method = std::function<scripting::script_value(game::scr_entref_t, function_args)>; using script_method = std::function<scripting::script_value(const game::scr_entref_t, const function_args&)>;
namespace function namespace function
{ {
@ -19,8 +36,4 @@ namespace gsc
{ {
void add(const std::string& name, const script_method& func); void add(const std::string& name, const script_method& func);
} }
unsigned int make_array();
void add_array_key_value(unsigned int parent_id, const std::string& _key, const scripting::script_value& value);
void add_array_value(unsigned int parent_id, const scripting::script_value& value);
} }

View File

@ -6,8 +6,10 @@
#include "game/scripting/event.hpp" #include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp" #include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp" #include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "gsc.hpp" #include "gsc.hpp"
#include "json.hpp"
namespace io namespace io
{ {
@ -19,13 +21,27 @@ namespace io
const auto path = game::Dvar_FindVar("fs_basegame")->current.string; const auto path = game::Dvar_FindVar("fs_basegame")->current.string;
std::filesystem::current_path(path); std::filesystem::current_path(path);
gsc::function::add("fremove", [](gsc::function_args args) gsc::function::add("jsonprint", [](const gsc::function_args& args) -> scripting::script_value
{
std::string buffer;
for (const auto arg : args.get_raw())
{
buffer.append(json::gsc_to_string(arg));
buffer.append("\t");
}
printf("%s\n", buffer.data());
return {};
});
gsc::function::add("fremove", [](const gsc::function_args& args)
{ {
const auto path = args[0].as<const char*>(); const auto path = args[0].as<const char*>();
return std::remove(path); return std::remove(path);
}); });
gsc::function::add("fopen", [](gsc::function_args args) gsc::function::add("fopen", [](const gsc::function_args& args)
{ {
const auto* path = args[0].as<const char*>(); const auto* path = args[0].as<const char*>();
const auto* mode = args[1].as<const char*>(); const auto* mode = args[1].as<const char*>();
@ -40,13 +56,13 @@ namespace io
return handle; return handle;
}); });
gsc::function::add("fclose", [](gsc::function_args args) gsc::function::add("fclose", [](const gsc::function_args& args)
{ {
const auto handle = args[0].as_ptr<FILE>(); const auto handle = args[0].as_ptr<FILE>();
return fclose(handle); return fclose(handle);
}); });
gsc::function::add("fwrite", [](gsc::function_args args) gsc::function::add("fwrite", [](const gsc::function_args& args)
{ {
const auto handle = args[0].as_ptr<FILE>(); const auto handle = args[0].as_ptr<FILE>();
const auto text = args[1].as<const char*>(); const auto text = args[1].as<const char*>();
@ -54,7 +70,7 @@ namespace io
return fprintf(handle, text); return fprintf(handle, text);
}); });
gsc::function::add("fread", [](gsc::function_args args) gsc::function::add("fread", [](const gsc::function_args& args)
{ {
const auto handle = args[0].as_ptr<FILE>(); const auto handle = args[0].as_ptr<FILE>();
@ -72,6 +88,79 @@ namespace io
return result; return result;
}); });
gsc::function::add("fileexists", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::file_exists(path);
});
gsc::function::add("writefile", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
const auto data = args[1].as<std::string>();
auto append = false;
if (args.size() > 2)
{
append = args[2].as<bool>();
}
return utils::io::write_file(path, data, append);
});
gsc::function::add("readfile", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::read_file(path);
});
gsc::function::add("filesize", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::file_size(path);
});
gsc::function::add("createdirectory", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::create_directory(path);
});
gsc::function::add("directoryexists", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::directory_exists(path);
});
gsc::function::add("directoryisempty", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
return utils::io::directory_is_empty(path);
});
gsc::function::add("listfiles", [](const gsc::function_args& args)
{
const auto path = args[0].as<std::string>();
const auto files = utils::io::list_files(path);
scripting::array array;
for (const auto& file : files)
{
array.push(file);
}
return array.get_raw();
});
gsc::function::add("copyfolder", [](const gsc::function_args& args)
{
const auto source = args[0].as<std::string>();
const auto target = args[1].as<std::string>();
utils::io::copy_folder(source, target);
return scripting::script_value{};
});
} }
}; };
} }

View File

@ -6,8 +6,10 @@
#include "game/scripting/event.hpp" #include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp" #include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp" #include "game/scripting/functions.hpp"
#include "game/scripting/array.hpp"
#include "gsc.hpp" #include "gsc.hpp"
#include "json.hpp"
#include <json.hpp> #include <json.hpp>
@ -19,44 +21,26 @@ namespace json
nlohmann::json entity_to_array(unsigned int id) nlohmann::json entity_to_array(unsigned int id)
{ {
scripting::array array(id);
nlohmann::json obj; nlohmann::json obj;
auto string_indexed = -1; auto string_indexed = -1;
const auto keys = array.get_keys();
const auto offset = 0xC800 * (id & 1); for (auto i = 0; i < keys.size(); i++)
auto current = game::scr_VarGlob->objectVariableChildren[id].firstChild;
for (auto i = offset + current; current; i = offset + current)
{ {
const auto var = game::scr_VarGlob->childVariableValue[i];
if (var.type == game::SCRIPT_NONE)
{
current = var.nextSibling;
continue;
}
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);
if (string_indexed == -1) if (string_indexed == -1)
{ {
string_indexed = string_value < 0x40000 && str; string_indexed = keys[i].is_string;
} }
game::VariableValue variable{}; if (!string_indexed && keys[i].is_integer)
variable.type = (game::scriptType_e)var.type;
variable.u = var.u.u;
if (!string_indexed)
{ {
obj.emplace_back(gsc_to_json(variable)); obj[keys[i].index] = gsc_to_json(array[keys[i].index]);
} }
else else if (string_indexed && keys[i].is_string)
{ {
obj.emplace(str, gsc_to_json(variable)); obj.emplace(keys[i].key, gsc_to_json(array[keys[i].key]));
} }
current = var.nextSibling;
} }
return obj; return obj;
@ -127,25 +111,25 @@ namespace json
return obj.get<std::string>(); return obj.get<std::string>();
case (nlohmann::detail::value_t::array): case (nlohmann::detail::value_t::array):
{ {
const auto arr = gsc::make_array(); scripting::array array;
for (const auto& [key, value] : obj.items()) for (const auto& [key, value] : obj.items())
{ {
gsc::add_array_value(arr, json_to_gsc(value)); array.push(json_to_gsc(value));
} }
return scripting::entity(arr); return array.get_raw();
} }
case (nlohmann::detail::value_t::object): case (nlohmann::detail::value_t::object):
{ {
const auto arr = gsc::make_array(); scripting::array array;
for (const auto& [key, value] : obj.items()) for (const auto& [key, value] : obj.items())
{ {
gsc::add_array_key_value(arr, key, json_to_gsc(value)); array[key] = json_to_gsc(value);
} }
return scripting::entity(arr); return array.get_raw();
} }
} }
@ -153,26 +137,25 @@ namespace json
} }
} }
std::string gsc_to_string(const scripting::script_value& value)
{
return gsc_to_json(value).dump();
}
class component final : public component_interface class component final : public component_interface
{ {
public: public:
void post_unpack() override void post_unpack() override
{ {
gsc::function::add("array", [](gsc::function_args args) gsc::function::add("array", [](const gsc::function_args& args)
{ {
const auto array = gsc::make_array(); scripting::array array(args.get_raw());
return array.get_raw();
for (auto i = 0; i < args.size(); i++)
{
gsc::add_array_value(array, args[i]);
}
return scripting::entity(array);
}); });
gsc::function::add("map", [](gsc::function_args args) gsc::function::add("map", [](const gsc::function_args& args)
{ {
const auto array = gsc::make_array(); scripting::array array;
for (auto i = 0; i < args.size(); i += 2) for (auto i = 0; i < args.size(); i += 2)
{ {
@ -182,13 +165,13 @@ namespace json
} }
const auto key = args[i].as<std::string>(); const auto key = args[i].as<std::string>();
gsc::add_array_key_value(array, key, args[i + 1]); array[key] = args[i + 1];
} }
return scripting::entity(array); return array.get_raw();
}); });
gsc::function::add("jsonparse", [](gsc::function_args args) gsc::function::add("jsonparse", [](const gsc::function_args& args)
{ {
const auto json = args[0].as<std::string>(); const auto json = args[0].as<std::string>();
const auto obj = nlohmann::json::parse(json); const auto obj = nlohmann::json::parse(json);
@ -196,7 +179,7 @@ namespace json
return json_to_gsc(obj); return json_to_gsc(obj);
}); });
gsc::function::add("jsonserialize", [](gsc::function_args args) gsc::function::add("jsonserialize", [](const gsc::function_args& args)
{ {
const auto value = args[0]; const auto value = args[0];
auto indent = -1; auto indent = -1;

6
src/component/json.hpp Normal file
View File

@ -0,0 +1,6 @@
#pragma once
namespace json
{
std::string gsc_to_string(const scripting::script_value& _value);
}

View File

@ -4,7 +4,6 @@
#include "game/scripting/entity.hpp" #include "game/scripting/entity.hpp"
#include "game/scripting/execution.hpp" #include "game/scripting/execution.hpp"
#include "notifies.hpp"
namespace notifies namespace notifies
{ {
@ -12,16 +11,13 @@ namespace notifies
{ {
utils::hook::detour client_command_hook; utils::hook::detour client_command_hook;
utils::hook::detour scr_player_killed_hook;
utils::hook::detour scr_player_damage_hook;
void client_command_stub(int clientNum) void client_command_stub(int clientNum)
{ {
char cmd[1024] = { 0 }; char cmd[1024] = { 0 };
game::SV_Cmd_ArgvBuffer(0, cmd, 1024); game::SV_Cmd_ArgvBuffer(0, cmd, 1024);
if (cmd == "say"s) if (cmd == "say"s || cmd == "say_team"s)
{ {
std::string message = game::ConcatArgs(1); std::string message = game::ConcatArgs(1);
message.erase(0, 1); message.erase(0, 1);
@ -29,8 +25,8 @@ namespace notifies
const scripting::entity level{*game::levelEntityId}; const scripting::entity level{*game::levelEntityId};
const auto player = scripting::call("getEntByNum", {clientNum}).as<scripting::entity>(); const auto player = scripting::call("getEntByNum", {clientNum}).as<scripting::entity>();
scripting::notify(level, "say", {player, message}); scripting::notify(level, cmd, {player, message});
scripting::notify(player, "say", {message}); scripting::notify(player, cmd, {message});
} }
return client_command_hook.invoke<void>(clientNum); return client_command_hook.invoke<void>(clientNum);

View File

@ -1,5 +0,0 @@
#pragma once
namespace notifies
{
}

View File

@ -5,6 +5,4 @@ namespace scheduler
void schedule(const std::function<bool()>& callback, std::chrono::milliseconds delay = 0ms); void schedule(const std::function<bool()>& callback, std::chrono::milliseconds delay = 0ms);
void loop(const std::function<void()>& callback, std::chrono::milliseconds delay = 0ms); void loop(const std::function<void()>& callback, std::chrono::milliseconds delay = 0ms);
void once(const std::function<void()>& callback, std::chrono::milliseconds delay = 0ms); void once(const std::function<void()>& callback, std::chrono::milliseconds delay = 0ms);
void init();
} }

View File

@ -3,17 +3,18 @@
#include "scheduler.hpp" #include "scheduler.hpp"
#include "command.hpp" #include "command.hpp"
#include "userinfo.hpp"
#include "game/scripting/event.hpp" #include "game/scripting/event.hpp"
#include "game/scripting/execution.hpp" #include "game/scripting/execution.hpp"
#include "game/scripting/functions.hpp" #include "game/scripting/functions.hpp"
#include "gsc.hpp"
namespace scripting namespace scripting
{ {
std::unordered_map<int, std::unordered_map<std::string, int>> fields_table; std::unordered_map<int, std::unordered_map<std::string, int>> fields_table;
std::unordered_map<std::string, std::unordered_map<std::string, char*>> script_function_table; std::unordered_map<std::string, std::unordered_map<std::string, const char*>> script_function_table;
std::unordered_map<unsigned, unsigned> replaced_functions;
namespace namespace
{ {
@ -23,8 +24,10 @@ namespace scripting
utils::hook::detour scr_load_level_hook; utils::hook::detour scr_load_level_hook;
utils::hook::detour g_shutdown_game_hook; utils::hook::detour g_shutdown_game_hook;
utils::hook::detour scr_emit_function_hook; utils::hook::detour scr_set_thread_position_hook;
utils::hook::detour scr_end_load_scripts_hook; utils::hook::detour process_script_hook;
std::string current_file;
void vm_notify_stub(const unsigned int notify_list_owner_id, const unsigned int string_value, void vm_notify_stub(const unsigned int notify_list_owner_id, const unsigned int string_value,
game::VariableValue* top) game::VariableValue* top)
@ -44,7 +47,9 @@ namespace scripting
if (e.name == "connected") if (e.name == "connected")
{ {
scripting::clear_entity_fields(e.entity); const auto player = e.arguments[0].as<scripting::entity>();
const auto client = player.call("getentitynumber").as<int>();
userinfo::clear_client_overrides(client);
} }
} }
@ -70,58 +75,35 @@ namespace scripting
void g_shutdown_game_stub(const int free_scripts) void g_shutdown_game_stub(const int free_scripts)
{ {
userinfo::clear_overrides();
command::clear_script_commands(); command::clear_script_commands();
replaced_functions.clear(); gsc::replaced_functions.clear();
g_shutdown_game_hook.invoke<void>(free_scripts); g_shutdown_game_hook.invoke<void>(free_scripts);
} }
char* function_pos(unsigned int filename, unsigned int name) void process_script_stub(const char* filename)
{ {
const auto scripts_pos = *reinterpret_cast<int*>(0x1D6EB14); current_file = filename;
const auto v2 = game::FindVariable(scripts_pos, filename); const auto file_id = atoi(filename);
if (file_id)
const auto v3 = game::FindObject(scripts_pos, v2);
const auto v4 = game::FindVariable(v3, name);
if (!v2 || !v3 || !v4)
{ {
return 0; current_file = scripting::file_list[file_id];
} }
return utils::hook::invoke<char*>(0x5659C0, v3, v4); process_script_hook.invoke<void>(filename);
} }
void scr_emit_function_stub(unsigned int filename, unsigned int threadName, char* codePos) void scr_set_thread_position_stub(unsigned int threadName, const char* codePos)
{ {
const auto* name = game::SL_ConvertToString(filename); const auto function_name = scripting::find_token(threadName);
const auto filename_id = atoi(name);
for (const auto& entry : scripting::file_list) if (!function_name.empty())
{ {
if (entry.first == filename_id) script_function_table[current_file][function_name] = codePos;
{
if (script_function_table.find(entry.second) == script_function_table.end())
{
script_function_table[entry.second] = {};
}
for (const auto& token : scripting::token_map)
{
if (token.second == threadName)
{
const auto pos = function_pos(filename, threadName);
if (pos)
{
script_function_table[entry.second][token.first] = pos;
}
}
}
}
} }
scr_emit_function_hook.invoke<void>(filename, threadName, codePos); scr_set_thread_position_hook.invoke<void>(threadName, codePos);
} }
} }
@ -134,6 +116,10 @@ namespace scripting
g_shutdown_game_hook.create(0x50C100, g_shutdown_game_stub); g_shutdown_game_hook.create(0x50C100, g_shutdown_game_stub);
scr_add_class_field_hook.create(0x567CD0, scr_add_class_field_stub); scr_add_class_field_hook.create(0x567CD0, scr_add_class_field_stub);
vm_notify_hook.create(0x569720, vm_notify_stub);
scr_set_thread_position_hook.create(0x5616D0, scr_set_thread_position_stub);
process_script_hook.create(0x56B130, process_script_stub);
} }
}; };
} }

View File

@ -2,8 +2,6 @@
namespace scripting namespace scripting
{ {
extern std::unordered_map<unsigned, unsigned> replaced_functions;
extern std::unordered_map<int, std::unordered_map<std::string, int>> fields_table; extern std::unordered_map<int, std::unordered_map<std::string, int>> fields_table;
extern std::unordered_map<std::string, std::unordered_map<std::string, char*>> script_function_table; extern std::unordered_map<std::string, std::unordered_map<std::string, const char*>> script_function_table;
} }

177
src/component/userinfo.cpp Normal file
View File

@ -0,0 +1,177 @@
#include <stdinc.hpp>
#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
{
using userinfo_map = std::unordered_map<std::string, std::string>;
std::unordered_map<int, userinfo_map> userinfo_overrides;
namespace
{
utils::hook::detour sv_getuserinfo_hook;
userinfo_map userinfo_to_map(const std::string& userinfo)
{
userinfo_map map;
const auto args = utils::string::split(userinfo, '\\');
for (auto i = 1; i < args.size() - 1; i += 2)
{
map[args[i]] = args[i + 1];
}
return map;
}
std::string map_to_userinfo(const userinfo_map& map)
{
std::string buffer;
for (const auto& value : map)
{
buffer.append("\\");
buffer.append(value.first);
buffer.append("\\");
buffer.append(value.second);
}
return buffer;
}
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);
if (userinfo_overrides.find(index) == userinfo_overrides.end())
{
userinfo_overrides[index] = {};
}
for (const auto& values : userinfo_overrides[index])
{
if (values.second.empty())
{
map.erase(values.first);
}
else
{
map[values.first] = values.second;
}
}
const auto userinfo = map_to_userinfo(map);
strcpy_s(buffer, 1024, userinfo.data());
}
}
void clear_client_overrides(int client)
{
userinfo_overrides[client].clear();
}
void clear_overrides()
{
userinfo_overrides.clear();
}
class component final : public component_interface
{
public:
void post_unpack() override
{
sv_getuserinfo_hook.create(0x573E00, sv_getuserinfo_stub);
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)
{
throw std::runtime_error("Invalid entity");
}
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
{
const auto name = args[0].as<std::string>();
if (ent.classnum != 0 || ent.entnum > 17)
{
throw std::runtime_error("Invalid entity");
}
userinfo_overrides[ent.entnum].erase("name");
game::ClientUserinfoChanged(ent.entnum);
return {};
});
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)
{
throw std::runtime_error("Invalid entity");
}
userinfo_overrides[ent.entnum]["clantag"] = name;
userinfo_overrides[ent.entnum]["ec_TagText"] = name;
userinfo_overrides[ent.entnum]["ec_usingTag"] = "1";
game::ClientUserinfoChanged(ent.entnum);
return {};
});
gsc::method::add("resetclantag", [](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)
{
throw std::runtime_error("Invalid entity");
}
userinfo_overrides[ent.entnum].erase("clantag");
userinfo_overrides[ent.entnum].erase("ec_TagText");
userinfo_overrides[ent.entnum].erase("ec_usingTag");
game::ClientUserinfoChanged(ent.entnum);
return {};
});
gsc::method::add("removeclantag", [](const game::scr_entref_t ent, const gsc::function_args& args) -> scripting::script_value
{
if (ent.classnum != 0 || ent.entnum > 17)
{
throw std::runtime_error("Invalid entity");
}
userinfo_overrides[ent.entnum]["clantag"] = "";
userinfo_overrides[ent.entnum]["ec_TagText"] = "";
userinfo_overrides[ent.entnum]["ec_usingTag"] = "0";
game::ClientUserinfoChanged(ent.entnum);
return {};
});
}
};
}
REGISTER_COMPONENT(userinfo::component)

View File

@ -0,0 +1,7 @@
#pragma once
namespace userinfo
{
void clear_client_overrides(int client);
void clear_overrides();
}

View File

@ -0,0 +1,258 @@
#include <stdinc.hpp>
#include "array.hpp"
#include "execution.hpp"
namespace scripting
{
array_value::array_value(unsigned int parent_id, unsigned int id)
: id_(id)
, parent_id_(parent_id)
{
if (!this->id_)
{
return;
}
const auto value = game::scr_VarGlob->childVariableValue[this->id_ + 0xC800 * (this->parent_id_ & 1)];
game::VariableValue variable;
variable.u = value.u.u;
variable.type = (game::scriptType_e)value.type;
this->value_ = variable;
}
void array_value::operator=(const script_value& _value)
{
if (!this->id_)
{
return;
}
const auto value = _value.get_raw();
const auto variable = &game::scr_VarGlob->childVariableValue[this->id_ + 0xC800 * (this->parent_id_ & 1)];
game::AddRefToValue(value.type, value.u);
game::RemoveRefToValue(variable->type, variable->u.u);
variable->type = value.type;
variable->u.u = value.u;
this->value_ = value;
}
array::array(unsigned int id)
: id_(id)
{
}
array::array()
{
this->id_ = make_array();
}
array::array(std::vector<script_value> values)
{
this->id_ = make_array();
for (const auto& value : values)
{
this->push(value);
}
}
array::array(std::unordered_map<std::string, script_value> values)
{
this->id_ = make_array();
for (const auto& value : values)
{
this->set(value.first, value.second);
}
}
std::vector<array_key> array::get_keys() const
{
std::vector<array_key> result;
const auto offset = 0xC800 * (this->id_ & 1);
auto current = game::scr_VarGlob->objectVariableChildren[this->id_].firstChild;
for (auto i = offset + current; current; i = offset + current)
{
const auto var = game::scr_VarGlob->childVariableValue[i];
if (var.type == game::SCRIPT_NONE)
{
current = var.nextSibling;
continue;
}
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;
if (string_value < 0x40000 && str)
{
key.is_string = true;
key.key = str;
}
else
{
key.is_integer = true;
key.index = (string_value - 0x800000) & 0xFFFFFF;
}
result.push_back(key);
current = var.nextSibling;
}
return result;
}
unsigned int array::size() const
{
return game::Scr_GetSelf(this->id_);
}
unsigned int array::push(script_value value) const
{
this->set(this->size(), value);
return this->size();
}
void array::erase(const unsigned int index) const
{
const auto variable_id = game::FindVariable(this->id_, (index - 0x800000) & 0xFFFFFF);
if (variable_id)
{
game::RemoveVariableValue(this->id_, variable_id);
}
}
void array::erase(const std::string& key) const
{
const auto string_value = game::SL_GetString(key.data(), 0);
const auto variable_id = game::FindVariable(this->id_, string_value);
if (variable_id)
{
game::RemoveVariableValue(this->id_, variable_id);
}
}
script_value array::pop() const
{
const auto value = this->get(this->size() - 1);
this->erase(this->size() - 1);
return value;
}
script_value array::get(const std::string& key) const
{
const auto string_value = game::SL_GetString(key.data(), 0);
const auto variable_id = game::GetVariable(this->id_, string_value);
if (!variable_id)
{
return {};
}
const auto value = game::scr_VarGlob->childVariableValue[variable_id + 0xC800 * (this->id_ & 1)];
game::VariableValue variable;
variable.u = value.u.u;
variable.type = (game::scriptType_e)value.type;
return variable;
}
script_value array::get(const unsigned int index) const
{
const auto variable_id = game::GetVariable(this->id_, (index - 0x800000) & 0xFFFFFF);
if (!variable_id)
{
return {};
}
const auto value = game::scr_VarGlob->childVariableValue[variable_id + 0xC800 * (this->id_ & 1)];
game::VariableValue variable;
variable.u = value.u.u;
variable.type = (game::scriptType_e)value.type;
return variable;
}
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 variable_id = this->get_value_id(key);
if (!variable_id)
{
return;
}
const auto variable = &game::scr_VarGlob->childVariableValue[variable_id + 0xC800 * (this->id_ & 1)];
game::AddRefToValue(value.type, value.u);
game::RemoveRefToValue(variable->type, variable->u.u);
variable->type = value.type;
variable->u.u = value.u;
}
void array::set(const unsigned int index, const script_value& _value) const
{
const auto value = _value.get_raw();
const auto variable_id = this->get_value_id(index);
if (!variable_id)
{
return;
}
const auto variable = &game::scr_VarGlob->childVariableValue[variable_id + 0xC800 * (this->id_ & 1)];
game::AddRefToValue(value.type, value.u);
game::RemoveRefToValue(variable->type, variable->u.u);
variable->type = value.type;
variable->u.u = value.u;
}
unsigned int array::get_entity_id() const
{
return this->id_;
}
unsigned int array::get_value_id(const std::string& key) const
{
const auto string_value = game::SL_GetString(key.data(), 0);
const auto variable_id = game::FindVariable(this->id_, string_value);
if (!variable_id)
{
return game::GetNewVariable(this->id_, string_value);
}
return variable_id;
}
unsigned int array::get_value_id(const unsigned int index) const
{
const auto variable_id = game::FindVariable(this->id_, (index - 0x800000) & 0xFFFFFF);
if (!variable_id)
{
return game::GetNewArrayVariable(this->id_, index);
}
return variable_id;
}
entity array::get_raw() const
{
return entity(this->id_);
}
}

View File

@ -0,0 +1,65 @@
#pragma once
#include "script_value.hpp"
namespace scripting
{
struct array_key
{
bool is_string = false;
bool is_integer = false;
int index{};
std::string key{};
};
class array_value : public script_value
{
public:
array_value(unsigned int parent_id, unsigned int id);
void array_value::operator=(const script_value& value);
private:
unsigned int id_;
unsigned int parent_id_;
};
class array final
{
public:
array();
array(unsigned int);
array(std::vector<script_value>);
array(std::unordered_map<std::string, script_value>);
std::vector<array_key> get_keys() const;
unsigned int size() const;
unsigned int push(script_value) const;
void erase(const unsigned int index) const;
void erase(const std::string& key) const;
script_value pop() const;
script_value get(const std::string&) const;
script_value get(const unsigned int) const;
void set(const std::string&, const script_value&) const;
void set(const unsigned int, const script_value&) const;
unsigned int get_entity_id() const;
unsigned int get_value_id(const std::string&) const;
unsigned int get_value_id(const unsigned int) const;
entity get_raw() const;
array_value array::operator[](const int index) const
{
return {this->id_, this->get_value_id(index)};
}
array_value array::operator[](const std::string& key) const
{
return {this->id_, this->get_value_id(key)};
}
private:
unsigned int id_;
};
}

View File

@ -155,8 +155,7 @@ namespace scripting
return get_return_value(); return get_return_value();
} }
script_value call_script_function(const entity& entity, const std::string& filename, const char* get_function_pos(const std::string& filename, const std::string& function)
const std::string& function, const std::vector<script_value>& arguments)
{ {
if (scripting::script_function_table.find(filename) == scripting::script_function_table.end()) if (scripting::script_function_table.find(filename) == scripting::script_function_table.end())
{ {
@ -164,14 +163,18 @@ namespace scripting
}; };
const auto functions = scripting::script_function_table[filename]; const auto functions = scripting::script_function_table[filename];
if (functions.find(function) == functions.end()) if (functions.find(function) == functions.end())
{ {
throw std::runtime_error("Function '" + function + "' in file '" + filename + "' not found"); throw std::runtime_error("Function '" + function + "' in file '" + filename + "' not found");
} }
const auto pos = functions.at(function); return functions.at(function);
}
script_value call_script_function(const entity& entity, const std::string& filename,
const std::string& function, const std::vector<script_value>& arguments)
{
const auto pos = get_function_pos(filename, function);
return exec_ent_thread(entity, pos, arguments); return exec_ent_thread(entity, pos, arguments);
} }
@ -269,4 +272,15 @@ namespace scripting
return {}; return {};
} }
unsigned int make_array()
{
unsigned int index = 0;
const auto variable = game::AllocVariable(&index);
variable->w.type = game::SCRIPT_ARRAY;
variable->u.f.prev = 0;
variable->u.f.next = 0;
return index;
}
} }

View File

@ -34,4 +34,6 @@ namespace scripting
script_value get_entity_field(const entity& entity, const std::string& field); script_value get_entity_field(const entity& entity, const std::string& field);
void notify(const entity& entity, const std::string& event, const std::vector<script_value>& arguments); void notify(const entity& entity, const std::string& event, const std::vector<script_value>& arguments);
unsigned int make_array();
} }

View File

@ -0,0 +1,30 @@
#include <stdinc.hpp>
#include "function.hpp"
#include "execution.hpp"
namespace scripting
{
function::function(const char* pos)
: pos_(pos)
{
}
script_value function::get_raw() const
{
game::VariableValue value;
value.type = game::SCRIPT_FUNCTION;
value.u.codePosValue = this->pos_;
return value;
}
const char* function::get_pos() const
{
return this->pos_;
}
script_value function::call(entity self, std::vector<script_value> arguments) const
{
return exec_ent_thread(self, this->pos_, arguments);
}
}

View File

@ -0,0 +1,34 @@
#pragma once
#include "entity.hpp"
#include "script_value.hpp"
namespace scripting
{
class function
{
public:
function(const char*);
script_value get_raw() const;
const char* get_pos() const;
script_value call(entity self, std::vector<script_value> arguments) const;
script_value operator()(entity self, std::vector<script_value> arguments) const
{
return this->call(self, arguments);
}
script_value operator()(std::vector<script_value> arguments) const
{
return this->call(*game::levelEntityId, arguments);
}
script_value operator()() const
{
return this->call(*game::levelEntityId, {});
}
private:
const char* pos_;
};
}

View File

@ -71,6 +71,19 @@ namespace scripting
} }
} }
std::string find_token(unsigned int id)
{
for (const auto& token : token_map)
{
if (token.second == id)
{
return token.first;
}
}
return {};
}
int find_token_id(const std::string& name) int find_token_id(const std::string& name)
{ {
const auto result = token_map.find(name); const auto result = token_map.find(name);

View File

@ -12,4 +12,5 @@ namespace scripting
script_function find_function(const std::string& name, const bool prefer_global); script_function find_function(const std::string& name, const bool prefer_global);
int find_token_id(const std::string& name); int find_token_id(const std::string& name);
std::string find_token(unsigned int id);
} }

View File

@ -1,7 +1,8 @@
#include <stdinc.hpp> #include <stdinc.hpp>
#include "script_value.hpp" #include "script_value.hpp"
#include "entity.hpp" #include "entity.hpp"
#include "array.hpp"
#include "function.hpp"
namespace scripting namespace scripting
{ {
@ -219,7 +220,7 @@ namespace scripting
**************************************************************/ **************************************************************/
template <> template <>
bool script_value::is<std::vector<script_value>>() const bool script_value::is<array>() const
{ {
if (this->get_raw().type != game::SCRIPT_OBJECT) if (this->get_raw().type != game::SCRIPT_OBJECT)
{ {
@ -232,6 +233,12 @@ namespace scripting
return type == game::SCRIPT_ARRAY; return type == game::SCRIPT_ARRAY;
} }
template <>
array script_value::get() const
{
return array(this->get_raw().u.uintValue);
}
/*************************************************************** /***************************************************************
* Struct * Struct
**************************************************************/ **************************************************************/
@ -255,11 +262,17 @@ namespace scripting
**************************************************************/ **************************************************************/
template <> template <>
bool script_value::is<std::function<void()>>() const bool script_value::is<function>() const
{ {
return this->get_raw().type == game::SCRIPT_FUNCTION; return this->get_raw().type == game::SCRIPT_FUNCTION;
} }
template <>
function script_value::get() const
{
return function(this->get_raw().u.codePosValue);
}
/*************************************************************** /***************************************************************
* Vector * Vector
**************************************************************/ **************************************************************/

View File

@ -63,10 +63,9 @@ namespace scripting
const game::VariableValue& get_raw() const; const game::VariableValue& get_raw() const;
variable_value value_{};
private: private:
template <typename T> template <typename T>
T get() const; T get() const;
variable_value value_{};
}; };
} }

View File

@ -16,6 +16,7 @@ namespace game
WEAK symbol<void(unsigned int weapon, bool isAlternate, char* output, unsigned int maxStringLen)> BG_GetWeaponNameComplete{0x42F760}; WEAK symbol<void(unsigned int weapon, bool isAlternate, char* output, unsigned int maxStringLen)> BG_GetWeaponNameComplete{0x42F760};
WEAK symbol<void(int client)> ClientUserinfoChanged{0x4FADB0};
WEAK symbol<const char*(int index)> ConcatArgs{0x502150}; WEAK symbol<const char*(int index)> ConcatArgs{0x502150};
WEAK symbol<void(int localClientNum, const char* text)> Cbuf_AddText{0x545680}; WEAK symbol<void(int localClientNum, const char* text)> Cbuf_AddText{0x545680};
WEAK symbol<void(const char* cmdName, void(), cmd_function_t* allocedCmd)> Cmd_AddCommandInternal{0x545DF0}; WEAK symbol<void(const char* cmdName, void(), cmd_function_t* allocedCmd)> Cmd_AddCommandInternal{0x545DF0};
@ -31,7 +32,9 @@ namespace game
WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> FindObject{0x565BD0}; WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> FindObject{0x565BD0};
WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> GetVariable{0x5663E0}; WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> GetVariable{0x5663E0};
WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> GetNewVariable{0x566390}; WEAK symbol<unsigned int(unsigned int parentId, unsigned int name)> GetNewVariable{0x566390};
WEAK symbol<unsigned int(unsigned int parentId, unsigned int unsignedValue)> GetNewArrayVariable{0x5668C0};
WEAK symbol<void(unsigned int parentId, unsigned int id, VariableValue* value)> SetNewVariableValue{0x5658D0}; WEAK symbol<void(unsigned int parentId, unsigned int id, VariableValue* value)> SetNewVariableValue{0x5658D0};
WEAK symbol<void(unsigned int parentId, unsigned int index)> RemoveVariableValue{0x566500};
WEAK symbol<const float* (const float* v)> Scr_AllocVector{0x565680}; WEAK symbol<const float* (const float* v)> Scr_AllocVector{0x565680};
WEAK symbol<void()> Scr_ClearOutParams{0x569010}; WEAK symbol<void()> Scr_ClearOutParams{0x569010};