Merge pull request #307 from chaoticgd/trainer

Add the beginnings of a trainer

Author: chaoticgd

CMakeLists.txt

@@ -59,11 +59,13 @@ set(RELEASE_FILES
 	$<TARGET_FILE:wrencheditor>
 	$<TARGET_FILE:wrenchlauncher>
 	$<TARGET_FILE:wrenchsaveeditor>
+	$<TARGET_FILE:wrenchtrainer>
 	$<TARGET_FILE:wrenchvis>
 	"${CMAKE_BINARY_DIR}/editor.wad"
 	"${CMAKE_BINARY_DIR}/gui.wad"
 	"${CMAKE_BINARY_DIR}/launcher.wad"
 	"${CMAKE_BINARY_DIR}/memcard.wad"
+	"${CMAKE_BINARY_DIR}/trainer.wad"
 )
 set(RELEASE_DOCS_DIRECTORY "${CMAKE_SOURCE_DIR}/docs")
 set(RELEASE_LICENSES_DIRECTORY "${CMAKE_SOURCE_DIR}/data/licenses")

data/licenses/pine.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Gauvain "GovanifY" Roussel-Tarbouriech
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/trainer/trainer_types_dl.h

@@ -0,0 +1,5 @@
+#pragma wrench parser on
+
+struct MobyInstance
+{
+};

data/trainer/trainer_types_gc.h

@@ -0,0 +1,5 @@
+#pragma wrench parser on
+
+struct MobyInstance
+{
+};

data/trainer/trainer_types_rac.h

@@ -0,0 +1,5 @@
+#pragma wrench parser on
+
+struct MobyInstance
+{
+};

data/trainer/trainer_types_uya.h

@@ -0,0 +1,5 @@
+#pragma wrench parser on
+
+struct MobyInstance
+{
+};

src/CMakeLists.txt

@@ -17,6 +17,7 @@ add_subdirectory(instancemgr)
 add_subdirectory(gui)
 add_subdirectory(launcher)
 add_subdirectory(editor)
+add_subdirectory(trainer)
 add_subdirectory(wrenchbuild)
 add_subdirectory(saveeditor)
 add_subdirectory(wrenchvis)
@@ -53,5 +54,6 @@ if(WIN32)
 	target_sources(wrencheditor PUBLIC utf8.manifest)
 	target_sources(wrenchlauncher PUBLIC utf8.manifest)
 	target_sources(wrenchsaveeditor PUBLIC utf8.manifest)
+	target_sources(wrenchtrainer PUBLIC utf8.manifest)
 	target_sources(wrenchvis PUBLIC utf8.manifest)
 endif()

src/core/CMakeLists.txt

@@ -24,6 +24,7 @@ add_library(wrenchcore STATIC
 	elf.cpp
 	stdout_thread.cpp
 	gltf.cpp
+	release.cpp
 	${CMAKE_SOURCE_DIR}/thirdparty/md5.cpp
 )
 target_link_libraries(wrenchcore wrenchwtf wrenchplatform)

src/core/build_config.h

@@ -26,6 +26,11 @@ enum class Game : u8
 	UNKNOWN = 0, RAC = 1, GC = 2, UYA = 3, DL = 4
 };
 
+enum
+{
+	MAX_GAME = 5
+};
+
 enum class Region : u8
 {
 	UNKNOWN = 0, US = 1, EU = 2, JAPAN = 3

src/wrenchbuild/release.cpp src/core/release.cppsrc/wrenchbuild/release.cpp renamed to src/core/release.cpp

@@ -51,53 +51,40 @@ static const Release RELEASES[] = {
 	{"scus_974.87", Game::DL, Region::US, "Ratchet: Deadlocked"} // us public beta
 };
 
-static std::pair<Game, const char*> GAME_SEARCH_PATTERNS[] = {
-	{Game::DL, "Deadlocked"},
-	{Game::UYA, "Up Your Arsenal"},
-	{Game::GC, "Going Commando"},
-	{Game::RAC, "Ratchet & Clank"}
-};
-
-Release identify_release(const IsoDirectory& root, InputStream& iso)
+Release identify_release(const std::string& elf_name)
 {
 	Release result;
-	// First check all of the known releases.
-	for (const IsoFileRecord& file : root.files) {
-		for (const Release& release : RELEASES) {
-			if (release.elf_name == file.name) {
-				result = release;
-				break;
-			}
+	for (const Release& release : RELEASES) {
+		if (release.elf_name == elf_name) {
+			result = release;
+			break;
 		}
 	}
-	if (result.game == Game::UNKNOWN) {
-		// Unknown build, try to identify it in a dirtier slower way.
-		for (const IsoFileRecord& record : root.files) {
-			if (record.size > 4) {
-				// Look for the boot ELF.
-				u8 magic[4] = {};
-				iso.seek(record.lba.bytes());
-				iso.read_n(magic, 4);
-				if (memcmp(magic, "\x7f\x45\x4c\x46", 4) == 0) {
-					iso.seek(record.lba.bytes());
-					std::vector<u8> elf = iso.read_multiple<u8>(record.size);
-					// Look for the names of the respective games in the boot ELF.
-					for (auto [game, pattern] : GAME_SEARCH_PATTERNS) {
-						for (s32 i = 0; i < (s32) elf.size() - strlen(pattern); i++) {
-							if (memcmp(&elf[i], pattern, strlen(pattern)) == 0) {
-								printf("Unknown build identified as %s.\n", game_to_string(game).c_str());
-								result.elf_name = record.name;
-								result.game = game;
-								result.name = "unknown";
-								break;
-							}
-						}
-						if (result.game != Game::UNKNOWN) {
-							break;
-						}
-					}
-				}
-			}
+	return result;
+}
+
+static std::string normalise_game_id(const std::string& game_id)
+{
+	std::string result;
+	for (char c : game_id) {
+		if (c >= 'A' && c <= 'Z') {
+			result.push_back(c + ('a' - 'A'));
+		} else if ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9')) {
+			result.push_back(c);
+		}
+	}
+	return result;
+}
+
+Release identify_release_fuzzy(const std::string& game_id)
+{
+	std::string normal_game_id = normalise_game_id(game_id);
+	
+	Release result;
+	for (const Release& release : RELEASES) {
+		if (normalise_game_id(release.elf_name) == normal_game_id) {
+			result = release;
+			break;
 		}
 	}
 	return result;