From f9fdc189828239e8e47cc2d4ed2b1bb4661b3b8c Mon Sep 17 00:00:00 2001 From: raphael60650 Date: Wed, 16 Jun 2021 01:21:37 +0200 Subject: [PATCH 1/4] added USA Scene/UI/ and Boot/Strap/us --- fs.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs.json b/fs.json index b556f3a..9c992ef 100644 --- a/fs.json +++ b/fs.json @@ -25,16 +25,22 @@ "Scene/UI/*_E.szs": {"/message/Common.bmg": "Common_E.bmg"}, + "Scene/UI/*_U.szs": {"/message/Common.bmg": "Common_E.bmg"}, "Scene/UI/*_F.szs": {"/message/Common.bmg": "Common_F.bmg"}, + "Scene/UI/*_Q.szs": {"/message/Common.bmg": "Common_F.bmg"}, "Scene/UI/*_G.szs": {"/message/Common.bmg": "Common_G.bmg"}, "Scene/UI/*_I.szs": {"/message/Common.bmg": "Common_I.bmg"}, "Scene/UI/*_S.szs": {"/message/Common.bmg": "Common_S.bmg"}, + "Scene/UI/*_M.szs": {"/message/Common.bmg": "Common_S.bmg"}, "Scene/UI/Race_E.szs": {"/message/Common.bmg": "Common_RE.bmg"}, + "Scene/UI/Race_U.szs": {"/message/Common.bmg": "Common_RE.bmg"}, "Scene/UI/Race_F.szs": {"/message/Common.bmg": "Common_RF.bmg"}, + "Scene/UI/Race_Q.szs": {"/message/Common.bmg": "Common_RF.bmg"}, "Scene/UI/Race_G.szs": {"/message/Common.bmg": "Common_RG.bmg"}, "Scene/UI/Race_I.szs": {"/message/Common.bmg": "Common_RI.bmg"}, "Scene/UI/Race_S.szs": {"/message/Common.bmg": "Common_RS.bmg"}, + "Scene/UI/Race_M.szs": {"/message/Common.bmg": "Common_RS.bmg"}, "Boot/Strap/eu/Dutch.szs": { "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456de", @@ -48,12 +54,24 @@ "/Textures(NW4R)/strapA_608x456": "strapA_608x456en", "/Textures(NW4R)/strapB_608x456": "strapA_608x456en" }, + "Boot/Strap/us/English.szs": { + "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456en", + "/Textures(NW4R)/strapB_16_9_832x456": "strapA_16_9_832x456en", + "/Textures(NW4R)/strapA_608x456": "strapA_608x456en", + "/Textures(NW4R)/strapB_608x456": "strapA_608x456en" + }, "Boot/Strap/eu/French.szs": { "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456fr", "/Textures(NW4R)/strapB_16_9_832x456": "strapA_16_9_832x456fr", "/Textures(NW4R)/strapA_608x456": "strapA_608x456fr", "/Textures(NW4R)/strapB_608x456": "strapA_608x456fr" }, + "Boot/Strap/us/French.szs": { + "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456fr", + "/Textures(NW4R)/strapB_16_9_832x456": "strapA_16_9_832x456fr", + "/Textures(NW4R)/strapA_608x456": "strapA_608x456fr", + "/Textures(NW4R)/strapB_608x456": "strapA_608x456fr" + }, "Boot/Strap/eu/German.szs": { "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456ge", "/Textures(NW4R)/strapB_16_9_832x456": "strapA_16_9_832x456ge", @@ -72,6 +90,12 @@ "/Textures(NW4R)/strapA_608x456": "strapA_608x456es", "/Textures(NW4R)/strapB_608x456": "strapA_608x456es" }, + "Boot/Strap/eu/Spanish_US.szs": { + "/Textures(NW4R)/strapA_16_9_832x456": "strapA_16_9_832x456es", + "/Textures(NW4R)/strapB_16_9_832x456": "strapA_16_9_832x456es", + "/Textures(NW4R)/strapA_608x456": "strapA_608x456es", + "/Textures(NW4R)/strapB_608x456": "strapA_608x456es" + }, "Boot/": "savebanner.tpl", "thp/*/*.thp": "video.thp", From 44187f5338c62e727d672fc7a4881e8a62bbc060 Mon Sep 17 00:00:00 2001 From: raphael60650 Date: Wed, 16 Jun 2021 08:30:08 +0200 Subject: [PATCH 2/4] PATH directory wasn't properly detected --- source/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/__init__.py b/source/__init__.py index 73b96eb..37e0219 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -73,11 +73,13 @@ def __init__(self): if not(os.path.exists(self.path_mkwf)): break directory_name, i = f"MKWiiFaraphel ({i})", i + 1 - if os.path.exists(self.path_mkwf + "/DATA/"): self.path_mkwf += "/DATA/" - self.Progress(show=True, indeter=True, statut=self.translate("Extraction du jeu...")) subprocess.call(["./tools/wit/wit", "EXTRACT", get_nodir(path), "--DEST", directory_name] , creationflags=CREATE_NO_WINDOW, cwd=get_dir(path)) + + if os.path.exists(self.path_mkwf + "/DATA/"): self.path_mkwf += "/DATA/" + print(self.path_mkwf) + self.Progress(show=False) else: From 77ff1c3cec8ab56cdaf642ad43020fd7b777b80e Mon Sep 17 00:00:00 2001 From: raphael60650 Date: Wed, 16 Jun 2021 08:38:04 +0200 Subject: [PATCH 3/4] an error occured because of get_nodir and get_dir and /PATH/ --- source/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/__init__.py b/source/__init__.py index 37e0219..49cdefe 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -77,8 +77,8 @@ def __init__(self): subprocess.call(["./tools/wit/wit", "EXTRACT", get_nodir(path), "--DEST", directory_name] , creationflags=CREATE_NO_WINDOW, cwd=get_dir(path)) - if os.path.exists(self.path_mkwf + "/DATA/"): self.path_mkwf += "/DATA/" - print(self.path_mkwf) + if os.path.exists(self.path_mkwf + "/DATA"): self.path_mkwf += "/DATA" + print(self.path_mkwf, get_nodir(self.path_mkwf), get_dir(self.path_mkwf)) self.Progress(show=False) From a0fe6d63878d4af3a369a7a1bcaf6f133a3b8bb5 Mon Sep 17 00:00:00 2001 From: raphael60650 Date: Wed, 16 Jun 2021 08:46:13 +0200 Subject: [PATCH 4/4] removed debug line --- source/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/source/__init__.py b/source/__init__.py index 49cdefe..5a7c80e 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -78,7 +78,6 @@ def __init__(self): , creationflags=CREATE_NO_WINDOW, cwd=get_dir(path)) if os.path.exists(self.path_mkwf + "/DATA"): self.path_mkwf += "/DATA" - print(self.path_mkwf, get_nodir(self.path_mkwf), get_dir(self.path_mkwf)) self.Progress(show=False)