From 725206c678cf35f16791f9881e5fd865226d9ab9 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 29 Jun 2021 14:48:51 +0800 Subject: [PATCH] Add boss armor to generated sheets --- .../extract_r2_required/match_sitem_shape.tsv | 18 +++++ .../merge_creature_list.py | 3 +- .../extract_r2_required/merge_sitem_list.py | 3 +- ryzom/tools/extract_r2_required/readme.txt | 2 +- .../extract_r2_required/sbrick_index.tsv | 32 ++++----- .../scheme_shape_parser.py | 14 ++-- .../extract_r2_required/shape_parsed.tsv | 72 +++++++++---------- .../tools/extract_r2_required/sitem_list.txt | 18 +++++ .../extract_r2_required/sitem_list_wk.txt | 26 +++++++ .../extract_r2_required/sitem_parents.tsv | 28 -------- .../extract_r2_required/sitem_parents.txt | 28 -------- .../extract_r2_required/sitem_parsed.tsv | 18 +++++ 12 files changed, 144 insertions(+), 118 deletions(-) diff --git a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv index 38426e688..a73dcec03 100644 --- a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv +++ b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv @@ -360,3 +360,21 @@ iczsb_3 zo_wea_petit_bouclier zo_wea_petit_bouclier zorai buckler shield iczss zo_wea_grand_bouclier zo_wea_grand_bouclier zorai large shield iczss_2 zo_wea_grand_bouclier zo_wea_grand_bouclier zorai large shield iczss_3 zo_wea_grand_bouclier zo_wea_grand_bouclier zorai large shield +iccacp ge_hom_caster00_pantabottes ge_hof_caster00_pantabottes common light caster armor pants +iccahb ge_hom_armor04_bottes ge_hof_armor04_bottes common heavy armor boots +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 +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 +iccamp ge_hom_armor03_pantabottes ge_hof_armor03_pantabottes common medium armor pants +iccams ge_hom_armor03_armpad ge_hof_armor03_armpad common medium armor sleeves +iccamv ge_hom_armor03_gilet ge_hof_armor03_gilet common medium armor vest +iccalv ge_hom_armor02_gilet ge_hof_armor02_gilet common light armor vest +iccalb ge_hom_armor02_bottes ge_hof_armor02_bottes common light armor boots +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 diff --git a/ryzom/tools/extract_r2_required/merge_creature_list.py b/ryzom/tools/extract_r2_required/merge_creature_list.py index 8bcd6f98b..9b5939798 100644 --- a/ryzom/tools/extract_r2_required/merge_creature_list.py +++ b/ryzom/tools/extract_r2_required/merge_creature_list.py @@ -5,4 +5,5 @@ with open("creature_list.txt", "w") as w: w.write(l) with open("creature_list_wk.txt", "r") as r: for l in r: - w.write(l) + if len(l.strip()) > 0 and not l.startswith(";"): + w.write(l) diff --git a/ryzom/tools/extract_r2_required/merge_sitem_list.py b/ryzom/tools/extract_r2_required/merge_sitem_list.py index 5535ea602..780ba4ba7 100644 --- a/ryzom/tools/extract_r2_required/merge_sitem_list.py +++ b/ryzom/tools/extract_r2_required/merge_sitem_list.py @@ -5,4 +5,5 @@ with open("sitem_list.txt", "w") as w: w.write(l) with open("sitem_list_wk.txt", "r") as r: for l in r: - w.write(l) + if len(l.strip()) > 0 and not l.startswith(";"): + w.write(l) diff --git a/ryzom/tools/extract_r2_required/readme.txt b/ryzom/tools/extract_r2_required/readme.txt index 2c2691eae..c56af3534 100644 --- a/ryzom/tools/extract_r2_required/readme.txt +++ b/ryzom/tools/extract_r2_required/readme.txt @@ -1,5 +1,5 @@ # Generate sitem, sbrick, and sphrase -- Run extract_palette.py to generate sitem_list.txt and creature_list.txt from the R2 palette +- Run extract_palette.py to generate sitem_list.txt and creature_list.txt from the R2 palette and merge in the _wk lists - Run extract_parents.py to generate the parents txt files from the above, and missing sheets - Run scheme_sitem_parser.py to generate sitem_parsed.tsv from sitem_list.txt minus missing_sheets.txt - Run extract_shapes.py to list all shapes into shape_list.txt diff --git a/ryzom/tools/extract_r2_required/sbrick_index.tsv b/ryzom/tools/extract_r2_required/sbrick_index.tsv index 4b5d2ca36..bb8112303 100644 --- a/ryzom/tools/extract_r2_required/sbrick_index.tsv +++ b/ryzom/tools/extract_r2_required/sbrick_index.tsv @@ -57,21 +57,21 @@ BCBREA 21 bcbsea01_3 icbsb_3 __missing BCBREA 22 bcbsea02 icbss __missing BCBREA 23 bcbsea02_2 icbss_2 __missing BCBREA 24 bcbsea02_3 icbss_3 __missing -BCCAEA 07 bccaea07 iccalb __missing -BCCAEA 08 bccaea08 iccalg __missing -BCCAEA 09 bccaea09 iccalp __missing -BCCAEA 10 bccaea10 iccals __missing -BCCAEA 11 bccaea11 iccalv __missing -BCCAEB 16 bccaea12 iccamb __missing -BCCAEB 19 bccaea13 iccamg __missing -BCCAEB 22 bccaea14 iccamp __missing -BCCAEB 25 bccaea15 iccams __missing -BCCAEB 28 bccaea16 iccamv __missing -BCCAEC 01 bccaea01 iccahb __missing -BCCAEC 02 bccaea02 iccahg __missing -BCCAEC 03 bccaea03 iccahh __missing -BCCAEC 04 bccaea04 iccahp __missing -BCCAEC 05 bccaea05 iccahs __missing +BCCAEA 7 bccalb iccalb bccaea07 +BCCAEA 8 bccalg iccalg bccaea08 +BCCAEA 9 bccalp iccalp bccaea09 +BCCAEA 10 bccals iccals bccaea10 +BCCAEA 11 bccalv iccalv bccaea11 +BCCAEB 16 bccamb iccamb bccaea12 +BCCAEB 19 bccamg iccamg bccaea13 +BCCAEB 22 bccamp iccamp bccaea14 +BCCAEB 25 bccams iccams bccaea15 +BCCAEB 28 bccamv iccamv bccaea16 +BCCAEC 1 bccahb iccahb bccaea01 +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 7 bcbahb_m __missing BCCAEC 8 bcbahg_m __missing @@ -85,7 +85,7 @@ BCCAEC 19 bcbahh iccahh_b __missing BCCAEC 20 bcbahp iccahp_b __missing BCCAEC 21 bcbahs iccahs_b __missing BCCAEC 22 bcbahv iccahv_b __missing -BCCAED 7 bccaea19 iccacp __missing +BCCAED 7 bccacp iccacp bccaea19 BCCMEA 01 bccmea01 iccm2sa __missing BCCMEA 02 bccmea02 iccm2pp __missing BCCMEA 03 bccmea03 iccm2bm __missing diff --git a/ryzom/tools/extract_r2_required/scheme_shape_parser.py b/ryzom/tools/extract_r2_required/scheme_shape_parser.py index 3dd3fb794..299f70d0c 100644 --- a/ryzom/tools/extract_r2_required/scheme_shape_parser.py +++ b/ryzom/tools/extract_r2_required/scheme_shape_parser.py @@ -151,13 +151,13 @@ scheme = { {}, {}, { - "caster00": "tribe boss light caster armor", - "armor02": "tribe boss light armor", - "armor03": "tribe boss medium armor", - "armor04": "tribe boss heavy armor", - "armor06": "tribe boss second heavy armor", - "casque00": "tribe boss heavy armor helmet", - "casque02": "tribe boss second heavy armor helmet", + "caster00": "boss light caster armor", + "armor02": "boss light armor", + "armor03": "boss medium armor", + "armor04": "boss heavy armor", + "armor06": "second heavy armor", + "casque00": "boss heavy armor helmet", + "casque02": "second heavy armor helmet", }, {}, {}, diff --git a/ryzom/tools/extract_r2_required/shape_parsed.tsv b/ryzom/tools/extract_r2_required/shape_parsed.tsv index 6d86c6d06..68e43e5b5 100644 --- a/ryzom/tools/extract_r2_required/shape_parsed.tsv +++ b/ryzom/tools/extract_r2_required/shape_parsed.tsv @@ -158,44 +158,44 @@ fy_hom_interfaces_new fyros male incomplete _interfaces_new fy_hom_underwear_pantabottes fyros male underwear armor pants fy_hom_visage fyros male incomplete _visage ge_bt_kami_destroyer common incomplete _bt_kami_destroyer -ge_hof_armor02_armpad common female tribe boss light armor sleeves -ge_hof_armor02_bottes common female tribe boss light armor boots -ge_hof_armor02_gilet common female tribe boss light armor vest -ge_hof_armor02_pantabottes common female tribe boss light armor pants -ge_hof_armor03_armpad common female tribe boss medium armor sleeves -ge_hof_armor03_bottes common female tribe boss medium armor boots -ge_hof_armor03_gilet common female tribe boss medium armor vest -ge_hof_armor03_pantabottes common female tribe boss medium armor pants -ge_hof_armor04_armpad common female tribe boss heavy armor sleeves -ge_hof_armor04_bottes common female tribe boss heavy armor boots -ge_hof_armor04_gilet common female tribe boss heavy armor vest -ge_hof_armor04_hand common female tribe boss heavy armor gloves -ge_hof_armor04_pantabottes common female tribe boss heavy armor pants -ge_hof_casque00 common female tribe boss heavy armor helmet +ge_hof_armor02_armpad common female boss light armor sleeves +ge_hof_armor02_bottes common female boss light armor boots +ge_hof_armor02_gilet common female boss light armor vest +ge_hof_armor02_pantabottes common female boss light armor pants +ge_hof_armor03_armpad common female boss medium armor sleeves +ge_hof_armor03_bottes common female boss medium armor boots +ge_hof_armor03_gilet common female boss medium armor vest +ge_hof_armor03_pantabottes common female boss medium armor pants +ge_hof_armor04_armpad common female boss heavy armor sleeves +ge_hof_armor04_bottes common female boss heavy armor boots +ge_hof_armor04_gilet common female boss heavy armor vest +ge_hof_armor04_hand common female boss heavy armor gloves +ge_hof_armor04_pantabottes common female boss heavy armor pants +ge_hof_casque00 common female boss heavy armor helmet ge_hof_casque01 common female heavy armor helmet casque01 -ge_hof_caster00_pantabottes common female tribe boss light caster armor pants -ge_hom_armor02_armpad common male tribe boss light armor sleeves -ge_hom_armor02_bottes common male tribe boss light armor boots -ge_hom_armor02_gilet common male tribe boss light armor vest -ge_hom_armor02_pantabottes common male tribe boss light armor pants -ge_hom_armor03_armpad common male tribe boss medium armor sleeves -ge_hom_armor03_bottes common male tribe boss medium armor boots -ge_hom_armor03_gilet common male tribe boss medium armor vest -ge_hom_armor03_pantabottes common male tribe boss medium armor pants -ge_hom_armor04_armpad common male tribe boss heavy armor sleeves -ge_hom_armor04_bottes common male tribe boss heavy armor boots -ge_hom_armor04_gilet common male tribe boss heavy armor vest -ge_hom_armor04_hand common male tribe boss heavy armor gloves -ge_hom_armor04_pantabottes common male tribe boss heavy armor pants -ge_hom_armor06_armpad common male tribe boss second heavy armor sleeves -ge_hom_armor06_bottes common male tribe boss second heavy armor boots -ge_hom_armor06_gilet common male tribe boss second heavy armor vest -ge_hom_armor06_hand common male tribe boss second heavy armor gloves -ge_hom_armor06_pantabottes common male tribe boss second heavy armor pants -ge_hom_casque00 common male tribe boss heavy armor helmet +ge_hof_caster00_pantabottes common female boss light caster armor pants +ge_hom_armor02_armpad common male boss light armor sleeves +ge_hom_armor02_bottes common male boss light armor boots +ge_hom_armor02_gilet common male boss light armor vest +ge_hom_armor02_pantabottes common male boss light armor pants +ge_hom_armor03_armpad common male boss medium armor sleeves +ge_hom_armor03_bottes common male boss medium armor boots +ge_hom_armor03_gilet common male boss medium armor vest +ge_hom_armor03_pantabottes common male boss medium armor pants +ge_hom_armor04_armpad common male boss heavy armor sleeves +ge_hom_armor04_bottes common male boss heavy armor boots +ge_hom_armor04_gilet common male boss heavy armor vest +ge_hom_armor04_hand common male boss heavy armor gloves +ge_hom_armor04_pantabottes common male boss heavy armor pants +ge_hom_armor06_armpad common male second heavy armor sleeves +ge_hom_armor06_bottes common male second heavy armor boots +ge_hom_armor06_gilet common male second heavy armor vest +ge_hom_armor06_hand common male second heavy armor gloves +ge_hom_armor06_pantabottes common male second heavy armor pants +ge_hom_casque00 common male boss heavy armor helmet ge_hom_casque01 common male heavy armor helmet casque01 -ge_hom_casque02 common male tribe boss second heavy armor helmet -ge_hom_caster00_pantabottes common male tribe boss light caster armor pants +ge_hom_casque02 common male second heavy armor helmet +ge_hom_caster00_pantabottes common male boss light caster armor pants int_avbradr_maindr incomplete _int_avbradr_maindr int_avbradr_maindr01 incomplete _int_avbradr_maindr01 int_cou_tet incomplete _int_cou_tet diff --git a/ryzom/tools/extract_r2_required/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index 6a3d6f54b..4db13d5c0 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -372,3 +372,21 @@ iczsb_3.sitem iczss.sitem iczss_2.sitem iczss_3.sitem +iccacp.sitem +iccahb.sitem +iccahg.sitem +iccahh.sitem +iccahp.sitem +iccahs.sitem +iccamv.sitem +iccamb.sitem +iccamg.sitem +iccamp.sitem +iccams.sitem +iccamv.sitem +iccalv.sitem +iccalb.sitem +iccalg.sitem +iccalp.sitem +iccals.sitem +iccalv.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_list_wk.txt b/ryzom/tools/extract_r2_required/sitem_list_wk.txt index e69de29bb..2e61b3c10 100644 --- a/ryzom/tools/extract_r2_required/sitem_list_wk.txt +++ b/ryzom/tools/extract_r2_required/sitem_list_wk.txt @@ -0,0 +1,26 @@ + +; boss caster pants +iccacp.sitem + +; boss heavy armor +iccahb.sitem +iccahg.sitem +iccahh.sitem +iccahp.sitem +iccahs.sitem + +; boss medium armor +iccamv.sitem +iccamb.sitem +iccamg.sitem +iccamp.sitem +iccams.sitem +iccamv.sitem + +; boss light armor +iccalv.sitem +iccalb.sitem +iccalg.sitem +iccalp.sitem +iccals.sitem +iccalv.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_parents.tsv b/ryzom/tools/extract_r2_required/sitem_parents.tsv index fe53664bb..fac0a009a 100644 --- a/ryzom/tools/extract_r2_required/sitem_parents.tsv +++ b/ryzom/tools/extract_r2_required/sitem_parents.tsv @@ -14,31 +14,3 @@ _c_m2sa _c_m2sa parent shared unspecified melee two-handed slashing axe _c_m2ss _c_m2ss parent shared unspecified melee two-handed slashing sword _c_sb _c_sb parent shared unspecified buckler shield _c_ss _c_ss parent shared unspecified large shield -_gfa_c _gfa_c parent generic fyros caster armor base -_gfa_h _gfa_h parent generic fyros heavy armor base -_gfa_l _gfa_l parent generic fyros light armor base -_gfa_m _gfa_m parent generic fyros medium armor base -_gma_c _gma_c parent generic matis caster armor base -_gma_h _gma_h parent generic matis heavy armor base -_gma_l _gma_l parent generic matis light armor base -_gma_m _gma_m parent generic matis medium armor base -_gta_c _gta_c parent generic tryker caster armor base -_gta_h _gta_h parent generic tryker heavy armor base -_gta_l _gta_l parent generic tryker light armor base -_gta_m _gta_m parent generic tryker medium armor base -_gza_c _gza_c parent generic zorai caster armor base -_gza_h _gza_h parent generic zorai heavy armor base -_gza_l _gza_l parent generic zorai light armor base -_gza_m _gza_m parent generic zorai medium armor base -_gca_c _gca_c parent generic common caster armor base -_gca_h _gca_h parent generic common heavy armor base -_gca_l _gca_l parent generic common light armor base -_gca_m _gca_m parent generic common medium armor base -_gkara_c _gkara_c parent generic karavan caster armor base -_gkara_h _gkara_h parent generic karavan heavy armor base -_gkara_l _gkara_l parent generic karavan light armor base -_gkara_m _gkara_m parent generic karavan medium armor base -_gkama_c _gkama_c parent generic kami caster armor base -_gkama_h _gkama_h parent generic kami heavy armor base -_gkama_l _gkama_l parent generic kami light armor base -_gkama_m _gkama_m parent generic kami medium armor base diff --git a/ryzom/tools/extract_r2_required/sitem_parents.txt b/ryzom/tools/extract_r2_required/sitem_parents.txt index 3bf79f48b..647bbbe82 100644 --- a/ryzom/tools/extract_r2_required/sitem_parents.txt +++ b/ryzom/tools/extract_r2_required/sitem_parents.txt @@ -14,31 +14,3 @@ _c_m2sa.sitem _c_m2ss.sitem _c_sb.sitem _c_ss.sitem -_gfa_c.sitem -_gfa_h.sitem -_gfa_l.sitem -_gfa_m.sitem -_gma_c.sitem -_gma_h.sitem -_gma_l.sitem -_gma_m.sitem -_gta_c.sitem -_gta_h.sitem -_gta_l.sitem -_gta_m.sitem -_gza_c.sitem -_gza_h.sitem -_gza_l.sitem -_gza_m.sitem -_gca_c.sitem -_gca_h.sitem -_gca_l.sitem -_gca_m.sitem -_gkara_c.sitem -_gkara_h.sitem -_gkara_l.sitem -_gkara_m.sitem -_gkama_c.sitem -_gkama_h.sitem -_gkama_l.sitem -_gkama_m.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_parsed.tsv b/ryzom/tools/extract_r2_required/sitem_parsed.tsv index a959e1148..368cfba8b 100644 --- a/ryzom/tools/extract_r2_required/sitem_parsed.tsv +++ b/ryzom/tools/extract_r2_required/sitem_parsed.tsv @@ -360,3 +360,21 @@ iczsb_3 iczsb_3 item crafted zorai buckler shield hq iczss iczss item crafted zorai large shield iczss_2 iczss_2 item crafted zorai large shield mq iczss_3 iczss_3 item crafted zorai large shield hq +iccacp iccacp item crafted common light caster armor pants +iccahb iccahb item crafted common heavy armor boots +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 +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 +iccamp iccamp item crafted common medium armor pants +iccams iccams item crafted common medium armor sleeves +iccamv iccamv item crafted common medium armor vest +iccalv iccalv item crafted common light armor vest +iccalb iccalb item crafted common light armor boots +iccalg iccalg item crafted common light armor gloves hands +iccalp iccalp item crafted common light armor pants +iccals iccals item crafted common light armor sleeves +iccalv iccalv item crafted common light armor vest