diff --git a/ryzom/tools/extract_r2_required/generate_sitem.py b/ryzom/tools/extract_r2_required/generate_sitem.py index 69ddabdda..d87f5db61 100644 --- a/ryzom/tools/extract_r2_required/generate_sitem.py +++ b/ryzom/tools/extract_r2_required/generate_sitem.py @@ -423,7 +423,7 @@ def generateParents(): print(path) with open(path, "w") as f: f.write("\n") - f.write("
\n") + f.write("\n") f.write(" \n") f.write(" \n") f.write(" \n") @@ -490,7 +490,7 @@ def generateParents(): # print(path) # with open(path, "w") as f: # f.write("\n") - # f.write("\n") + # f.write("\n") # f.write("\n") # f.flush() @@ -704,7 +704,7 @@ def generateSitems(): print(path) with open(path, "w") as f: f.write("\n") - f.write("
\n") + f.write("\n") if parent: f.write(" \n") f.write(" \n") @@ -808,7 +808,7 @@ def generateSitems(): os.makedirs(sbrickFolder) with open(sbrickFile, "w") as f: f.write("\n") - f.write("\n") + f.write("\n") f.write(" \n") f.write(" \n") f.write(" \n") @@ -864,7 +864,7 @@ def generateSitems(): os.makedirs(sphraseFolder) with open(sphraseFile, "w") as f: f.write("\n") - f.write("\n") + f.write("\n") f.write(" \n") f.write(" \n") f.write(" \n") diff --git a/ryzom/tools/extract_r2_required/merge_sitem_list.py b/ryzom/tools/extract_r2_required/merge_sitem_list.py index 780ba4ba7..f5ef71f7f 100644 --- a/ryzom/tools/extract_r2_required/merge_sitem_list.py +++ b/ryzom/tools/extract_r2_required/merge_sitem_list.py @@ -1,9 +1,33 @@ +import os + +sitemPath = "R:\\leveldesign\\game_element\\sitem" + +fileMap = {} + +def listPathExt(path, ext): + for p in os.listdir(path): + fp = path + "\\" + p + if os.path.isdir(fp): + listPathExt(fp, ext) + elif os.path.isfile(fp): + if fp.lower().endswith(ext): + fileMap[p] = fp + +listPathExt(sitemPath, ".sitem") + with open("sitem_list.txt", "w") as w: - with open("sitem_list_r2.txt", "r") as r: - for l in r: - w.write(l) - with open("sitem_list_wk.txt", "r") as r: - for l in r: - if len(l.strip()) > 0 and not l.startswith(";"): + with open("sitem_missing.txt", "w") as wm: + with open("sitem_list_r2.txt", "r") as r: + for l in r: w.write(l) + if not l.strip() in fileMap: + wm.write(l) + with open("sitem_list_wk.txt", "r") as r: + for l in r: + if len(l.strip()) > 0 and not l.startswith(";"): + w.write(l) + if not l.strip() in fileMap: + wm.write(l) + wm.flush() + w.flush() diff --git a/ryzom/tools/extract_r2_required/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index 68eb009de..7190f91a2 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -400,4 +400,4 @@ ictauwp.sitem iczauwv.sitem iczauwp.sitem icrav.sitem -icrap.sitam +icrap.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_list_wk.txt b/ryzom/tools/extract_r2_required/sitem_list_wk.txt index 9c8e3a460..132122292 100644 --- a/ryzom/tools/extract_r2_required/sitem_list_wk.txt +++ b/ryzom/tools/extract_r2_required/sitem_list_wk.txt @@ -38,7 +38,7 @@ iczauwp.sitem ; refugee icrav.sitem -icrap.sitam +icrap.sitem ; second heavy matis armor ;icmah2b.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_missing.txt b/ryzom/tools/extract_r2_required/sitem_missing.txt new file mode 100644 index 000000000..2464e9f16 --- /dev/null +++ b/ryzom/tools/extract_r2_required/sitem_missing.txt @@ -0,0 +1,169 @@ +iccm1bm.sitem +iccm1pd.sitem +iccm1sa.sitem +iccm1ss.sitem +icf.sitem +icf_2.sitem +icf_3.sitem +icfacb_3.sitem +icfacs_3.sitem +icfacv_3.sitem +icfm1bm.sitem +icfm1bm_2.sitem +icfm1bm_3.sitem +icfm1pd.sitem +icfm1pd_2.sitem +icfm1pd_3.sitem +icfm1ps.sitem +icfm1ps_2.sitem +icfm1ps_3.sitem +icfm1sa.sitem +icfm1sa_2.sitem +icfm1sa_3.sitem +icfm1ss.sitem +icfm1ss_2.sitem +icfm1ss_3.sitem +icfm2bm.sitem +icfm2bm_2.sitem +icfm2bm_3.sitem +icfm2ms.sitem +icfm2ms_2.sitem +icfm2ms_3.sitem +icfm2pp.sitem +icfm2pp_2.sitem +icfm2pp_3.sitem +icfm2sa.sitem +icfm2sa_2.sitem +icfm2sa_3.sitem +icfm2ss.sitem +icfm2ss_2.sitem +icfm2ss_3.sitem +icfsb.sitem +icfsb_2.sitem +icfsb_3.sitem +icfss.sitem +icfss_2.sitem +icfss_3.sitem +icm.sitem +icm_2.sitem +icm_3.sitem +icmacb_3.sitem +icmacs_3.sitem +icmacv_3.sitem +icmm1bm.sitem +icmm1bm_2.sitem +icmm1bm_3.sitem +icmm1pd.sitem +icmm1pd_2.sitem +icmm1pd_3.sitem +icmm1ps.sitem +icmm1ps_2.sitem +icmm1ps_3.sitem +icmm1sa.sitem +icmm1sa_2.sitem +icmm1sa_3.sitem +icmm1ss.sitem +icmm1ss_2.sitem +icmm1ss_3.sitem +icmm2bm.sitem +icmm2bm_2.sitem +icmm2bm_3.sitem +icmm2ms.sitem +icmm2ms_2.sitem +icmm2ms_3.sitem +icmm2pp.sitem +icmm2pp_2.sitem +icmm2pp_3.sitem +icmm2sa.sitem +icmm2sa_2.sitem +icmm2sa_3.sitem +icmm2ss.sitem +icmm2ss_2.sitem +icmm2ss_3.sitem +icmsb.sitem +icmsb_2.sitem +icmsb_3.sitem +icmss.sitem +icmss_2.sitem +icmss_3.sitem +ict.sitem +ict_2.sitem +ict_3.sitem +ictacb_3.sitem +ictacs_3.sitem +ictacv_3.sitem +ictm1bm.sitem +ictm1bm_2.sitem +ictm1bm_3.sitem +ictm1pd.sitem +ictm1pd_2.sitem +ictm1pd_3.sitem +ictm1ps.sitem +ictm1ps_2.sitem +ictm1ps_3.sitem +ictm1sa.sitem +ictm1sa_2.sitem +ictm1sa_3.sitem +ictm1ss.sitem +ictm1ss_2.sitem +ictm1ss_3.sitem +ictm2bm.sitem +ictm2bm_2.sitem +ictm2bm_3.sitem +ictm2ms.sitem +ictm2ms_2.sitem +ictm2ms_3.sitem +ictm2pp.sitem +ictm2pp_2.sitem +ictm2pp_3.sitem +ictm2sa.sitem +ictm2sa_2.sitem +ictm2sa_3.sitem +ictm2ss.sitem +ictm2ss_2.sitem +ictm2ss_3.sitem +ictsb.sitem +ictsb_2.sitem +ictsb_3.sitem +ictss.sitem +ictss_2.sitem +ictss_3.sitem +icz.sitem +icz_2.sitem +icz_3.sitem +iczm1bm.sitem +iczm1bm_2.sitem +iczm1bm_3.sitem +iczm1pd.sitem +iczm1pd_2.sitem +iczm1pd_3.sitem +iczm1ps.sitem +iczm1ps_2.sitem +iczm1ps_3.sitem +iczm1sa.sitem +iczm1sa_2.sitem +iczm1sa_3.sitem +iczm1ss.sitem +iczm1ss_2.sitem +iczm1ss_3.sitem +iczm2bm.sitem +iczm2bm_2.sitem +iczm2bm_3.sitem +iczm2ms.sitem +iczm2ms_2.sitem +iczm2ms_3.sitem +iczm2pp.sitem +iczm2pp_2.sitem +iczm2pp_3.sitem +iczm2sa.sitem +iczm2sa_2.sitem +iczm2sa_3.sitem +iczm2ss.sitem +iczm2ss_2.sitem +iczm2ss_3.sitem +iczsb.sitem +iczsb_2.sitem +iczsb_3.sitem +iczss.sitem +iczss_2.sitem +iczss_3.sitem