Rim/h2-mod
Rim/h2-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some stuff i need

Browse Source
This commit is contained in:
Federico Cecchetto 2022-06-20 23:30:38 +02:00
parent f5b9733812
commit c83c736ce2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/component/ui_scripting.cpp
View File

@ -389,7 +389,7 @@ namespace ui_scripting
} }
const auto folder = globals.in_require_script.substr(0, globals.in_require_script.find_last_of("/\\")); const auto folder = globals.in_require_script.substr(0, globals.in_require_script.find_last_of("/\\"));
const std::string name_ = name; std::string name_ = utils::string::replace(name, "~", ".");
const std::string target_script = folder + "/" + name_ + ".lua"; const std::string target_script = folder + "/" + name_ + ".lua";
if (utils::io::file_exists(target_script)) if (utils::io::file_exists(target_script))

25
src/client/game/scripting/lua/context.cpp
View File

@ -10,14 +10,19 @@
#include "../../../component/scripting.hpp" #include "../../../component/scripting.hpp"
#include "../../../component/command.hpp" #include "../../../component/command.hpp"
#include "../../../component/fastfiles.hpp" #include "../../../component/fastfiles.hpp"
#include "../../../component/mods.hpp"
#include "../../../component/localized_strings.hpp"
#include <utils/string.hpp> #include <utils/string.hpp>
#include <utils/io.hpp> #include <utils/io.hpp>
#include <utils/nt.hpp>
namespace scripting::lua namespace scripting::lua
{ {
namespace namespace
{ {
const auto json_script = utils::nt::load_resource(LUA_JSON);
vector normalize_vector(const vector& vec) vector normalize_vector(const vector& vec)
{ {
const auto length = sqrt((vec.get_x() * vec.get_x()) + (vec.get_y() * vec.get_y()) + (vec.get_z() * vec.get_z())); const auto length = sqrt((vec.get_x() * vec.get_x()) + (vec.get_y() * vec.get_y()) + (vec.get_z() * vec.get_z()));
@ -29,6 +34,13 @@ namespace scripting::lua
); );
} }
void setup_json(sol::state& state)
{
const auto json = state.safe_script(json_script, &sol::script_pass_on_error);
handle_error(json);
state["json"] = json;
}
void setup_io(sol::state& state) void setup_io(sol::state& state)
{ {
state["io"]["fileexists"] = utils::io::file_exists; state["io"]["fileexists"] = utils::io::file_exists;
@ -738,6 +750,17 @@ namespace scripting::lua
} }
return count; return count;
}; };
game_type["getloadedmod"] = [](const game&)
{
return mods::mod_path;
};
game_type["addlocalizedstring"] = [](const game&, const std::string& string,
const std::string& value)
{
localized_strings::override(string, value);
};
} }
} }
@ -773,6 +796,7 @@ namespace scripting::lua
}; };
setup_io(this->state_); setup_io(this->state_);
setup_json(this->state_);
setup_vector_type(this->state_); setup_vector_type(this->state_);
setup_entity_type(this->state_, this->event_handler_, this->scheduler_); setup_entity_type(this->state_, this->event_handler_, this->scheduler_);
setup_game_type(this->state_, this->event_handler_, this->scheduler_); setup_game_type(this->state_, this->event_handler_, this->scheduler_);
@ -804,6 +828,7 @@ namespace scripting::lua
}; };
setup_io(this->state_); setup_io(this->state_);
setup_json(this->state_);
setup_vector_type(this->state_); setup_vector_type(this->state_);
setup_entity_type(this->state_, this->event_handler_, this->scheduler_); setup_entity_type(this->state_, this->event_handler_, this->scheduler_);
setup_game_type(this->state_, this->event_handler_, this->scheduler_); setup_game_type(this->state_, this->event_handler_, this->scheduler_);