diff --git a/ryzom/tools/extract_r2_required/generate_sitem.py b/ryzom/tools/extract_r2_required/generate_sitem.py index aaecba8a4..be6b7461a 100644 --- a/ryzom/tools/extract_r2_required/generate_sitem.py +++ b/ryzom/tools/extract_r2_required/generate_sitem.py @@ -650,13 +650,15 @@ def generateSitems(): elif "armor" in tags: ###print shapeMale folder = "armor\\" + subfolder - if "caster01" in shapeMale or "caster" in tags: + if "refugee" in tags: + pass + elif "caster" in tags: folder += "\\caster_armor" - elif ("civil01" in shapeMale or ("underwear" in shapeMale and not "underwear" in tags)) and "light" in tags: + elif "light" in tags: folder += "\\light_armor" - elif "armor00" in shapeMale and "medium" in tags: + elif "medium" in tags: folder += "\\medium_armor" - elif ("armor01" in shapeMale or "casque01" in shapeMale) and "heavy" in tags: + elif "heavy" in tags: folder += "\\heavy_armor" elif "shield" in tags: folder = "shield\\" + subfolder diff --git a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv index 6b7c08d0e..020d03570 100644 --- a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv +++ b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv @@ -2,12 +2,9 @@ iccm1bm ge_wea_masse1m ge_wea_masse1m common melee one-handed blunt mace iccm1pd ge_wea_dague ge_wea_dague common melee one-handed piercing dagger iccm1sa ge_wea_hache1m ge_wea_hache1m common melee one-handed slashing axe iccm1ss ge_wea_epee1m ge_wea_epee1m common melee one-handed slashing sword -icfacb_3 fy_hom_civil01_bottes fy_hof_civil01_bottes fyros light armor boots icfacp fy_hom_caster01_pantabottes fy_hof_caster01_pantabottes fyros light caster armor pants icfacp_2 fy_hom_caster01_pantabottes fy_hof_caster01_pantabottes fyros light caster armor pants icfacp_3 fy_hom_caster01_pantabottes fy_hof_caster01_pantabottes fyros light caster armor pants -icfacs_3 fy_hom_civil01_armpad fy_hof_civil01_armpad fyros light armor sleeves -icfacv_3 fy_hom_civil01_gilet fy_hof_civil01_gilet fyros light armor vest icfahb fy_hom_armor01_bottes fy_hof_armor01_bottes fyros heavy armor boots icfahb_2 fy_hom_armor01_bottes fy_hof_armor01_bottes fyros heavy armor boots icfahb_3 fy_hom_armor01_bottes fy_hof_armor01_bottes fyros heavy armor boots @@ -92,12 +89,9 @@ icfsb_3 fy_wea_petit_bouclier fy_wea_petit_bouclier fyros buckler shield icfss fy_wea_grand_bouclier fy_wea_grand_bouclier fyros large shield icfss_2 fy_wea_grand_bouclier fy_wea_grand_bouclier fyros large shield icfss_3 fy_wea_grand_bouclier fy_wea_grand_bouclier fyros large shield -icmacb_3 ma_hom_civil01_bottes ma_hof_civil01_bottes matis light armor boots icmacp ma_hom_caster01_pantabottes ma_hof_caster01_pantabottes matis light caster armor pants icmacp_2 ma_hom_caster01_pantabottes ma_hof_caster01_pantabottes matis light caster armor pants icmacp_3 ma_hom_caster01_pantabottes ma_hof_caster01_pantabottes matis light caster armor pants -icmacs_3 ma_hom_civil01_armpad ma_hof_civil01_armpad matis light armor sleeves -icmacv_3 ma_hom_civil01_gilet ma_hof_civil01_gilet matis light armor vest icmahb ma_hom_armor01_bottes ma_hof_armor01_bottes matis heavy armor boots icmahb_2 ma_hom_armor01_bottes ma_hof_armor01_bottes matis heavy armor boots icmahb_3 ma_hom_armor01_bottes ma_hof_armor01_bottes matis heavy armor boots @@ -183,12 +177,9 @@ icmss ma_wea_grand_bouclier ma_wea_grand_bouclier matis large shield icmss_2 ma_wea_grand_bouclier ma_wea_grand_bouclier matis large shield icmss_3 ma_wea_grand_bouclier ma_wea_grand_bouclier matis large shield icravr tr_hom_refugee_gilet tr_hof_refugee_gilet refugee armor vest -ictacb_3 tr_hom_civil01_bottes tr_hof_civil01_bottes tryker light armor boots ictacp tr_hom_caster01_pantabottes tr_hof_caster01_pantabottes tryker light caster armor pants ictacp_2 tr_hom_caster01_pantabottes tr_hof_caster01_pantabottes tryker light caster armor pants ictacp_3 tr_hom_caster01_pantabottes tr_hof_caster01_pantabottes tryker light caster armor pants -ictacs_3 tr_hom_civil01_armpad tr_hof_civil01_armpad tryker light armor sleeves -ictacv_3 tr_hom_civil01_gilet tr_hof_civil01_gilet tryker light armor vest ictahb tr_hom_armor01_bottes tr_hof_armor01_bottes tryker heavy armor boots ictahb_2 tr_hom_armor01_bottes tr_hof_armor01_bottes tryker heavy armor boots ictahb_3 tr_hom_armor01_bottes tr_hof_armor01_bottes tryker heavy armor boots @@ -387,5 +378,5 @@ ictauwv tr_hom_underwear_gilet tr_hof_underwear_gilet tryker underwear armor ves ictauwp tr_hom_underwear_pantabottes tr_hof_underwear_pantabottes tryker underwear armor pants 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 +icralv tr_hom_refugee_gilet tr_hof_refugee_gilet refugee armor vest +icralp 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 f80dabc41..0d8904d81 100644 --- a/ryzom/tools/extract_r2_required/sbrick_index.tsv +++ b/ryzom/tools/extract_r2_required/sbrick_index.tsv @@ -439,12 +439,12 @@ BCFSCA 22 bcfsca22 __missing BCFSCA 23 bcfsca23 __missing BCFSCA 24 bcfsca24 __missing BCFSCA 25 bcfsca25 __missing -BCFSEA 1 bcfsea01_fsb bcfsea01 icfsb -BCFSEA 2 bcfsea02_fsb_2 bcfsea01_2 icfsb_2 -BCFSEA 3 bcfsea03_fsb_3 bcfsea01_3 icfsb_3 -BCFSEA 4 bcfsea04_fss bcfsea02 icfss -BCFSEA 5 bcfsea05_fss_2 bcfsea02_2 icfss_2 -BCFSEA 6 bcfsea06_fss_3 bcfsea02_3 icfss_3 +BCFSEA 1 bcfsea01_fsb icfsb bcfsea01 +BCFSEA 2 bcfsea02_fsb_2 icfsb_2 bcfsea01_2 +BCFSEA 3 bcfsea03_fsb_3 icfsb_3 bcfsea01_3 +BCFSEA 4 bcfsea04_fss icfss bcfsea02 +BCFSEA 5 bcfsea05_fss_2 icfss_2 bcfsea02_2 +BCFSEA 6 bcfsea06_fss_3 icfss_3 bcfsea02_3 BCFSEA 7 bcfsea03 icfsbb __missing BCFTCA 01 bcftca01 __missing BCFTCA 02 bcftca02 __missing @@ -861,12 +861,12 @@ BCMSCA 22 bcmsca22 __missing BCMSCA 23 bcmsca23 __missing BCMSCA 24 bcmsca24 __missing BCMSCA 25 bcmsca25 __missing -BCMSEA 1 bcmsea01_msb bcmsea01 icmsb -BCMSEA 2 bcmsea02_msb_2 bcmsea01_2 icmsb_2 -BCMSEA 3 bcmsea03_msb_3 bcmsea01_3 icmsb_3 -BCMSEA 4 bcmsea04_mss bcmsea02 icmss -BCMSEA 5 bcmsea05_mss_2 bcmsea02_2 icmss_2 -BCMSEA 6 bcmsea06_mss_3 bcmsea02_3 icmss_3 +BCMSEA 1 bcmsea01_msb icmsb bcmsea01 +BCMSEA 2 bcmsea02_msb_2 icmsb_2 bcmsea01_2 +BCMSEA 3 bcmsea03_msb_3 icmsb_3 bcmsea01_3 +BCMSEA 4 bcmsea04_mss icmss bcmsea02 +BCMSEA 5 bcmsea05_mss_2 icmss_2 bcmsea02_2 +BCMSEA 6 bcmsea06_mss_3 icmss_3 bcmsea02_3 BCMSEA 7 bcmsea03 icmsbl __missing BCMTCA 01 bcmtca01 __missing BCMTCA 02 bcmtca02 __missing @@ -1158,8 +1158,6 @@ BCRAEA 37 bcraea37 icravr __missing BCRAEA 38 bcraea38 icravt __missing BCRAEA 39 bcraea39 icravv __missing BCRAEA 40 bcraea40 icravw __missing -BCRAEA 41 bcraea41_rav icrav bcrav -BCRAEA 42 bcraea42_rap icrap bcrap BCRMEA 12 bcrmea06 icrm1pd BCRMEA 13 bcrmea10 icrm1ss __missing BCRMEA 14 bcrmea15 icrm2ms @@ -1472,12 +1470,12 @@ BCTSCA 22 bctsca22 __missing BCTSCA 23 bctsca23 __missing BCTSCA 24 bctsca24 __missing BCTSCA 25 bctsca25 __missing -BCTSEA 1 bctsea01_tsb bctsea01 ictsb -BCTSEA 2 bctsea02_tsb_2 bctsea01_2 ictsb_2 -BCTSEA 3 bctsea03_tsb_3 bctsea01_3 ictsb_3 -BCTSEA 4 bctsea04_tss bctsea02 ictss -BCTSEA 5 bctsea05_tss_2 bctsea02_2 ictss_2 -BCTSEA 6 bctsea06_tss_3 bctsea02_3 ictss_3 +BCTSEA 1 bctsea01_tsb ictsb bctsea01 +BCTSEA 2 bctsea02_tsb_2 ictsb_2 bctsea01_2 +BCTSEA 3 bctsea03_tsb_3 ictsb_3 bctsea01_3 +BCTSEA 4 bctsea04_tss ictss bctsea02 +BCTSEA 5 bctsea05_tss_2 ictss_2 bctsea02_2 +BCTSEA 6 bctsea06_tss_3 ictss_3 bctsea02_3 BCTSEA 7 bctsea03 ictsbw __missing BCTTCA 01 bcttca01 __missing BCTTCA 02 bcttca02 __missing @@ -1811,12 +1809,12 @@ BCZSCA 22 bczsca22 __missing BCZSCA 23 bczsca23 __missing BCZSCA 24 bczsca24 __missing BCZSCA 25 bczsca25 __missing -BCZSEA 1 bczsea01_zsb bczsea01 iczsb -BCZSEA 2 bczsea02_zsb_2 bczsea01_2 iczsb_2 -BCZSEA 3 bczsea03_zsb_3 bczsea01_3 iczsb_3 -BCZSEA 4 bczsea04_zss bczsea02 iczss -BCZSEA 5 bczsea05_zss_2 bczsea02_2 iczss_2 -BCZSEA 6 bczsea06_zss_3 bczsea02_3 iczss_3 +BCZSEA 1 bczsea01_zsb iczsb bczsea01 +BCZSEA 2 bczsea02_zsb_2 iczsb_2 bczsea01_2 +BCZSEA 3 bczsea03_zsb_3 iczsb_3 bczsea01_3 +BCZSEA 4 bczsea04_zss iczss bczsea02 +BCZSEA 5 bczsea05_zss_2 iczss_2 bczsea02_2 +BCZSEA 6 bczsea06_zss_3 iczss_3 bczsea02_3 BCZSEA 7 bczsea03 iczsbe __missing BCZTCA 01 bcztca01 __missing BCZTCA 02 bcztca02 __missing diff --git a/ryzom/tools/extract_r2_required/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index ebba84035..b2e63ca66 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -378,5 +378,5 @@ ictauwv.sitem ictauwp.sitem iczauwv.sitem iczauwp.sitem -icrav.sitem -icrap.sitem +icralv.sitem +icralp.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_list_wk.txt b/ryzom/tools/extract_r2_required/sitem_list_wk.txt index 132122292..cbdb7c6a4 100644 --- a/ryzom/tools/extract_r2_required/sitem_list_wk.txt +++ b/ryzom/tools/extract_r2_required/sitem_list_wk.txt @@ -37,8 +37,8 @@ iczauwv.sitem iczauwp.sitem ; refugee -icrav.sitem -icrap.sitem +icralv.sitem +icralp.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 index 6cb1f9a78..8b6d93c69 100644 --- a/ryzom/tools/extract_r2_required/sitem_missing.txt +++ b/ryzom/tools/extract_r2_required/sitem_missing.txt @@ -122,3 +122,5 @@ iczm2sa_3.sitem iczm2ss.sitem iczm2ss_2.sitem iczm2ss_3.sitem +icralv.sitem +icralp.sitem diff --git a/ryzom/tools/extract_r2_required/sitem_parsed.tsv b/ryzom/tools/extract_r2_required/sitem_parsed.tsv index 9b8d19dfd..25e67ee86 100644 --- a/ryzom/tools/extract_r2_required/sitem_parsed.tsv +++ b/ryzom/tools/extract_r2_required/sitem_parsed.tsv @@ -2,12 +2,9 @@ iccm1bm iccm1bm item crafted common melee one-handed blunt mace iccm1pd iccm1pd item crafted common melee one-handed piercing dagger iccm1sa iccm1sa item crafted common melee one-handed slashing axe iccm1ss iccm1ss item crafted common melee one-handed slashing sword -icfacb_3 icfacb_3 item crafted fyros light caster armor boots hq icfacp icfacp item crafted fyros light caster armor pants icfacp_2 icfacp_2 item crafted fyros light caster armor pants mq icfacp_3 icfacp_3 item crafted fyros light caster armor pants hq -icfacs_3 icfacs_3 item crafted fyros light caster armor sleeves hq -icfacv_3 icfacv_3 item crafted fyros light caster armor vest hq icfahb icfahb item crafted fyros heavy armor boots icfahb_2 icfahb_2 item crafted fyros heavy armor boots mq icfahb_3 icfahb_3 item crafted fyros heavy armor boots hq @@ -92,12 +89,9 @@ icfsb_3 icfsb_3 item crafted fyros buckler shield hq icfss icfss item crafted fyros large shield icfss_2 icfss_2 item crafted fyros large shield mq icfss_3 icfss_3 item crafted fyros large shield hq -icmacb_3 icmacb_3 item crafted matis light caster armor boots hq icmacp icmacp item crafted matis light caster armor pants icmacp_2 icmacp_2 item crafted matis light caster armor pants mq icmacp_3 icmacp_3 item crafted matis light caster armor pants hq -icmacs_3 icmacs_3 item crafted matis light caster armor sleeves hq -icmacv_3 icmacv_3 item crafted matis light caster armor vest hq icmahb icmahb item crafted matis heavy armor boots icmahb_2 icmahb_2 item crafted matis heavy armor boots mq icmahb_3 icmahb_3 item crafted matis heavy armor boots hq @@ -183,12 +177,9 @@ icmss icmss item crafted matis large shield icmss_2 icmss_2 item crafted matis large shield mq icmss_3 icmss_3 item crafted matis large shield hq icravr icravr item crafted refugee armor vest red -ictacb_3 ictacb_3 item crafted tryker light caster armor boots hq ictacp ictacp item crafted tryker light caster armor pants ictacp_2 ictacp_2 item crafted tryker light caster armor pants mq ictacp_3 ictacp_3 item crafted tryker light caster armor pants hq -ictacs_3 ictacs_3 item crafted tryker light caster armor sleeves hq -ictacv_3 ictacv_3 item crafted tryker light caster armor vest hq ictahb ictahb item crafted tryker heavy armor boots ictahb_2 ictahb_2 item crafted tryker heavy armor boots mq ictahb_3 ictahb_3 item crafted tryker heavy armor boots hq @@ -387,5 +378,5 @@ ictauwv ictauwv item crafted tryker light underwear armor vest ictauwp ictauwp item crafted tryker light underwear armor pants iczauwv iczauwv item crafted zorai light underwear armor vest iczauwp iczauwp item crafted zorai light underwear armor pants -icrav icrav item crafted refugee armor vest -icrap icrap item crafted refugee armor pants +icralv icralv item crafted refugee light armor vest +icralp icralp item crafted refugee light armor pants