diff --git a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv index 8f69a3ecd..6b7c08d0e 100644 --- a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv +++ b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv @@ -366,6 +366,7 @@ iccahg ge_hom_armor04_hand ge_hof_armor04_hand common heavy armor gloves iccahh ge_hom_casque00 ge_hof_casque00 common heavy armor helmet iccahp ge_hom_armor04_pantabottes ge_hof_armor04_pantabottes common heavy armor pants iccahs ge_hom_armor04_armpad ge_hof_armor04_armpad common heavy armor sleeves +iccahv ge_hom_armor04_gilet ge_hof_armor04_gilet common heavy armor vest iccamv ge_hom_armor03_gilet ge_hof_armor03_gilet common medium armor vest iccamb ge_hom_armor03_bottes ge_hof_armor03_bottes common medium armor boots iccamg tr_hom_underwear_hand tr_hof_underwear_hand armor gloves hands @@ -378,13 +379,13 @@ iccalg tr_hom_underwear_hand tr_hof_underwear_hand armor gloves hands iccalp ge_hom_armor02_pantabottes ge_hof_armor02_pantabottes common light armor pants iccals ge_hom_armor02_armpad ge_hof_armor02_armpad common light armor sleeves iccalv ge_hom_armor02_gilet ge_hof_armor02_gilet common light armor vest -icfauwv tr_hom_underwear_gilet fy_hof_underwear_gilet underwear armor vest +icfauwv tr_hom_underwear_gilet fy_hof_underwear_gilet fyros underwear armor vest icfauwp fy_hom_underwear_pantabottes fy_hof_underwear_pantabottes fyros underwear armor pants -icmauwv tr_hom_underwear_gilet ma_hof_underwear_gilet underwear armor vest +icmauwv tr_hom_underwear_gilet ma_hof_underwear_gilet matis underwear armor vest icmauwp ma_hom_underwear_pantabottes ma_hof_underwear_pantabottes matis underwear armor pants -ictauwv tr_hom_underwear_gilet tr_hof_underwear_gilet underwear armor vest +ictauwv tr_hom_underwear_gilet tr_hof_underwear_gilet tryker underwear armor vest ictauwp tr_hom_underwear_pantabottes tr_hof_underwear_pantabottes tryker underwear armor pants -iczauwv tr_hom_underwear_gilet zo_hof_underwear_gilet underwear armor vest +iczauwv tr_hom_underwear_gilet zo_hof_underwear_gilet zorai underwear armor vest iczauwp zo_hom_underwear_pantabottes zo_hof_underwear_pantabottes zorai underwear armor pants icrav tr_hom_refugee_gilet tr_hof_refugee_gilet refugee armor vest icrap tr_hom_refugee_pantabottes tr_hof_refugee_pantabottes refugee armor pants diff --git a/ryzom/tools/extract_r2_required/sbrick_index.tsv b/ryzom/tools/extract_r2_required/sbrick_index.tsv index 0ebc5a161..bea35018a 100644 --- a/ryzom/tools/extract_r2_required/sbrick_index.tsv +++ b/ryzom/tools/extract_r2_required/sbrick_index.tsv @@ -72,7 +72,7 @@ BCCAEC 2 bccahg iccahg bccaea02 BCCAEC 3 bccahh iccahh bccaea03 BCCAEC 4 bccahp iccahp bccaea04 BCCAEC 5 bccahs iccahs bccaea05 -BCCAEC 06 bccaea06 iccahv __missing +BCCAEC 6 bccahv iccahv bccaea06 BCCAEC 7 bcbahb_m __missing BCCAEC 8 bcbahg_m __missing BCCAEC 9 bcbahh_m __missing @@ -1158,6 +1158,8 @@ BCRAEA 37 bcraea37 icravr BCRAEA 38 bcraea38 icravt BCRAEA 39 bcraea39 icravv BCRAEA 40 bcraea40 icravw +BCRAEA 41 bcrav icrav +BCRAEA 42 bcrap icrap BCRMEA 12 bcrmea06 icrm1pd BCRMEA 13 bcrmea10 icrm1ss __missing BCRMEA 14 bcrmea15 icrm2ms diff --git a/ryzom/tools/extract_r2_required/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index ade19cf44..68eb009de 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -378,6 +378,7 @@ iccahg.sitem iccahh.sitem iccahp.sitem iccahs.sitem +iccahv.sitem iccamv.sitem iccamb.sitem iccamg.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_list_wk.txt b/ryzom/tools/extract_r2_required/sitem_list_wk.txt index 2a92268e6..9c8e3a460 100644 --- a/ryzom/tools/extract_r2_required/sitem_list_wk.txt +++ b/ryzom/tools/extract_r2_required/sitem_list_wk.txt @@ -8,6 +8,7 @@ iccahg.sitem iccahh.sitem iccahp.sitem iccahs.sitem +iccahv.sitem ; boss medium armor iccamv.sitem @@ -38,3 +39,11 @@ iczauwp.sitem ; refugee icrav.sitem icrap.sitam + +; second heavy matis armor +;icmah2b.sitem +;; icmah2g.sitem +;; icmah2h.sitem +;icmah2p.sitem +;icmah2s.sitem +;icmah2v.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_parsed.tsv b/ryzom/tools/extract_r2_required/sitem_parsed.tsv index 73d2ff0d4..9b8d19dfd 100644 --- a/ryzom/tools/extract_r2_required/sitem_parsed.tsv +++ b/ryzom/tools/extract_r2_required/sitem_parsed.tsv @@ -366,6 +366,7 @@ iccahg iccahg item crafted common heavy armor gloves hands iccahh iccahh item crafted common heavy armor helmet iccahp iccahp item crafted common heavy armor pants iccahs iccahs item crafted common heavy armor sleeves +iccahv iccahv item crafted common heavy armor vest iccamv iccamv item crafted common medium armor vest iccamb iccamb item crafted common medium armor boots iccamg iccamg item crafted common medium armor gloves hands diff --git a/ryzom/tools/extract_r2_required/sitem_shape_matcher.py b/ryzom/tools/extract_r2_required/sitem_shape_matcher.py index c66321af9..03e20aa81 100644 --- a/ryzom/tools/extract_r2_required/sitem_shape_matcher.py +++ b/ryzom/tools/extract_r2_required/sitem_shape_matcher.py @@ -102,10 +102,14 @@ with open("match_sitem_shape.tsv", "w") as f: # print(tag) if not matches and femaleShape[0].endswith("_hof_underwear_gilet") and maleShape[0] == "tr_hom_underwear_gilet": matches = True + if "ma_hof_armor04_" in femaleShape[0]: + print(femaleShape[0]) + maleShape[0] = femaleShape[0].replace("ma_hof_armor04_", "ge_hom_armor06_") + matches = True # Temporary if matches: f.write(sitem[0] + "\t" + maleShape[0] + "\t" + femaleShape[0]) - for tag in maleShape[1:]: - if tag != "male": + for tag in femaleShape[1:]: + if tag != "female": f.write("\t" + tag) f.write("\n") else: