add copy func

youneuoy · Oct 28, 2024 · 1646400 · 1646400
1 parent e117dd1
commit 1646400
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 2 deletions.
diff --git a/M2TWEOP Code/M2TWEOP library/imgui/sol_ImGui.cpp b/M2TWEOP Code/M2TWEOP library/imgui/sol_ImGui.cpp
@@ -2012,6 +2012,16 @@ namespace sol_ImGui
 	void SetMouseCursor(int cursor_type) { ImGui::SetMouseCursor(static_cast<ImGuiMouseCursor>(cursor_type)); }
 	void SetNextFrameWantCaptureMouse(bool want_capture_mouse_value) { ImGui::SetNextFrameWantCaptureMouse(want_capture_mouse_value); }
 
+	ImFont* AddFontFromFileTTF(ImFontAtlas* fontAtlas, const char* filename, float size_pixels)
+	{
+		return fontAtlas->AddFontFromFileTTF(filename, size_pixels);
+	}
+
+	ImFont* AddFontFromFileTTF(ImFontAtlas* fontAtlas, const char* filename, float size_pixels, const ImFontConfig* font_cfg_template)
+	{
+		return fontAtlas->AddFontFromFileTTF(filename, size_pixels, font_cfg_template);
+	}
+
 	ImFont* AddFontFromFileTTF(ImFontAtlas* fontAtlas, const char* filename, float size_pixels, const ImFontConfig* font_cfg_template, const ImWchar* glyph_ranges)
 	{
 		return fontAtlas->AddFontFromFileTTF(filename, size_pixels, font_cfg_template, glyph_ranges);
@@ -5666,11 +5676,17 @@ namespace sol_ImGui
 		@function FontAtlas:AddFontFromFileTTF
 		@tparam string filename
 		@tparam float sizePixels
+		@tparam void fontConfig optional
+		@tparam void glyphRanges optional
 		@treturn ImFont font
 		@usage
 			FontAtlas:AddFontFromFileTTF();
 		*/
-		FontAtlas.set_function("AddFontFromFileTTF", &AddFontFromFileTTF);
+		FontAtlas.set_function("AddFontFromFileTTF", sol::overload(
+			sol::resolve<ImFont*(ImFontAtlas*, const char*, float)>(AddFontFromFileTTF),
+			sol::resolve<ImFont*(ImFontAtlas*, const char*, float, const ImFontConfig*)>(AddFontFromFileTTF),
+			sol::resolve<ImFont*(ImFontAtlas*, const char*, float, const ImFontConfig*, const ImWchar*)>(AddFontFromFileTTF)
+		));
 
 		/***
 		Access the IO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags).

diff --git a/M2TWEOP Code/M2TWEOP library/luaPlugin.cpp b/M2TWEOP Code/M2TWEOP library/luaPlugin.cpp
@@ -210,6 +210,7 @@ sol::state* luaPlugin::init(std::string& luaFilePath, std::string& modPath)
 	@tfield restartLua restartLua
 	@tfield toggleDeveloperMode toggleDeveloperMode
 	@tfield saveGame saveGame
+	@tfield copyFile copyFile
 	@tfield getGameVersion getGameVersion
 	@tfield setPerfectSpy setPerfectSpy
 	@tfield getLocalFactionID getLocalFactionID
@@ -336,6 +337,16 @@ sol::state* luaPlugin::init(std::string& luaFilePath, std::string& modPath)
 	*/
 	tables.M2TWEOP.set_function("saveGame", &gameHelpers::saveGame);
 
+	/***
+	Copy a file.
+	@function M2TWEOP.copyFile
+	@tparam string from
+	@tparam string to
+	@usage
+	    M2TWEOP.copyFile(M2TWEOP.getModPath().."/saves/newsave.sav",  M2TWEOP.getModPath().."/backupSaves/newsave.sav");
+	*/
+	tables.M2TWEOP.set_function("copyFile", &gameHelpers::copyFileLua);
+
 	/***
 	Function to get the game version.
 	@function M2TWEOP.getGameVersion

diff --git a/M2TWEOP Code/M2TWEOP library/types/gameHelpers.cpp b/M2TWEOP Code/M2TWEOP library/types/gameHelpers.cpp
@@ -546,6 +546,17 @@ namespace gameHelpers
 		return path.substr(pos + 1, path.length() - pos);
 	}
 
+	void copyFileLua(const std::string& file, const std::string& to)
+	{
+		//CopyFileA(file.c_str(), to.c_str(), FALSE);
+		if (!std::filesystem::exists(file))
+		{
+			logStringGame("M2TWEOP.copyFile: File not found: " + file);
+			return;
+		}
+		std::filesystem::copy(file, to, std::filesystem::copy_options::overwrite_existing);
+	}
+
 	void setEquipmentCosts(const int equipType, const int cost)
 	{
 		struct equipmentCosts

diff --git a/M2TWEOP Code/M2TWEOP library/types/gameHelpers.h b/M2TWEOP Code/M2TWEOP library/types/gameHelpers.h
@@ -367,6 +367,7 @@ namespace gameHelpers
 	std::string getModPath();
 	std::string getLuaPath();
 	std::string getModFolderName();
+	void copyFileLua(const std::string& file, const std::string& to);
 	std::string getModString(const std::string& path);
 	int getGameVersion();
 	void generateSprite(const std::string& model);

diff --git a/M2TWEOP DataFiles/eopData/eopScripts/LuaImGuiDocs.lua b/M2TWEOP DataFiles/eopData/eopScripts/LuaImGuiDocs.lua
@@ -1740,8 +1740,10 @@ ImFontAtlas = {
 --- Access the IO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags).
 ---@param filename string 
 ---@param sizePixels number 
+---@param fontConfig void? optional
+---@param glyphRanges void? optional
 ---@return ImFont font 
-function ImFontAtlas:AddFontFromFileTTF(filename, sizePixels) end 
+function ImFontAtlas:AddFontFromFileTTF(filename, sizePixels, fontConfig, glyphRanges) end 
 
 ---Basic ImDrawList table
 ---@class ImDrawList