From f3aed5e32687d8fc18fe4e43e2eaf9c49a320c56 Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 20 Mar 2022 10:10:58 -0400
Subject: [PATCH 1/4] fixing 11181.pak3 and adding preparing Menu File function

---
 TOR_Test.py                           |   6 ++--
 ToolsTOR.py                           |   4 +++
 ToolsTales.py                         |  42 ++++++++++++++++----------
 __pycache__/ToolsTOR.cpython-38.pyc   | Bin 9685 -> 9774 bytes
 __pycache__/ToolsTales.cpython-38.pyc | Bin 22303 -> 22504 bytes
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/TOR_Test.py b/TOR_Test.py
index 0eed23f..9a8f74f 100644
--- a/TOR_Test.py
+++ b/TOR_Test.py
@@ -12,7 +12,7 @@ import lxml.etree as etree
 
 
 tool = ToolsTOR.ToolsTOR("TBL_All.json")
-tool.extract_All_Menu()
+tool.extract_Main_Archive()
 
 
 
@@ -29,4 +29,6 @@ tool.pack_Main_Archive()
 files = os.listdir("abcde_lauren")
 for file in files:
     
-    tool.extract_abcde_text("abcde_lauren/{}".format(file))
\ No newline at end of file
+    tool.extract_abcde_text("abcde_lauren/{}".format(file))
+    
+    
diff --git a/ToolsTOR.py b/ToolsTOR.py
index 47134e1..6ec56b2 100644
--- a/ToolsTOR.py
+++ b/ToolsTOR.py
@@ -341,6 +341,10 @@ class ToolsTOR(ToolsTales):
         print("Writing file %05d/%05d..." % (i, total_files))
         f.close()
         
+        #Copy File 11181
+        shutil.copy( self.datPathExtract+"BIN/11181.bin", self.datPathExtract+"PAK3/11181.pak3")
+        os.remove( self.datPathExtract+"BIN/11181.bin")
+        
     def pack_Main_Archive(self):
         sectors = [0]
         remainders = []
diff --git a/ToolsTales.py b/ToolsTales.py
index 93fb7a7..46db661 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -295,19 +295,6 @@ class ToolsTales:
         # Didn't match anything
         return "bin"
     
-    
-        def is_compressed(self, data):
-            if len(data) < 0x09:
-                return False
-        
-            expected_size = struct.unpack("<L", data[1:5])[0]
-            tail_data = abs(len(data) - (expected_size + 9))
-            if expected_size == len(data) - 9:
-                return True
-            elif tail_data <= 0x10 and data[expected_size + 9 :] == b"#" * tail_data:
-                return True # SCPK files have these trailing "#" bytes :(
-            return False
-    
     def get_pak_type(self,data):
         is_aligned = False
     
@@ -850,6 +837,25 @@ class ToolsTales:
 
         return [pointers_offset, pointers_value]
    
+    def prepare_Menu_File(self, file_definition):
+        
+        file_original = file_definition['File_Original']
+        file_name = os.path.basename(file_original)
+        file_number = file_name.split(".")[0]
+        extension = file_name.split(".")[-1]
+        
+        #Copy the files under Menu Folder
+        menu_path = "../Data/{}/Menu/New/".format(self.gameName) 
+        shutil.copy( file_definition['File_Original'], menu_path+file_name)
+        
+        #Extract if needed (PakComposer or other)
+        if "pak" in file_name:
+            
+            self.pakComposer_Comptoe(menu_path+file_name, "-d", "-{}".format(file_name[-1]), True, os.getcwd())
+            
+        
+        
+        
     def extract_Menu_File(self, file_definition):
         
         
@@ -896,12 +902,16 @@ class ToolsTales:
         
         
     def extract_All_Menu(self):
-        section_list = []
-        texts_offsets_list = []
-        texts_list = []
+
+        
+        self.mkdir("../Data/{}/Menu/New".format(self.gameName))
         for file_definition in self.menu_files_json:
            
             print("...{}".format(file_definition['File_Extract']))
+            
+            
+            self.prepare_Menu_File(file_definition)
+            
             self.extract_Menu_File(file_definition)
             
 
