From 050415dda965b48dc03937b2a8740969ba93fa2a Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 27 Mar 2022 20:35:17 -0400
Subject: [PATCH] Extracting 00016_0000d

---
 TODDC_Test.py                         |  50 +++++++++++++++++++++++++-
 ToolsTODDC.py                         |  27 ++------------
 ToolsTales.py                         |  20 ++++++-----
 __pycache__/ToolsTODDC.cpython-38.pyc | Bin 1622 -> 928 bytes
 __pycache__/ToolsTales.cpython-38.pyc | Bin 23413 -> 23748 bytes
 5 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/TODDC_Test.py b/TODDC_Test.py
index 2f510f6..ed3c0cd 100644
--- a/TODDC_Test.py
+++ b/TODDC_Test.py
@@ -11,8 +11,56 @@ import os
 import lxml.etree as etree
 
 
-tool = ToolsTODDC.ToolsTODDC("toddc.tbl")
+tool = ToolsTODDC.ToolsTODDC("TBL_All.json")
 
 ele = tool.menu_files_json[0]
 tool.extract_Menu_File(ele)
 
+repo_name = "Tales-Of-Destiny-DC"
+tblFile = "TBL_ALL.json"
+with open("../{}/Data/Misc/{}".format(repo_name, tblFile), encoding="utf-8") as f:
+    jsonRaw = json.load(f)
+    jsonTblTags ={ k1:{ int(k2) if (k2 != "TBL") else int(k2):v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+    #jsonTblTags = {k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+    
+
+TAGS = jsonTblTags['TAGS']
+
+with open("../Data/Tales-Of-Destiny-DC/Menu/New/00016/00016_0000d.unknown", "rb") as fileRead:
+    
+    
+    fileRead.seek(0x3C87D)
+    b = fileRead.read(1)
+        
+    b = ord(b)
+    finalText=""
+    if (b >= 0x99 and b <= 0x9F) or (b >= 0xE0 and b <= 0xEB):
+        c = (b << 8) + ord(fileRead.read(1))
+       
+        # if str(c) not in json_data.keys():
+        #    json_data[str(c)] = char_index[decode(c)]
+        try:
+            finalText += (jsonTblTags['TBL'][str(c)])
+        except KeyError:
+            b_u = (c >> 8) & 0xff
+            b_l = c & 0xff
+            finalText += ("{%02X}" % b_u)
+            finalText += ("{%02X}" % b_l)
+    elif b == 0x1:
+        finalText += ("\n")
+    elif b in (0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xB, 0xC, 0xD, 0xE, 0xF):
+        b2 = struct.unpack("<L", fileRead.read(4))[0]
+        if b in TAGS:
+            tag_name = TAGS.get(b)
+            
+            tag_param = None
+            tag_search = tag_name.upper()
+            if (tag_search in jsonTblTags.keys()):
+                tags2 = jsonTblTags[tag_search]
+                tag_param = tags2.get(b2, None) 
+            if tag_param != None:
+                finalText += tag_param
+            else:
+                finalText += ("<%s:%08X>" % (tag_name, b2))
+        else:
+            finalText += "<%02X:%08X>" % (b, b2)
\ No newline at end of file
diff --git a/ToolsTODDC.py b/ToolsTODDC.py
index e06df4c..f43525a 100644
--- a/ToolsTODDC.py
+++ b/ToolsTODDC.py
@@ -20,29 +20,6 @@ class ToolsTODDC(ToolsTales):
     
     def __init__(self, tbl):
         
-        self.gameName = "TODDC"
-        self.repo_name = "Tales-of-Destiny-DC"
-        self.basePath = os.getcwd()
-        
-        
-        with open("../Tales-of-Destiny-DC/Data/Misc/toddc.tbl", encoding="utf-8") as f:
-            data = f.readlines()
-            hex_list = [bytes.fromhex(str(ele.split("=",1)[0])) for ele in data]
-            self.itable = dict([[ele.split("=",1)[1].replace("\n",""), bytes.fromhex(ele.split("=",1)[0])] for ele in data])
-            
-     
-            
-        #with open("../{}/Data/{}/Misc/{}".format(repo_name, gameName, tblFile)) as f:
-        #    jsonRaw = json.load(f)
-        #    self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
-          
-        #self.itable = dict([[i, struct.pack(">H", int(j))] for j, i in self.jsonTblTags['TBL'].items()])
-        #self.itags = dict([[i, j] for j, i in self.jsonTblTags['TAGS'].items()])
-        #self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAMES'].items()])
-        #self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
-        
-        
-        with open("../{}/Data/Menu/MenuFiles.json".format(self.repo_name, self.gameName)) as f:
-           self.menu_files_json = json.load(f)
+        super().__init__("TODDC", tbl, "Tales-of-Destiny-DC")
            
-        
\ No newline at end of file
+        
diff --git a/ToolsTales.py b/ToolsTales.py
index ecf6fe3..ffa6acd 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -31,17 +31,21 @@ class ToolsTales:
         self.repo_name = repo_name
         self.basePath = os.getcwd()
         
-        with open("../{}/Data/{}/Misc/{}".format(repo_name, gameName, tblFile)) as f:
+        with open("../{}/Data/Misc/{}".format(repo_name, tblFile), encoding="utf-8") as f:
             jsonRaw = json.load(f)
-            self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            if self.repo_name == "Tales-of-Destiny-DC":
+                self.jsonTblTags ={ k1:{ int(k2) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            else:
+                self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            
           
         self.itable = dict([[i, struct.pack(">H", int(j))] for j, i in self.jsonTblTags['TBL'].items()])
         self.itags = dict([[i, j] for j, i in self.jsonTblTags['TAGS'].items()])
-        self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAMES'].items()])
-        self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
+        self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAME'].items()])
+        self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLOR'].items()])
         
         
-        with open("../{}/Data/{}/Menu/MenuFiles.json".format(repo_name, gameName)) as f:
+        with open("../{}/Data/Menu/MenuFiles.json".format(repo_name)) as f:
            self.menu_files_json = json.load(f)
            
            
@@ -469,7 +473,7 @@ class ToolsTales:
                     tag_name = TAGS.get(b)
                     
                     tag_param = None
-                    tag_search = tag_name.upper()+'S'
+                    tag_search = tag_name.upper()
                     if (tag_search in self.jsonTblTags.keys()):
                         tags2 = self.jsonTblTags[tag_search]
                         tag_param = tags2.get(b2, None) 
@@ -913,7 +917,7 @@ class ToolsTales:
         
         #Write to XML file
         txt=etree.tostring(root, encoding="UTF-8", pretty_print=True)
-        with open(file_definition['File_XML'].replace("/{}".format(self.repo_name),""), "wb") as xmlFile:
+        with open(file_definition['File_XML'].replace("/{}".format(self.repo_name),"").replace("/Data","/Data/{}".format(self.repo_name)), "wb") as xmlFile:
             xmlFile.write(txt)
         
         
@@ -922,7 +926,7 @@ class ToolsTales:
 
         
         print("Extracting Menu Files")
-        self.mkdir("../Data/{}/Menu/New".format(self.gameName))
+        self.mkdir("../Data/{}/Menu/New".format(self.repo_name))
         
         #Prepare the menu files (Unpack PAK files and use comptoe)
         files_to_prepare = list(dict.fromkeys([ele['File_Original'] for ele in self.menu_files_json]))
diff --git a/__pycache__/ToolsTODDC.cpython-38.pyc b/__pycache__/ToolsTODDC.cpython-38.pyc
index 21457e040333a37170f5c2ac5fc3811162ee4ff1..032585fb482c54d6de939649e5140639c53ffe9b 100644
GIT binary patch
delta 307
zcmcb{vw)p1l$V!_fq{X+<E2B=Z^n&$l8o8RAU*>FL$M4414Al96k`fQ6jM7x8e<A$
z3R4S56mvTR3qur3FoP!ZEv}IK{G8$te-{_$WG1LS5CvkhGB7ZJ%qkXPU|=X=Xl7Wz
zn8H}Yn8LJ>nUNud0i=KOKSo(SO{QC{#ia$QMYlNO<1_OzOXA}-nQpNZr{<*HVlGL_
zS;=^dGd?~!C$YFVK7QroJ52ThMVt%_45A=6f-GWSn*4!9lu46yG6$=w3P|b}FH}Qv
zYEDjkd=Vc50|SKM0kQZeJFyx_-D1fq&d<BWR$Nk4np|>=tvI8!Bs1q0Q-1N}9@Z8C
NgdQ-9f3gCb836iVNDcr1

delta 1062
zcmZ3$evOAOl$V!_fq{Wx>s^PW8*Cf-BpK_O7#J8F7#J9eMHm<uQW>HcQy8L{QW#U1
zS{S03Q<#GpG+AzOh2-bw6o>e`xHu<+)PsxwVO9nP22KVB24|4|4h9B>6vi5cc!m_F
z8ishr5~c;r3mIw{;#o>qQ<zg&QdoPL`VDHCYM2(VEo7)=PGL)7Z(*pfVRm6?W~^l?
zVNc-z2|)PGAcHu<8B7@h8G;xh7)n@EI2Ul%Fk~^-Fk~?-WNK#Y7pi3{;ab35!?X~j
zmIt9Wg&~+hlgsZGE7-wR!Xb${sl~eaX}T_{#U+_}mAWp@Ra$y_`e5;TR0(~T#F9jP
z-^}7<{gV8Ylw`e<q?{_&(vmb?3r)sb9I1K9`6-!s>B)>B??W*tL_nbs3<?D`1_p+7
zh8l)gxmv~&h6RizOf`%Pm{S;17#A|7FiA2rGcIJD$W+J@%%I8qi_!L_1<0f#5TVI(
zi#4gTB(?Y!ds<O`ZboXwE#~5qqFb!R1v!}|E17OF=^5N&PR&VO$xtN3z%cnPqka7?
zE}NXp;*#Y2+yXl}ko7DK3=C`xObk`(h$z#GkI&4@EQycTv&qR%PRuE`(?jUO?Gr1Q
zPmF3AYZw<WK>ffd$*_Pig(-!3AyY{`(*kBBDHchFg^cM;Q17u8aWXJ46oJy)Ek>?e
z3{X!N@i8zk++r_EEyzhsPA%dFso?<;{2)RIP6&fopfo9u;x9QpJ^kuhXf)NQ=9TLE
zrskEpW#*(7>tz+^=V|iZ;z&=-P4!F6O})iglv<D<p9f+x<rm*#OHVCHE>F3|k(5}R
z8jx6$af>CtAT<x9EHNb~GcUFH7E4NIa>*^W%#y^UoYY%vY57IDi6ysKKqlW}$;nSl
zxy7HGnpYa12C^`|9we^GdW)qvH7D&Bb4gOpEylE4EGda4iMKd1QY+#?kpqe>aEvh&
zf&6rf0~Q^kAdi7O%)rFP$i~RU%*V*V$j2zhC&pMMj3xT~G+98JLEedvzr__FpF25-
zNla7=6i^^zkS&_r!(<>;qy!3Tw&IeaQjn*LGfGP`bBd%G7#JpBV`>q=(38b%1^|3$
B4~PH&

diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index 9141a6d6ed0f057d9c8f34f22484a874cd54ea19..2e7f96d3d79d39c8961b4890bd3885ebd30a0e86 100644
GIT binary patch
delta 7391
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

delta 7183
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