String Variables

CMakeLists.txt

@@ -190,6 +190,8 @@ add_library(${PROJECT_NAME} OBJECT
 	src/game_quit.h
 	src/game_screen.cpp
 	src/game_screen.h
+	src/game_strings.cpp
+	src/game_strings.h
 	src/game_switches.cpp
 	src/game_switches.h
 	src/game_system.cpp

Makefile.am

@@ -169,6 +169,8 @@ libeasyrpg_player_a_SOURCES = \
 	src/game_player.h \
 	src/game_screen.cpp \
 	src/game_screen.h \
+	src/game_strings.cpp \
+	src/game_strings.h \
 	src/game_switches.cpp \
 	src/game_switches.h \
 	src/game_system.cpp \

docs/AUTHORS.md

@@ -7,6 +7,7 @@ EasyRPG Player authors
 * Carsten Teibes (carstene1ns)
 * Christian Breitwieser (ChrisBreiti)
 * Diego Pedraza (zegeri)
+* Erich Newey (enewey)
 * Dmytro Kushnariov (rohkea)
 * Francisco de la Peña (fdelapena)
 * Gabriel Kind (Ghabry)

src/async_handler.cpp

@@ -257,6 +257,16 @@ bool AsyncHandler::IsFilePending(bool important, bool graphic) {
 	return false;
 }
 
+void AsyncHandler::SaveFilesystem() {
+#ifdef EMSCRIPTEN
+	// Save changed file system
+	EM_ASM({
+		FS.syncfs(function(err) {
+		});
+	});
+#endif
+}
+
 bool AsyncHandler::IsImportantFilePending() {
 	return IsFilePending(true, false);
 }

src/async_handler.h

@@ -92,6 +92,12 @@ namespace AsyncHandler {
 	 * @return If any file with params is pending.
 	 */
 	bool IsFilePending(bool important, bool graphic);
+
+	/**
+	 * Saves the state of the Save filesystem.
+	 * Only works on emscripten, noop on other platforms.
+	 */
+	void SaveFilesystem();
 }
 
 using FileRequestBinding = std::shared_ptr<int>;

src/dynrpg_textplugin.cpp

@@ -164,8 +164,8 @@ class DynRpgText : public Drawable {
 	}
 
 	static DynRpgText* GetTextHandle(const std::string& id, bool silent = false) {
-		PendingMessage pm;
-		pm.PushLine(id, DynRpgText::CommandCodeInserter);
+		PendingMessage pm(CommandCodeInserter);
+		pm.PushLine(id);
 		std::string new_id = pm.GetLines().front();
 
 		auto it = graphics.find(new_id);
@@ -230,8 +230,8 @@ class DynRpgText : public Drawable {
 		const FontRef& font = Font::Default();
 
 		for (auto& t : texts) {
-			PendingMessage pm;
-			pm.PushLine(t, CommandCodeInserter);
+			PendingMessage pm(CommandCodeInserter);
+			pm.PushLine(t);
 			t = pm.GetLines().front();
 
 			Rect r = Text::GetSize(*font, t);
@@ -269,8 +269,8 @@ static bool WriteText(dyn_arg_list args) {
 	if (!okay)
 		return true;
 
-	PendingMessage pm;
-	pm.PushLine(id, DynRpgText::CommandCodeInserter);
+	PendingMessage pm(DynRpgText::CommandCodeInserter);
+	pm.PushLine(id);
 	std::string new_id = pm.GetLines().front();
 	graphics[new_id] = std::make_unique<DynRpgText>(1, x, y, text);
 

src/filefinder.cpp

@@ -68,6 +68,7 @@ namespace {
 	constexpr const auto SOUND_TYPES = Utils::MakeSvArray(
 			".opus", ".oga", ".ogg", ".wav", ".mp3", ".wma");
 	constexpr const auto FONTS_TYPES = Utils::MakeSvArray(".fon", ".fnt", ".bdf", ".ttf", ".ttc", ".otf", ".woff2", ".woff");
+	constexpr const auto TEXT_TYPES = Utils::MakeSvArray(".txt", ".csv", ".svg", ".xml", ".json", ".yml", ".yaml");
 }
 
 FilesystemView FileFinder::Game() {
@@ -337,6 +338,15 @@ std::string find_generic(const DirectoryTree::Args& args) {
 	return FileFinder::Game().FindFile(args);
 }
 
+std::string find_generic_with_fallback(DirectoryTree::Args& args) {
+	std::string found = FileFinder::Save().FindFile(args); 
+	if (found.empty()) {
+		return find_generic(args);
+	}
+
+	return found;
+}
+
 std::string FileFinder::FindImage(StringView dir, StringView name) {
 	DirectoryTree::Args args = { MakePath(dir, name), IMG_TYPES, 1, false };
 	return find_generic(args);
@@ -358,6 +368,11 @@ std::string FileFinder::FindFont(StringView name) {
 	return find_generic(args);
 }
 
+std::string FileFinder::FindText(StringView name) {
+	DirectoryTree::Args args = { MakePath("Text", name), TEXT_TYPES, 1, true };
+	return find_generic_with_fallback(args);
+}
+
 Filesystem_Stream::InputStream open_generic(StringView dir, StringView name, DirectoryTree::Args& args) {
 	if (!Tr::GetCurrentTranslationId().empty()) {
 		auto tr_fs = Tr::GetCurrentTranslationFilesystem();
@@ -377,6 +392,16 @@ Filesystem_Stream::InputStream open_generic(StringView dir, StringView name, Dir
 	return is;
 }
 
+Filesystem_Stream::InputStream open_generic_with_fallback(StringView dir, StringView name, DirectoryTree::Args& args) {
+	auto is = FileFinder::Save().OpenFile(args); 
+	if (!is) { is = open_generic(dir, name, args); }
+	if (!is) {
+		Output::Debug("Unable to open in either Game or Save: {}/{}", dir, name);
+	}
+
+	return is;
+}
+
 Filesystem_Stream::InputStream FileFinder::OpenImage(StringView dir, StringView name) {
 	DirectoryTree::Args args = { MakePath(dir, name), IMG_TYPES, 1, false };
 	return open_generic(dir, name, args);
@@ -397,6 +422,11 @@ Filesystem_Stream::InputStream FileFinder::OpenFont(StringView name) {
 	return open_generic("Font", name, args);
 }
 
+Filesystem_Stream::InputStream FileFinder::OpenText(StringView name) {
+	DirectoryTree::Args args = { MakePath("Text", name), TEXT_TYPES, 1, false };
+	return open_generic_with_fallback("Text", name, args);
+}
+
 bool FileFinder::IsMajorUpdatedTree() {
 	auto fs = Game();
 	assert(fs);

src/filefinder.h

@@ -97,6 +97,23 @@ namespace FileFinder {
 	 */
 	std::string FindSound(StringView name);
 
+	/**
+	 * Finds a font file.
+	 * Searches through the current RPG Maker game and the RTP directories.
+	 *
+	 * @param name the font name.
+	 * @return path to file.
+	 */
+	std::string FindFont(StringView name);
+
+	/**
+	 * Finds a text file in the current RPG Maker game.
+	 *
+	 * @param name the text path and name.
+	 * @return path to file.
+	 */
+	std::string FindText(StringView name);
+
 	/**
 	 * Finds an image file and opens a file handle to it.
 	 * Searches through the current RPG Maker game and the RTP directories.
@@ -137,13 +154,24 @@ namespace FileFinder {
 	Filesystem_Stream::InputStream OpenFont(StringView name);
 
 	/**
-	 * Finds a font file.
-	 * Searches through the current RPG Maker game and the RTP directories.
+	 * Finds a text file and opens a file handle to it.
+	 * Searches through the Text folder of the current RPG Maker game.
+	 * Will also search through the directory save files are written to as a fallback,
+	 * as it needs to account for files written by the game as well.
 	 *
-	 * @param name the font name.
-	 * @return path to file.
+	 * @param name the text path and name.
+	 * @return read handle on success or invalid handle if not found
 	 */
-	std::string FindFont(StringView name);
+	Filesystem_Stream::InputStream OpenText(StringView name);
+
+	/**
+	* Writes data to a txt file.
+	* If the file exists, it will be overwritten.
+	*
+	* @param name the text file path and name
+	* @param data the content of the text file to be written
+	*/
+	void WriteText(StringView name, StringView data);
 
 	/**
 	 * Appends name to directory.