diff --git a/__pycache__/ToolsTOR.cpython-38.pyc b/__pycache__/ToolsTOR.cpython-38.pyc
index 89ed57ed606c9544280d83c33a9a6fc90ba920d6..8627ec75cd57f23ef163936ed5fb614ce01896c8 100644
GIT binary patch
delta 2830
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

delta 2851
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
E0IC$<tpET3

diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index c838c9e41dbb976690ba1596e0123c1a76ad8100..3706220cb3b91cf395aa658bc818958c410b814b 100644
GIT binary patch
delta 7638
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
F1ps8NaxVY?

delta 7214
zcmaE{o^k#<M!ry9UM>a(28I(UW=R?K8~OMc8RI6)GHzfDnS72hlRGrUImM-gF-kKf
zY_b!R6-zLKX87g~CKD#^D5h+qD5f%_m5fo7kFzY2j$$e^T*(;4o>iQm7nE3D#Ld9K
zP{a!&_$IfoF5~6_F~J1yWK*_Ac`y@92*YK-T(BOo$yeEY&A@yxfmICy1A_(w14A(j
z0|Nsa0~<pWtDmE<Yw+ZHHgf~8E--;ht0s!p$@|%h82Kj~aRewzFfcGgv6m#}xMk*~
z7D+NNFx+BHD*~G(0CFnt<i#BAYEmF^*4*rr%py&uB9J?7F{VINft7;2p))yva~)&U
z<o}#fj8c=Oxa@qv3OUj;b5i{hb5n1zB_@|-=I2F$MM5eIQlq$1^5c{9a|=rHQ;Q5h
zcCaKCr5E4g$jK}&0Xqn6I+);{yp*fWPn&^(L6hkgOIks(Nfc*FX>LJ0h^fg6c2toi
z$Tw_B@gOUsI8qWzAS~{b)Z&uNyhM=g$gZAT$-T|n4CGC75Frb8K~ZXAiY7b6JPVL8
z$j~Ay5X%}wfP(TCOG;u%BC=5+8T-jqJS)T;Kuksk28LfuHa;&w(WS{%Bs<xHS35uu
zWC2@gUO{4Vc9A1Uohe9!H9050I2G!LTRg=jiA5#x`DtmzsU<~V+c*mHGxJJPi;8bC
z79d-?c{6ViBctAAHhx=2h)GG6C8@=loDkPLfedFVt}4<6F&L9?G3S?-6#0TVIYpu%
z`@umACU`fu@K-T122TDjpcoYhlG6hbE}#HszQvrInRkmhH?iUtOIl`L3W^QP1^LBA
zQJ|1#%FT&l$}PCXl95>gA#<XbGICIyTqPL8R3Fd4!0;IqMvO%XAPbm^K%645jR?Dg
zKn@6IU|@Lp@Bjb*ewtiGpa3k&011bIh)|GM*itJ>Qu9)Zgg_#oP$)_VxrGxH$nlwZ
zCHX~>AS(nAVNw(XG9rq}BRq;ZIk5oj_M#Y&_Gpk!mgL-&;-VBVGc6}Ey(kqVl?LXQ
z6qgi4v6K{-<lJIRMe)~ikt9Y>um>_h%Kc$JWYA<UatDck;`<hVaY=qrWjrXF;*;}J
zQXxL_1j)OB2$1_Vxr;O=2Z=e`Me!CCrIuypmlnq-rlb_zVoZu+0WqSulS_+=Qu9jU
z3-XJjxRb&Xb23vf6Zd7Y5=Pd|9^%UxO$_{sKoJQpJc6AAyl=4-Cl_RcxgnmuMp4Wq
zxkg}Ky{nH~6mw=#MNz<HWl43$sL9@vQjAfP(<C+PqnMIXK65ZIFobxxdIkkMyA~CK
zoD7PuVrB*g246RiDCXR>46s4I!Om`=&`kpKT%Ft*qL@>Y(!spMyaMAW77z*My1Kc!
zMzN%(rKJ{uLamsIfq`MKdK7bhS<Xu~1_p*q1{P3en#?D~!yUy^l3Sd8i#aJXZ?b@#
zC}Z$sHMxfRm0W%=IT;uj+=`q*E&|2EOI8pIl&V6CKyC)7HszHpMc{-3PDh|nzr~!G
zRJ@V}kv5`uQ!5HmlS@)l;)^q@QlmIa5;Jq+vE=q!yqU$|va2YSwYWGnMSHTAymY;O
zNPd1!aY$lLYO!8=YDqjeZ5C(d=jqwx<R>TQ6x->+wSjbLvfSbUsVhj#jxVV!NJVoV
zv`i=h<>V-~%;NZh#OzxvAcqxof&2%~xnKfR0^i~l2AKu7^8={R_nX`#<-hs7)I-Ml
z0FahO5CKXIkSqrZn-Flui()BA%r*d%hG5dTs2-f=3lg)9iYmd(#Dc_ZP4qA<iU8#=
z9;7hj$}Emg%*jm8OHH}O3Mz|>qqx&DWr~VR;#2cViYlW73KFvo<1<ndQ&Ni{;XK(}
zR?|3&KRGccxilvc7X08s>J}TcEChQLOn`h_)Xl)aU_N=d?0=P_W{{`aK}08r0ILBL
zV1=NdDx9n(pBWa#mReDen3tl-R0J>fHJQOKkK#>Egj5{yd5O8HQM`Gn<>1-_%tg-X
zphAZ`wW6dbF}Wn(IWehj@=N(-4^S0ZWC)VuC@#p!EJ>{>xy6x`Seyzn4O(e}<<X7e
z1;rUCkiZr-Z=Rx%!srRAM50(iQY%Wp*}=f5C?6C7Oa>K2poD#k)fF6$Tp$(x;F=<e
z(<8MaEHS4vwK$5yE3qIkFSR(eNN=*El9?o^Vk<&8kUc%M1e}K4CQncj;RcmXx0o|h
zD~e1euUAs72NhIBUSOY;<QJC|W#*;dVl6MqEJ@Ym2M5(HPPlW6yg}-?Q}a^dAu5Z(
zHC9nENSLK4KfmM_b6H{zxHK*52gS_-kPKHwYDIh*#IY=S`6;Qlm`f^3Zn0P7=D6vB
z8Y1Ax0~4Sayd?=LFpJ|$^5a3_8eg7Sk^!wC+a@<ECo$%4exfYFtRfDw0F>v!3Hs$s
zP}MOXL_7cyuR*c_lNHpZRX}AHxI`>!1qn8Qq}f3%a29C+v4SVZt4pwf%M+K$wdw|p
zb(7brHyMK(AmA9(WG(`=C2uh%7L|e2gB=Sdz%J&rNl(p7ttcq6`!zXP!^#v?vS|tz
zDT0)OOL|bKgWCYNnDdKLZZQ{^6y4(RPOWq;D#|Z{Rtu9aY3S60>$NzLzPX^FW68<~
zRmD}A1)8GZ*nl*rf>IMxAOXAtlu$U+GV>C1K&hh$94MgL4B}336~~+uUmC@n6rU5t
zlw=geQIePrPJE!!E<L^=u_!S&iVGxIoSNuVl$;U8T9TMvY!t<oms(L0pLB~ERNwZ1
z>;Xq4B<72jgWL!X0WbjyhN5{43=A7K@7H|8#I_M6eQ5GV9cwMHJc!U_0taFgQ*j13
zP$2|Zrx*hR0}s<=F<l$(ogkf{LcJ((a;&a(21qAZB|>{Lm=7V~+J%`I7>YqP2pa<v
z0}I11Myn!l=?9KvP`d&W`@2BKgW{(s3sjKt-(m%4;G(cedJ^^EngSdJpbF*|m$SdG
zufJb>h@*Rv3P|5s5TObp)IfwXh{yvO!v~I>B2aRVVk-p|0>x2$V1s=!^HQCPQWLYI
znDUaMxWGx<4HR9F(vBr3GcPrY3lgZ-@foQVw-}3~SizM|5h(VGu7E<GDcK0(U2tfC
z{CtZSoH<JJ!Oe@}|C2B2O%DO3S53yE+aM=F3c6doS<un}oSCBd!48N|E6UFW3!s}S
zP@I}rl$;Ttn3Dr84~q>Z@73SRIAwCNfe~ZW<YfkO;<G`%24%FOlOPtz&!86c<l6??
zRv^wTE^x6Q56bBvpCy)*7K76!*zI5f>;azSqSVBa)Oc{=X1dwIkcCkVBnyq_TP&F+
zskvzGD*`1H@5xz4oyjjimV?x<ge0q5%&9r4D;bNPz{DY4G?0b><fOsFpvhJQ_QM=d
z4r2zjyTQHzxxMH)DCoE$v1u_m%vj!LDJc9oic`V8nc||yATAH6%MuS2E4l@;u>?eb
zjR3i+=pBg5J9(qA2&3!fW5z0s#$aI(u@YLAux93^q*fHY1=+|5PC7*(X@s-mCd-<Z
z>w&~H8Np!<^(i>ztYj<#TM3dzXi1uU$keYMECwdNf(^gL19fUV$lYkRq=Nzn)Nujj
z8*np0ldb4IC}=oS^Gb75ixNvxZ?P2T7nR&%0c*bi@*245$^{9hpCAE{V{UPQ(qwTx
z*qU2h;8F?9j^ZxO%PcHS1t+;EcCg1&i*K=}<(KBAMDf8oJn>*YA_g^?A$|l~01jJl
z!VxS=&CM@MjZY~p$jMAjEJ-bn0Qmvbxn*EtVdU7%Xa1f^8|?o#3=9k_8E^6BrskD`
z({p@5VhObL0ht9(PnDB3tTw5F)WZT8k%mB`h~TZC{NF0lh=q}X0US`bI6&z--Zc-}
zJ7xt*fOUWgxCIT9yR4;oqBuaE+<3p#@*>8`8?8N4Kvh%}t7B1aKB%9a3<^cCCqa&e
zL=vho6F|O%m2d(KMXx|Qrhte?AmToV0M&iqMnlm<5La(<oQ;IRJrEPrq$v6UVu7kT
zO_?Gk5L+EY$bkq@@D)u4v1U(RW}}%1ZbpDBuOv`nU<dUC6LWHkLO@Eu^%=s&paKWd
zm<82ZMT<a6_(24y@G1h8rI0!fRJ3Z!LQ)O$WCL4K#;D0|whE%)JjMr2q{Z>zK5^9K
zYFjA}q?Q>d=AyWuisCa<qB!BP8pRD0&P{~msG?^eN3#`|fJ&dDI}DTW+G@x}apWaI
zipwZ2P=gQJ(gatRPZ=gF+ZjW~a+pBz$U8aFPL#1^a=G0hEpA3oGJ?1p94BA`6u-B4
zGxLg5i%J}Ga(q+sN>5Ktwl6URDK7#AswQI*cu)bX987@q@I&+jgL;RcG;w}1heN8S
z49Hel5CK*RCcw)1Aj%zca=<z+O`hhELX_(4%#z}(lczZ-PA&_Uo2(V0XbP?%n2Y2<
zwkUuIMG%3_Qck#~Hz)6KoX8k8*~=-sULRDRuor<n2ybE*flCA#P<*4evynzp!2SUf
zU{8rc+te<p$wid~C8;T{N%{FDFF;8gq=<o$gHeu=g^`Jo<zJNote>@6!Fewu<Mhe*
zT)e>f6<Spk-2~YU(gw*kAPc}b`|o65*EmMK$!lDj>Oq-6lNnr&7Qs_4)PN}V)ST4Z
z)Vz|Fj73l3X2FdSWkzaRh%gj^^Bg#*fioF6_e}+Lm5Zi<G=o~An!-h(40MYVG{6L^
z<Liryet{&xnc*sk#Rm#{aL}26xS$dhQZI3WB)C8XIIn^Guy7Yc!hRu02Pm6q3W8JR
zE$}ECsNE68m7AZEnN}HJk(&c<o!?>wSzlaV^be#5RKVO~1!u6LOCW(SAOakI0w5a&
zK?FEEa;D~_LJQ;-AT=vN1UQUUL25vOb4v&siSda^$tjT1{Uay_?LgzMOahET%q)yh
zxOuhvN=9x_PX}Cd76nd@_jFJPbxk!Hi@?PRq^<(H87&$uCm-|lU<0Ww(wkhvCOg^C
zOHmnK{}+9RyA13+kjuca?>D*B%TXCD1|~oj6n%p$hN}yheACMwv(iLVOW?i>nwtVa
zX#!SlYVsDjg3JX)c@enG1p5foRfZINo*-FpS1Sj^0!Jx0!a+SRaKfmEb+^EEXgoNE
zqBubHX*{S*69R=fsQVSgla~}<kXjU<l#`zf8XhP~EdbY;(0&@Il)S|Ws;J{jQj1HX
zcruIQlM++nlk-dSN}@!;y5iv#E~EsE5=qJl&ri-qh(mk~8Z?aJNzczuiHBC%;6Tu1
zhC~vm$}iFdISdq(w?sf)+v0-M<jlkzxJjy$bA8e_PxMn~^x^=iWCRi5RKNyefvZw>
zMh1o`kpRf3XFQ~X8y^fB7mecaONtLjEsA#nc{YkA806X443n7x91TJ7ugM7Ra}<GU
z%$3YV;6MV6p@Q=S*sX}VJ9lzPfL(YL2dJ0^Rog{~91E?PBYb^|z<HMwoOg?iKrTeY
z7Xyg<2^4+c)*~Vd3KVHfe&8!oUj%BWM2VmUF1P_y^cSSh0AvEVZJ`J9G9-3Ey(@S~
zMzMloytoK7m{SDGhDB(3&lqF`IJgC2c@N~Fc(=?Prqs~MlL8~_K|=<hRsyJ+F9uaV
z=?t}u=?t|@=?t~ZH4Iq{E)1~>wJar!DU1u4YFJX3BpDVmHZw9Z)G#byu3=fo$jDGA
zl)@0qpvml4#j2;LS6y2KiZ)G_B5-Q~T=;`(w<1$U1_s!m71-}WC8-sGCB@L*dNGpM
zO+fAj=Rz<6_JIJ*2aY*8@gQF`f$|hco&j2Fa4`unR!L9(7%V*bQILlg&Ki;*Y7(f5
z1XX&ylS6`&M6oKLd^%W?al+)M!D)ez$}kF6i1{XF<~bH6XJnS8Mj;yrs-=s}LGH&^
zPjW#9_}vq8Q>RRx6B3{WHkGkR36};A&`>o<`P|83p~|AGK?wuYHq&Gb(PRWS-82m+
z`-Q6V+yKd30}&S(CfA253Pf=il;$OultKo7&ofNk5Gqoy1yY~`B5XhesN^lO2eJG>
z1b8F?G(uhk>ZTTzgT#741ZX%7GO9QM#09teR)JWcK0LSsS#%e~1@(uDz=<B5{G~y@
z0=FLIK`aHv2nL2Ca2o>bUuBS>7Ki}n9Z>oxG6QkJ!Dj(tS%L^F5CMv4NFD{VKuMwq
zRG@-pwTi<gF9=g(bf0`YOw&}CgPVhygN1_=EUhUD8O;L?92d!h+z9Tq^MH&5H%Y*i
ftL<d<aCOGnll{ZprR+dbAd``7gIGCvL%0P1n%&F%


From 7eb2279edc9d0de261aa10c7b2ed21b0d7df820f Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 20 Mar 2022 10:17:55 -0400
Subject: [PATCH 2/4] Add step to remove folder before unpacking with
 pakcomposer

---
 TOR_Test.py   | 2 +-
 ToolsTales.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/TOR_Test.py b/TOR_Test.py
index 9a8f74f..e625a1e 100644
--- a/TOR_Test.py
+++ b/TOR_Test.py
@@ -12,7 +12,7 @@ import lxml.etree as etree
 
 
 tool = ToolsTOR.ToolsTOR("TBL_All.json")
-tool.extract_Main_Archive()
+tool.extract_All_Menu()
 
 
 
diff --git a/ToolsTales.py b/ToolsTales.py
index 46db661..d8388f2 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -851,6 +851,7 @@ class ToolsTales:
         #Extract if needed (PakComposer or other)
         if "pak" in file_name:
             
+            shutil.rmtree(menu_path+file_number)
             self.pakComposer_Comptoe(menu_path+file_name, "-d", "-{}".format(file_name[-1]), True, os.getcwd())
             
         

From 98af0d6b8fce6aaf1b4390685b650cc3467cae9f Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 20 Mar 2022 10:41:00 -0400
Subject: [PATCH 3/4] fixing path issue with pakComposer_Comptoe

---
 TOR_Test.py                           |   2 ++
 ToolsTales.py                         |  21 +++++++++++++--------
 __pycache__/ToolsTales.cpython-38.pyc | Bin 22504 -> 22582 bytes
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/TOR_Test.py b/TOR_Test.py
index e625a1e..154374a 100644
--- a/TOR_Test.py
+++ b/TOR_Test.py
@@ -12,6 +12,8 @@ import lxml.etree as etree
 
 
 tool = ToolsTOR.ToolsTOR("TBL_All.json")
+tool.pakComposer_Comptoe("11181.pak3", "-d", "-3", True, r"G:\TalesHacking\PythonLib_Playground\Data\TOR\Menu\New")
+
 tool.extract_All_Menu()
 
 
diff --git a/ToolsTales.py b/ToolsTales.py
index d8388f2..8afe391 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -60,23 +60,30 @@ class ToolsTales:
     # action is -d or -c
     # fileType : -0, -1 or -3
     # basePath is the location of the PAK file you want to compress/decompress
-    def pakComposer_Comptoe(self, fileName, action, fileType, do_comptoe, cwd):
+    def pakComposer_Comptoe(self, fileName, action, fileType, do_comptoe, working):
           
         #Delete the file if already there    
         if (action == '-c'):
             if os.path.exists(fileName):
                 os.remove( fileName.replace(".pak{}", fileType[1]))
-                
+        else:
+            shutil.rmtree(fileName.split(".")[0])
+            
         #Run Pakcomposer with parameters
         args = [ "pakcomposer", action, fileName, fileType]
+        
         if do_comptoe:
             args.append("-u")
-        
+            args.append("-x")
+            
+
         listFile = subprocess.run(
             args,
-            cwd=cwd
+            cwd=working
             )
         
+        print(listFile)
+        
     def fps4_action(self, action, b_file, dat_file, destination):
         
         fps4.dump_fps4(b_file, dat_file, destination)
@@ -849,10 +856,8 @@ class ToolsTales:
         shutil.copy( file_definition['File_Original'], menu_path+file_name)
         
         #Extract if needed (PakComposer or other)
-        if "pak" in file_name:
-            
-            shutil.rmtree(menu_path+file_number)
-            self.pakComposer_Comptoe(menu_path+file_name, "-d", "-{}".format(file_name[-1]), True, os.getcwd())
+        if "pak" in file_name:          
+            self.pakComposer_Comptoe(file_name, "-d", "-{}".format(file_name[-1]), True, menu_path)
             
         
         
diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index 3706220cb3b91cf395aa658bc818958c410b814b..1401b5117534e275eca2dad692614e0649b7bf3b 100644
GIT binary patch
delta 3718
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
LeVEwf&Ecj1+`W9f

delta 3565
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
St217kJU85(aqr}(;ei0wC0X78


From f4ff96c6d5876bb5ae8f2f9a6d93ba6cee6383cd Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 20 Mar 2022 12:48:37 -0400
Subject: [PATCH 4/4] Adding decompress with comptoe

---
 TOR_Test.py                           |   2 -
 ToolsTales.py                         |  53 ++++++++++++++++----------
 __pycache__/ToolsTales.cpython-38.pyc | Bin 22582 -> 23231 bytes
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/TOR_Test.py b/TOR_Test.py
index 154374a..e625a1e 100644
--- a/TOR_Test.py
+++ b/TOR_Test.py
@@ -12,8 +12,6 @@ import lxml.etree as etree
 
 
 tool = ToolsTOR.ToolsTOR("TBL_All.json")
-tool.pakComposer_Comptoe("11181.pak3", "-d", "-3", True, r"G:\TalesHacking\PythonLib_Playground\Data\TOR\Menu\New")
-
 tool.extract_All_Menu()
 
 
diff --git a/ToolsTales.py b/ToolsTales.py
index 8afe391..0f50d75 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -60,30 +60,42 @@ class ToolsTales:
     # action is -d or -c
     # fileType : -0, -1 or -3
     # basePath is the location of the PAK file you want to compress/decompress
-    def pakComposer_Comptoe(self, fileName, action, fileType, do_comptoe, working):
+    def pakComposer_Comptoe(self, file_name, action, file_type, do_comptoe, working):
           
-        #Delete the file if already there    
+        #Delete the file if already there   
+        file_number = file_name.split(".")[0]
         if (action == '-c'):
-            if os.path.exists(fileName):
-                os.remove( fileName.replace(".pak{}", fileType[1]))
+            if os.path.exists(file_name):
+                os.remove( file_name.replace(".pak{}", file_type[1]))
         else:
-            shutil.rmtree(fileName.split(".")[0])
+            
+            if os.path.exists(working+"/"+file_number):
+                shutil.rmtree(working+"/"+file_number)  
             
         #Run Pakcomposer with parameters
-        args = [ "pakcomposer", action, fileName, fileType]
-        
-        if do_comptoe:
-            args.append("-u")
-            args.append("-x")
-            
+        args = [ "pakcomposer", action, file_name, file_type, "-x"]
 
         listFile = subprocess.run(
             args,
             cwd=working
             )
         
-        print(listFile)
-        
+        if do_comptoe:
+            
+            files = [ele for ele in os.listdir(working+"/"+file_number) if ".compress" in ele]
+            for ele in files:
+                
+                ctype=0
+                with open(working+"/{}/".format(file_number)+ele, "rb") as f:
+                    ctype = ord(f.read(1))
+            
+                args = ["comptoe", "-d{}".format(ctype), ele, ele.split(".")[0]+"d.unknown"]
+                listFile = subprocess.run(
+                args,
+                cwd=working+"/"+file_number
+                )
+            
+            
     def fps4_action(self, action, b_file, dat_file, destination):
         
         fps4.dump_fps4(b_file, dat_file, destination)
@@ -844,16 +856,13 @@ class ToolsTales:
 
         return [pointers_offset, pointers_value]
    
-    def prepare_Menu_File(self, file_definition):
+    def prepare_Menu_File(self, file_original):
         
-        file_original = file_definition['File_Original']
         file_name = os.path.basename(file_original)
-        file_number = file_name.split(".")[0]
-        extension = file_name.split(".")[-1]
         
         #Copy the files under Menu Folder
         menu_path = "../Data/{}/Menu/New/".format(self.gameName) 
-        shutil.copy( file_definition['File_Original'], menu_path+file_name)
+        shutil.copy( file_original, menu_path+file_name)
         
         #Extract if needed (PakComposer or other)
         if "pak" in file_name:          
@@ -911,13 +920,15 @@ class ToolsTales:
 
         
         self.mkdir("../Data/{}/Menu/New".format(self.gameName))
+        
+        #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]))
+        res = [ self.prepare_Menu_File(ele) for ele in files_to_prepare]
+        
         for file_definition in self.menu_files_json:
            
             print("...{}".format(file_definition['File_Extract']))
             
-            
-            self.prepare_Menu_File(file_definition)
-            
             self.extract_Menu_File(file_definition)
             
 
diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index 1401b5117534e275eca2dad692614e0649b7bf3b..f8dd4e738f9860a788475aa67b8d5ccaaeb0bbdd 100644
GIT binary patch
delta 4882
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

delta 4717
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
C3vr47