From 56c3248198ef98a5b08ac0d876250e0f57f98a99 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 28 Jun 2021 14:52:49 +0800 Subject: [PATCH] Improve weapon matching tags --- .../tools/extract_r2_required/list_shapes.py | 0 .../extract_r2_required/match_sitem_shape.tsv | 248 ++++++++--------- ryzom/tools/extract_r2_required/readme.txt | 1 + .../scheme_shape_parser.py | 42 +-- .../scheme_sitem_parser.py | 6 +- .../extract_r2_required/shape_parsed.tsv | 252 +++++++++--------- 6 files changed, 275 insertions(+), 274 deletions(-) delete mode 100644 ryzom/tools/extract_r2_required/list_shapes.py diff --git a/ryzom/tools/extract_r2_required/list_shapes.py b/ryzom/tools/extract_r2_required/list_shapes.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv index d59785cfa..fc594caee 100644 --- a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv +++ b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv @@ -1,7 +1,7 @@ -iccm1bm ge_wea_masse1m ge_wea_masse1m common one-handed blunt mace -iccm1pd ge_wea_dague ge_wea_dague common one-handed piercing dagger -iccm1sa ge_wea_hache1m ge_wea_hache1m common one-handed slashing axe -iccm1ss ge_wea_epee1m ge_wea_epee1m common one-handed slashing sword +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_caster01_civil01_bottes fy_hof_caster01_bottes_civil fyros light caster 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 @@ -56,36 +56,36 @@ icfams_3 fy_hom_armor00_armpad fy_hof_armor00_armpad fyros medium armor sleeves icfamv fy_hom_armor00_gilet fy_hof_armor00_gilet fyros medium armor vest icfamv_2 fy_hom_armor00_gilet fy_hof_armor00_gilet fyros medium armor vest icfamv_3 fy_hom_armor00_gilet fy_hof_armor00_gilet fyros medium armor vest -icfm1bm fy_wea_masse1m fy_wea_masse1m fyros one-handed blunt mace -icfm1bm_2 fy_wea_masse1m fy_wea_masse1m fyros one-handed blunt mace -icfm1bm_3 fy_wea_masse1m fy_wea_masse1m fyros one-handed blunt mace -icfm1pd fy_wea_dague fy_wea_dague fyros one-handed piercing dagger -icfm1pd_2 fy_wea_dague fy_wea_dague fyros one-handed piercing dagger -icfm1pd_3 fy_wea_dague fy_wea_dague fyros one-handed piercing dagger -icfm1ps fy_wea_lance1m fy_wea_lance1m fyros one-handed piercing spear -icfm1ps_2 fy_wea_lance1m fy_wea_lance1m fyros one-handed piercing spear -icfm1ps_3 fy_wea_lance1m fy_wea_lance1m fyros one-handed piercing spear -icfm1sa fy_wea_hache1m fy_wea_hache1m fyros one-handed slashing axe -icfm1sa_2 fy_wea_hache1m fy_wea_hache1m fyros one-handed slashing axe -icfm1sa_3 fy_wea_hache1m fy_wea_hache1m fyros one-handed slashing axe -icfm1ss fy_wea_epee1m fy_wea_epee1m fyros one-handed slashing sword -icfm1ss_2 fy_wea_epee1m fy_wea_epee1m fyros one-handed slashing sword -icfm1ss_3 fy_wea_epee1m fy_wea_epee1m fyros one-handed slashing sword -icfm2bm fy_wea_masse2m fy_wea_masse2m fyros two-handed blunt mace -icfm2bm_2 fy_wea_masse2m fy_wea_masse2m fyros two-handed blunt mace -icfm2bm_3 fy_wea_masse2m fy_wea_masse2m fyros two-handed blunt mace -icfm2ms fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier -icfm2ms_2 fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier -icfm2ms_3 fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier -icfm2pp fy_wea_lance2m fy_wea_lance2m fyros two-handed piercing pike -icfm2pp_2 fy_wea_lance2m fy_wea_lance2m fyros two-handed piercing pike -icfm2pp_3 fy_wea_lance2m fy_wea_lance2m fyros two-handed piercing pike -icfm2sa fy_wea_hache2m fy_wea_hache2m fyros two-handed slashing axe -icfm2sa_2 fy_wea_hache2m fy_wea_hache2m fyros two-handed slashing axe -icfm2sa_3 fy_wea_hache2m fy_wea_hache2m fyros two-handed slashing axe -icfm2ss fy_wea_epee2m fy_wea_epee2m fyros two-handed slashing sword -icfm2ss_2 fy_wea_epee2m fy_wea_epee2m fyros two-handed slashing sword -icfm2ss_3 fy_wea_epee2m fy_wea_epee2m fyros two-handed slashing sword +icfm1bm fy_wea_masse1m fy_wea_masse1m fyros melee one-handed blunt mace +icfm1bm_2 fy_wea_masse1m fy_wea_masse1m fyros melee one-handed blunt mace +icfm1bm_3 fy_wea_masse1m fy_wea_masse1m fyros melee one-handed blunt mace +icfm1pd fy_wea_dague fy_wea_dague fyros melee one-handed piercing dagger +icfm1pd_2 fy_wea_dague fy_wea_dague fyros melee one-handed piercing dagger +icfm1pd_3 fy_wea_dague fy_wea_dague fyros melee one-handed piercing dagger +icfm1ps fy_wea_lance1m fy_wea_lance1m fyros melee one-handed piercing spear +icfm1ps_2 fy_wea_lance1m fy_wea_lance1m fyros melee one-handed piercing spear +icfm1ps_3 fy_wea_lance1m fy_wea_lance1m fyros melee one-handed piercing spear +icfm1sa fy_wea_hache1m fy_wea_hache1m fyros melee one-handed slashing axe +icfm1sa_2 fy_wea_hache1m fy_wea_hache1m fyros melee one-handed slashing axe +icfm1sa_3 fy_wea_hache1m fy_wea_hache1m fyros melee one-handed slashing axe +icfm1ss fy_wea_epee1m fy_wea_epee1m fyros melee one-handed slashing sword +icfm1ss_2 fy_wea_epee1m fy_wea_epee1m fyros melee one-handed slashing sword +icfm1ss_3 fy_wea_epee1m fy_wea_epee1m fyros melee one-handed slashing sword +icfm2bm fy_wea_masse2m fy_wea_masse2m fyros melee two-handed blunt mace +icfm2bm_2 fy_wea_masse2m fy_wea_masse2m fyros melee two-handed blunt mace +icfm2bm_3 fy_wea_masse2m fy_wea_masse2m fyros melee two-handed blunt mace +icfm2ms fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier gloves +icfm2ms_2 fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier gloves +icfm2ms_3 fy_hom_acc_gauntlet fy_hof_acc_gauntlet fyros magic amplifier gloves +icfm2pp fy_wea_lance2m fy_wea_lance2m fyros melee two-handed piercing pike +icfm2pp_2 fy_wea_lance2m fy_wea_lance2m fyros melee two-handed piercing pike +icfm2pp_3 fy_wea_lance2m fy_wea_lance2m fyros melee two-handed piercing pike +icfm2sa fy_wea_hache2m fy_wea_hache2m fyros melee two-handed slashing axe +icfm2sa_2 fy_wea_hache2m fy_wea_hache2m fyros melee two-handed slashing axe +icfm2sa_3 fy_wea_hache2m fy_wea_hache2m fyros melee two-handed slashing axe +icfm2ss fy_wea_epee2m fy_wea_epee2m fyros melee two-handed slashing sword +icfm2ss_2 fy_wea_epee2m fy_wea_epee2m fyros melee two-handed slashing sword +icfm2ss_3 fy_wea_epee2m fy_wea_epee2m fyros melee two-handed slashing sword icfsb fy_wea_petit_bouclier fy_wea_petit_bouclier fyros buckler shield icfsb_2 fy_wea_petit_bouclier fy_wea_petit_bouclier fyros buckler shield icfsb_3 fy_wea_petit_bouclier fy_wea_petit_bouclier fyros buckler shield @@ -146,36 +146,36 @@ icmams_3 ma_hom_armor00_armpad ma_hof_armor00_armpad matis medium armor sleeves icmamv ma_hom_armor00_gilet ma_hof_armor00_gilet matis medium armor vest icmamv_2 ma_hom_armor00_gilet ma_hof_armor00_gilet matis medium armor vest icmamv_3 ma_hom_armor00_gilet ma_hof_armor00_gilet matis medium armor vest -icmm1bm ma_wea_masse1m ma_wea_masse1m matis one-handed blunt mace -icmm1bm_2 ma_wea_masse1m ma_wea_masse1m matis one-handed blunt mace -icmm1bm_3 ma_wea_masse1m ma_wea_masse1m matis one-handed blunt mace -icmm1pd ma_wea_dague ma_wea_dague matis one-handed piercing dagger -icmm1pd_2 ma_wea_dague ma_wea_dague matis one-handed piercing dagger -icmm1pd_3 ma_wea_dague ma_wea_dague matis one-handed piercing dagger -icmm1ps ma_wea_lance1m ma_wea_lance1m matis one-handed piercing spear -icmm1ps_2 ma_wea_lance1m ma_wea_lance1m matis one-handed piercing spear -icmm1ps_3 ma_wea_lance1m ma_wea_lance1m matis one-handed piercing spear -icmm1sa ma_wea_hache1m ma_wea_hache1m matis one-handed slashing axe -icmm1sa_2 ma_wea_hache1m ma_wea_hache1m matis one-handed slashing axe -icmm1sa_3 ma_wea_hache1m ma_wea_hache1m matis one-handed slashing axe -icmm1ss ma_wea_epee1m ma_wea_epee1m matis one-handed slashing sword -icmm1ss_2 ma_wea_epee1m ma_wea_epee1m matis one-handed slashing sword -icmm1ss_3 ma_wea_epee1m ma_wea_epee1m matis one-handed slashing sword -icmm2bm ma_wea_masse2m ma_wea_masse2m matis two-handed blunt mace -icmm2bm_2 ma_wea_masse2m ma_wea_masse2m matis two-handed blunt mace -icmm2bm_3 ma_wea_masse2m ma_wea_masse2m matis two-handed blunt mace -icmm2ms ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier -icmm2ms_2 ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier -icmm2ms_3 ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier -icmm2pp ma_wea_lance2m ma_wea_lance2m matis two-handed piercing pike -icmm2pp_2 ma_wea_lance2m ma_wea_lance2m matis two-handed piercing pike -icmm2pp_3 ma_wea_lance2m ma_wea_lance2m matis two-handed piercing pike -icmm2sa ma_wea_hache2m ma_wea_hache2m matis two-handed slashing axe -icmm2sa_2 ma_wea_hache2m ma_wea_hache2m matis two-handed slashing axe -icmm2sa_3 ma_wea_hache2m ma_wea_hache2m matis two-handed slashing axe -icmm2ss ma_wea_epee2m ma_wea_epee2m matis two-handed slashing sword -icmm2ss_2 ma_wea_epee2m ma_wea_epee2m matis two-handed slashing sword -icmm2ss_3 ma_wea_epee2m ma_wea_epee2m matis two-handed slashing sword +icmm1bm ma_wea_masse1m ma_wea_masse1m matis melee one-handed blunt mace +icmm1bm_2 ma_wea_masse1m ma_wea_masse1m matis melee one-handed blunt mace +icmm1bm_3 ma_wea_masse1m ma_wea_masse1m matis melee one-handed blunt mace +icmm1pd ma_wea_dague ma_wea_dague matis melee one-handed piercing dagger +icmm1pd_2 ma_wea_dague ma_wea_dague matis melee one-handed piercing dagger +icmm1pd_3 ma_wea_dague ma_wea_dague matis melee one-handed piercing dagger +icmm1ps ma_wea_lance1m ma_wea_lance1m matis melee one-handed piercing spear +icmm1ps_2 ma_wea_lance1m ma_wea_lance1m matis melee one-handed piercing spear +icmm1ps_3 ma_wea_lance1m ma_wea_lance1m matis melee one-handed piercing spear +icmm1sa ma_wea_hache1m ma_wea_hache1m matis melee one-handed slashing axe +icmm1sa_2 ma_wea_hache1m ma_wea_hache1m matis melee one-handed slashing axe +icmm1sa_3 ma_wea_hache1m ma_wea_hache1m matis melee one-handed slashing axe +icmm1ss ma_wea_epee1m ma_wea_epee1m matis melee one-handed slashing sword +icmm1ss_2 ma_wea_epee1m ma_wea_epee1m matis melee one-handed slashing sword +icmm1ss_3 ma_wea_epee1m ma_wea_epee1m matis melee one-handed slashing sword +icmm2bm ma_wea_masse2m ma_wea_masse2m matis melee two-handed blunt mace +icmm2bm_2 ma_wea_masse2m ma_wea_masse2m matis melee two-handed blunt mace +icmm2bm_3 ma_wea_masse2m ma_wea_masse2m matis melee two-handed blunt mace +icmm2ms ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier gloves +icmm2ms_2 ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier gloves +icmm2ms_3 ma_hom_acc_gauntlet ma_hof_acc_gauntlet matis magic amplifier gloves +icmm2pp ma_wea_lance2m ma_wea_lance2m matis melee two-handed piercing pike +icmm2pp_2 ma_wea_lance2m ma_wea_lance2m matis melee two-handed piercing pike +icmm2pp_3 ma_wea_lance2m ma_wea_lance2m matis melee two-handed piercing pike +icmm2sa ma_wea_hache2m ma_wea_hache2m matis melee two-handed slashing axe +icmm2sa_2 ma_wea_hache2m ma_wea_hache2m matis melee two-handed slashing axe +icmm2sa_3 ma_wea_hache2m ma_wea_hache2m matis melee two-handed slashing axe +icmm2ss ma_wea_epee2m ma_wea_epee2m matis melee two-handed slashing sword +icmm2ss_2 ma_wea_epee2m ma_wea_epee2m matis melee two-handed slashing sword +icmm2ss_3 ma_wea_epee2m ma_wea_epee2m matis melee two-handed slashing sword icmsb ma_wea_petit_bouclier ma_wea_petit_bouclier matis buckler shield icmsb_2 ma_wea_petit_bouclier ma_wea_petit_bouclier matis buckler shield icmsb_3 ma_wea_petit_bouclier ma_wea_petit_bouclier matis buckler shield @@ -237,36 +237,36 @@ ictams_3 tr_hom_armor00_armpad tr_hof_armor00_armpad tryker medium armor sleeves ictamv tr_hom_armor00_gilet tr_hof_armor00_gilet tryker medium armor vest ictamv_2 tr_hom_armor00_gilet tr_hof_armor00_gilet tryker medium armor vest ictamv_3 tr_hom_armor00_gilet tr_hof_armor00_gilet tryker medium armor vest -ictm1bm tr_wea_masse1m tr_wea_masse1m tryker one-handed blunt mace -ictm1bm_2 tr_wea_masse1m tr_wea_masse1m tryker one-handed blunt mace -ictm1bm_3 tr_wea_masse1m tr_wea_masse1m tryker one-handed blunt mace -ictm1pd tr_wea_dague tr_wea_dague tryker one-handed piercing dagger -ictm1pd_2 tr_wea_dague tr_wea_dague tryker one-handed piercing dagger -ictm1pd_3 tr_wea_dague tr_wea_dague tryker one-handed piercing dagger -ictm1ps tr_wea_lance1m tr_wea_lance1m tryker one-handed piercing spear -ictm1ps_2 tr_wea_lance1m tr_wea_lance1m tryker one-handed piercing spear -ictm1ps_3 tr_wea_lance1m tr_wea_lance1m tryker one-handed piercing spear -ictm1sa tr_wea_hache1m tr_wea_hache1m tryker one-handed slashing axe -ictm1sa_2 tr_wea_hache1m tr_wea_hache1m tryker one-handed slashing axe -ictm1sa_3 tr_wea_hache1m tr_wea_hache1m tryker one-handed slashing axe -ictm1ss tr_wea_epee1m tr_wea_epee1m tryker one-handed slashing sword -ictm1ss_2 tr_wea_epee1m tr_wea_epee1m tryker one-handed slashing sword -ictm1ss_3 tr_wea_epee1m tr_wea_epee1m tryker one-handed slashing sword -ictm2bm tr_wea_masse2m tr_wea_masse2m tryker two-handed blunt mace -ictm2bm_2 tr_wea_masse2m tr_wea_masse2m tryker two-handed blunt mace -ictm2bm_3 tr_wea_masse2m tr_wea_masse2m tryker two-handed blunt mace -ictm2ms tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier -ictm2ms_2 tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier -ictm2ms_3 tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier -ictm2pp tr_wea_lance2m tr_wea_lance2m tryker two-handed piercing pike -ictm2pp_2 tr_wea_lance2m tr_wea_lance2m tryker two-handed piercing pike -ictm2pp_3 tr_wea_lance2m tr_wea_lance2m tryker two-handed piercing pike -ictm2sa tr_wea_hache2m tr_wea_hache2m tryker two-handed slashing axe -ictm2sa_2 tr_wea_hache2m tr_wea_hache2m tryker two-handed slashing axe -ictm2sa_3 tr_wea_hache2m tr_wea_hache2m tryker two-handed slashing axe -ictm2ss tr_wea_epee2m tr_wea_epee2m tryker two-handed slashing sword -ictm2ss_2 tr_wea_epee2m tr_wea_epee2m tryker two-handed slashing sword -ictm2ss_3 tr_wea_epee2m tr_wea_epee2m tryker two-handed slashing sword +ictm1bm tr_wea_masse1m tr_wea_masse1m tryker melee one-handed blunt mace +ictm1bm_2 tr_wea_masse1m tr_wea_masse1m tryker melee one-handed blunt mace +ictm1bm_3 tr_wea_masse1m tr_wea_masse1m tryker melee one-handed blunt mace +ictm1pd tr_wea_dague tr_wea_dague tryker melee one-handed piercing dagger +ictm1pd_2 tr_wea_dague tr_wea_dague tryker melee one-handed piercing dagger +ictm1pd_3 tr_wea_dague tr_wea_dague tryker melee one-handed piercing dagger +ictm1ps tr_wea_lance1m tr_wea_lance1m tryker melee one-handed piercing spear +ictm1ps_2 tr_wea_lance1m tr_wea_lance1m tryker melee one-handed piercing spear +ictm1ps_3 tr_wea_lance1m tr_wea_lance1m tryker melee one-handed piercing spear +ictm1sa tr_wea_hache1m tr_wea_hache1m tryker melee one-handed slashing axe +ictm1sa_2 tr_wea_hache1m tr_wea_hache1m tryker melee one-handed slashing axe +ictm1sa_3 tr_wea_hache1m tr_wea_hache1m tryker melee one-handed slashing axe +ictm1ss tr_wea_epee1m tr_wea_epee1m tryker melee one-handed slashing sword +ictm1ss_2 tr_wea_epee1m tr_wea_epee1m tryker melee one-handed slashing sword +ictm1ss_3 tr_wea_epee1m tr_wea_epee1m tryker melee one-handed slashing sword +ictm2bm tr_wea_masse2m tr_wea_masse2m tryker melee two-handed blunt mace +ictm2bm_2 tr_wea_masse2m tr_wea_masse2m tryker melee two-handed blunt mace +ictm2bm_3 tr_wea_masse2m tr_wea_masse2m tryker melee two-handed blunt mace +ictm2ms tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier gloves +ictm2ms_2 tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier gloves +ictm2ms_3 tr_hom_acc_gauntlet tr_hof_acc_gauntlet tryker magic amplifier gloves +ictm2pp tr_wea_lance2m tr_wea_lance2m tryker melee two-handed piercing pike +ictm2pp_2 tr_wea_lance2m tr_wea_lance2m tryker melee two-handed piercing pike +ictm2pp_3 tr_wea_lance2m tr_wea_lance2m tryker melee two-handed piercing pike +ictm2sa tr_wea_hache2m tr_wea_hache2m tryker melee two-handed slashing axe +ictm2sa_2 tr_wea_hache2m tr_wea_hache2m tryker melee two-handed slashing axe +ictm2sa_3 tr_wea_hache2m tr_wea_hache2m tryker melee two-handed slashing axe +ictm2ss tr_wea_epee2m tr_wea_epee2m tryker melee two-handed slashing sword +ictm2ss_2 tr_wea_epee2m tr_wea_epee2m tryker melee two-handed slashing sword +ictm2ss_3 tr_wea_epee2m tr_wea_epee2m tryker melee two-handed slashing sword ictsb tr_wea_petit_bouclier tr_wea_petit_bouclier tryker buckler shield ictsb_2 tr_wea_petit_bouclier tr_wea_petit_bouclier tryker buckler shield ictsb_3 tr_wea_petit_bouclier tr_wea_petit_bouclier tryker buckler shield @@ -324,36 +324,36 @@ iczams_3 zo_hom_armor00_armpad zo_hof_armor00_armpad zorai medium armor sleeves iczamv zo_hom_armor00_gilet zo_hof_armor00_gilet zorai medium armor vest iczamv_2 zo_hom_armor00_gilet zo_hof_armor00_gilet zorai medium armor vest iczamv_3 zo_hom_armor00_gilet zo_hof_armor00_gilet zorai medium armor vest -iczm1bm zo_wea_masse1m zo_wea_masse1m zorai one-handed blunt mace -iczm1bm_2 zo_wea_masse1m zo_wea_masse1m zorai one-handed blunt mace -iczm1bm_3 zo_wea_masse1m zo_wea_masse1m zorai one-handed blunt mace -iczm1pd zo_wea_dague zo_wea_dague zorai one-handed piercing dagger -iczm1pd_2 zo_wea_dague zo_wea_dague zorai one-handed piercing dagger -iczm1pd_3 zo_wea_dague zo_wea_dague zorai one-handed piercing dagger -iczm1ps zo_wea_lance1m zo_wea_lance1m zorai one-handed piercing spear -iczm1ps_2 zo_wea_lance1m zo_wea_lance1m zorai one-handed piercing spear -iczm1ps_3 zo_wea_lance1m zo_wea_lance1m zorai one-handed piercing spear -iczm1sa zo_wea_hache1m zo_wea_hache1m zorai one-handed slashing axe -iczm1sa_2 zo_wea_hache1m zo_wea_hache1m zorai one-handed slashing axe -iczm1sa_3 zo_wea_hache1m zo_wea_hache1m zorai one-handed slashing axe -iczm1ss zo_wea_epee1m zo_wea_epee1m zorai one-handed slashing sword -iczm1ss_2 zo_wea_epee1m zo_wea_epee1m zorai one-handed slashing sword -iczm1ss_3 zo_wea_epee1m zo_wea_epee1m zorai one-handed slashing sword -iczm2bm zo_wea_masse2m zo_wea_masse2m zorai two-handed blunt mace -iczm2bm_2 zo_wea_masse2m zo_wea_masse2m zorai two-handed blunt mace -iczm2bm_3 zo_wea_masse2m zo_wea_masse2m zorai two-handed blunt mace -iczm2ms zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier -iczm2ms_2 zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier -iczm2ms_3 zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier -iczm2pp zo_wea_lance2m zo_wea_lance2m zorai two-handed piercing pike -iczm2pp_2 zo_wea_lance2m zo_wea_lance2m zorai two-handed piercing pike -iczm2pp_3 zo_wea_lance2m zo_wea_lance2m zorai two-handed piercing pike -iczm2sa zo_wea_hache2m zo_wea_hache2m zorai two-handed slashing axe -iczm2sa_2 zo_wea_hache2m zo_wea_hache2m zorai two-handed slashing axe -iczm2sa_3 zo_wea_hache2m zo_wea_hache2m zorai two-handed slashing axe -iczm2ss zo_wea_epee2m zo_wea_epee2m zorai two-handed slashing sword -iczm2ss_2 zo_wea_epee2m zo_wea_epee2m zorai two-handed slashing sword -iczm2ss_3 zo_wea_epee2m zo_wea_epee2m zorai two-handed slashing sword +iczm1bm zo_wea_masse1m zo_wea_masse1m zorai melee one-handed blunt mace +iczm1bm_2 zo_wea_masse1m zo_wea_masse1m zorai melee one-handed blunt mace +iczm1bm_3 zo_wea_masse1m zo_wea_masse1m zorai melee one-handed blunt mace +iczm1pd zo_wea_dague zo_wea_dague zorai melee one-handed piercing dagger +iczm1pd_2 zo_wea_dague zo_wea_dague zorai melee one-handed piercing dagger +iczm1pd_3 zo_wea_dague zo_wea_dague zorai melee one-handed piercing dagger +iczm1ps zo_wea_lance1m zo_wea_lance1m zorai melee one-handed piercing spear +iczm1ps_2 zo_wea_lance1m zo_wea_lance1m zorai melee one-handed piercing spear +iczm1ps_3 zo_wea_lance1m zo_wea_lance1m zorai melee one-handed piercing spear +iczm1sa zo_wea_hache1m zo_wea_hache1m zorai melee one-handed slashing axe +iczm1sa_2 zo_wea_hache1m zo_wea_hache1m zorai melee one-handed slashing axe +iczm1sa_3 zo_wea_hache1m zo_wea_hache1m zorai melee one-handed slashing axe +iczm1ss zo_wea_epee1m zo_wea_epee1m zorai melee one-handed slashing sword +iczm1ss_2 zo_wea_epee1m zo_wea_epee1m zorai melee one-handed slashing sword +iczm1ss_3 zo_wea_epee1m zo_wea_epee1m zorai melee one-handed slashing sword +iczm2bm zo_wea_masse2m zo_wea_masse2m zorai melee two-handed blunt mace +iczm2bm_2 zo_wea_masse2m zo_wea_masse2m zorai melee two-handed blunt mace +iczm2bm_3 zo_wea_masse2m zo_wea_masse2m zorai melee two-handed blunt mace +iczm2ms zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier gloves +iczm2ms_2 zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier gloves +iczm2ms_3 zo_hom_acc_gauntlet zo_hof_acc_gauntlet zorai magic amplifier gloves +iczm2pp zo_wea_lance2m zo_wea_lance2m zorai melee two-handed piercing pike +iczm2pp_2 zo_wea_lance2m zo_wea_lance2m zorai melee two-handed piercing pike +iczm2pp_3 zo_wea_lance2m zo_wea_lance2m zorai melee two-handed piercing pike +iczm2sa zo_wea_hache2m zo_wea_hache2m zorai melee two-handed slashing axe +iczm2sa_2 zo_wea_hache2m zo_wea_hache2m zorai melee two-handed slashing axe +iczm2sa_3 zo_wea_hache2m zo_wea_hache2m zorai melee two-handed slashing axe +iczm2ss zo_wea_epee2m zo_wea_epee2m zorai melee two-handed slashing sword +iczm2ss_2 zo_wea_epee2m zo_wea_epee2m zorai melee two-handed slashing sword +iczm2ss_3 zo_wea_epee2m zo_wea_epee2m zorai melee two-handed slashing sword iczsb zo_wea_petit_bouclier zo_wea_petit_bouclier zorai buckler shield iczsb_2 zo_wea_petit_bouclier zo_wea_petit_bouclier zorai buckler shield iczsb_3 zo_wea_petit_bouclier zo_wea_petit_bouclier zorai buckler shield diff --git a/ryzom/tools/extract_r2_required/readme.txt b/ryzom/tools/extract_r2_required/readme.txt index 6d13a1d71..dc204865d 100644 --- a/ryzom/tools/extract_r2_required/readme.txt +++ b/ryzom/tools/extract_r2_required/readme.txt @@ -3,3 +3,4 @@ - 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 - Run scheme_shape_parser.py to generate shape_parsed from shape_list.txt excluding _mission_ shapes +- Run sitem_shape_matcher.py to generate match_sitem_shape.tsv from shape_parsed.tsv and sitem_parsed.tsv diff --git a/ryzom/tools/extract_r2_required/scheme_shape_parser.py b/ryzom/tools/extract_r2_required/scheme_shape_parser.py index 71d8c42cc..eacfa2d2e 100644 --- a/ryzom/tools/extract_r2_required/scheme_shape_parser.py +++ b/ryzom/tools/extract_r2_required/scheme_shape_parser.py @@ -36,7 +36,7 @@ scheme = { "refugee": "refugee armor", }, { - "_gauntlet": "magic amplifier", + "_gauntlet": "magic amplifier gloves", "_armpad": "sleeves", "_bottes": "boots", "_botte": "boots", @@ -196,28 +196,28 @@ scheme = { {}, {}, { - "masse1m": "one-handed blunt mace", - "masse2m": "two-handed blunt mace", - "baton": "one-handed blunt staff", - "baton1m": "one-handed blunt staff", + "masse1m": "melee one-handed blunt mace", + "masse2m": "melee two-handed blunt mace", + "baton": "melee one-handed blunt staff", + "baton1m": "melee one-handed blunt staff", "batonspellcaster": "magic amplifier staff", - "dague": "one-handed piercing dagger", - "lance1m": "one-handed piercing spear", - "lance2m": "two-handed piercing pike", - "hache1m": "one-handed slashing axe", - "hache2m": "two-handed slashing axe", - "epee1m": "one-handed slashing sword", - "epee2m": "two-handed slashing sword", + "dague": "melee one-handed piercing dagger", + "lance1m": "melee one-handed piercing spear", + "lance2m": "melee two-handed piercing pike", + "hache1m": "melee one-handed slashing axe", + "hache2m": "melee two-handed slashing axe", + "epee1m": "melee one-handed slashing sword", + "epee2m": "melee two-handed slashing sword", "ms": "magic amplifier gloves", - "pistolarc": "one-handed bowpistol", - "pistolet": "one-handed pistol", - "gatling": "two-handed autolauncher", - "gattling": "two-handed autolauncher", - "fusarc": "two-handed bowrifle", - # "2h": "two-handed harpoon", - "lanceroquette": "two-handed launcher", - "launcher": "two-handed launcher", - "fusil": "two-handed rifle", + "pistolarc": "ranged one-handed bowpistol", + "pistolet": "ranged one-handed pistol", + "gatling": "ranged two-handed autolauncher", + "gattling": "ranged two-handed autolauncher", + "fusarc": "ranged two-handed bowrifle", + # "2h": "ranged two-handed harpoon", + "lanceroquette": "ranged two-handed launcher", + "launcher": "ranged two-handed launcher", + "fusil": "ranged two-handed rifle", "petit_bouclier": "buckler shield", "grand_bouclier": "large shield", "grandbouclier": "large shield", diff --git a/ryzom/tools/extract_r2_required/scheme_sitem_parser.py b/ryzom/tools/extract_r2_required/scheme_sitem_parser.py index fb8500268..afb90e8f8 100644 --- a/ryzom/tools/extract_r2_required/scheme_sitem_parser.py +++ b/ryzom/tools/extract_r2_required/scheme_sitem_parser.py @@ -37,8 +37,8 @@ scheme = { "ac": "light caster armor", "s": "shield", "m": "melee", - "r": "range", - "p": "range ammo", + "r": "ranged", + "p": "ranged ammo", "j": "jewelry", "sb": "buckler shield", "ss": "large shield", @@ -95,7 +95,7 @@ scheme = { {}, {}, ], - "range": [ + "ranged": [ {}, {}, {}, diff --git a/ryzom/tools/extract_r2_required/shape_parsed.tsv b/ryzom/tools/extract_r2_required/shape_parsed.tsv index 75f54f16d..408821e7f 100644 --- a/ryzom/tools/extract_r2_required/shape_parsed.tsv +++ b/ryzom/tools/extract_r2_required/shape_parsed.tsv @@ -486,31 +486,31 @@ baton magie incomplete _baton magie baton magie01 incomplete _baton magie01 box01 incomplete _box01 candide incomplete _candide -ca_hof_acc_gauntlet karavan female accessory magic amplifier -ca_hom_acc_gauntlet karavan male accessory magic amplifier +ca_hof_acc_gauntlet karavan female accessory magic amplifier gloves +ca_hom_acc_gauntlet karavan male accessory magic amplifier gloves ca_wea_trooper_gun karavan weapon trooper laser gun fy_acc_baniere fyros accessory event banner -fy_hof_acc_gauntlet fyros female accessory magic amplifier -fy_hom_acc_gauntlet fyros male accessory magic amplifier -fy_wea_baton fyros weapon one-handed blunt staff -fy_wea_dague fyros weapon one-handed piercing dagger -fy_wea_epee1m fyros weapon one-handed slashing sword -fy_wea_epee2m fyros weapon two-handed slashing sword -fy_wea_fusarc fyros weapon two-handed bowrifle -fy_wea_fusil fyros weapon two-handed rifle -fy_wea_gatling fyros weapon two-handed autolauncher +fy_hof_acc_gauntlet fyros female accessory magic amplifier gloves +fy_hom_acc_gauntlet fyros male accessory magic amplifier gloves +fy_wea_baton fyros weapon melee one-handed blunt staff +fy_wea_dague fyros weapon melee one-handed piercing dagger +fy_wea_epee1m fyros weapon melee one-handed slashing sword +fy_wea_epee2m fyros weapon melee two-handed slashing sword +fy_wea_fusarc fyros weapon ranged two-handed bowrifle +fy_wea_fusil fyros weapon ranged two-handed rifle +fy_wea_gatling fyros weapon ranged two-handed autolauncher fy_wea_grand_bouclier fyros weapon large shield fy_wea_grenade fyros weapon grenade -fy_wea_hache1m fyros weapon one-handed slashing axe -fy_wea_hache2m fyros weapon two-handed slashing axe -fy_wea_lance1m fyros weapon one-handed piercing spear -fy_wea_lance2m fyros weapon two-handed piercing pike -fy_wea_lanceroquette fyros weapon two-handed launcher -fy_wea_masse1m fyros weapon one-handed blunt mace -fy_wea_masse2m fyros weapon two-handed blunt mace +fy_wea_hache1m fyros weapon melee one-handed slashing axe +fy_wea_hache2m fyros weapon melee two-handed slashing axe +fy_wea_lance1m fyros weapon melee one-handed piercing spear +fy_wea_lance2m fyros weapon melee two-handed piercing pike +fy_wea_lanceroquette fyros weapon ranged two-handed launcher +fy_wea_masse1m fyros weapon melee one-handed blunt mace +fy_wea_masse2m fyros weapon melee two-handed blunt mace fy_wea_petit_bouclier fyros weapon buckler shield -fy_wea_pistolarc fyros weapon one-handed bowpistol -fy_wea_pistolet fyros weapon one-handed pistol +fy_wea_pistolarc fyros weapon ranged one-handed bowpistol +fy_wea_pistolet fyros weapon ranged one-handed pistol ge_acc_balle_01 common accessory incomplete _balle_01 ge_acc_balle_02 common accessory incomplete _balle_02 ge_acc_balle_03 common accessory incomplete _balle_03 @@ -530,17 +530,17 @@ ge_acc_pre_order_item common accessory incomplete _pre_order_item ge_acc_winch_a common accessory incomplete _winch_a ge_acc_woodpiece common accessory incomplete _woodpiece ge_feudecamp common incomplete _feudecamp -ge_fy_wea_trib_gattling common fyros weapon tribe two-handed autolauncher +ge_fy_wea_trib_gattling common fyros weapon tribe ranged two-handed autolauncher ge_fy_wea_trib_grand_bouclier common fyros weapon tribe large shield -ge_fy_wea_trib_hache1m common fyros weapon tribe one-handed slashing axe -ge_fy_wea_trib_hache2m common fyros weapon tribe two-handed slashing axe -ge_fy_wea_trib_launcher common fyros weapon tribe two-handed launcher -ge_hof_acc_gauntlet common female accessory magic amplifier -ge_hof_acc_gauntlet_gen common female accessory magic amplifier generic -ge_hof_acc_gauntlet_kami common female accessory magic amplifier kami -ge_hom_acc_gauntlet common male accessory magic amplifier -ge_hom_acc_gauntlet_gen common male accessory magic amplifier generic -ge_hom_acc_gauntlet_kami common male accessory magic amplifier kami +ge_fy_wea_trib_hache1m common fyros weapon tribe melee one-handed slashing axe +ge_fy_wea_trib_hache2m common fyros weapon tribe melee two-handed slashing axe +ge_fy_wea_trib_launcher common fyros weapon tribe ranged two-handed launcher +ge_hof_acc_gauntlet common female accessory magic amplifier gloves +ge_hof_acc_gauntlet_gen common female accessory magic amplifier gloves generic +ge_hof_acc_gauntlet_kami common female accessory magic amplifier gloves kami +ge_hom_acc_gauntlet common male accessory magic amplifier gloves +ge_hom_acc_gauntlet_gen common male accessory magic amplifier gloves generic +ge_hom_acc_gauntlet_kami common male accessory magic amplifier gloves kami ge_kapo_mortier_a_1 common incomplete _kapo_mortier_a_1 ge_kapo_pilon_a_1 common incomplete _kapo_pilon_a_1 ge_kapo_pilon_o common incomplete _kapo_pilon_o @@ -562,9 +562,9 @@ ge_kwj_ciseau_a common incomplete _kwj_ciseau_a ge_kwj_ciseau_o common incomplete _kwj_ciseau_o ge_kwj_tube_a common incomplete _kwj_tube_a ge_livre common incomplete _livre -ge_ma_wea_trib_lance1m common matis weapon tribe one-handed piercing spear -ge_ma_wea_trib_lance2m common matis weapon tribe two-handed piercing pike -ge_ma_wea_trib_pistolet common matis weapon tribe one-handed pistol +ge_ma_wea_trib_lance1m common matis weapon tribe melee one-handed piercing spear +ge_ma_wea_trib_lance2m common matis weapon tribe melee two-handed piercing pike +ge_ma_wea_trib_pistolet common matis weapon tribe ranged one-handed pistol ge_pvp_spire_kami common incomplete _pvp_spire_kami ge_pvp_spire_karavan common incomplete _pvp_spire_karavan ge_pvp_spire_socle common incomplete _pvp_spire_socle @@ -577,119 +577,119 @@ ge_treasure_box_gen common incomplete _treasure_box_gen ge_treasure_box_ma common incomplete _treasure_box_ma ge_treasure_box_tr common incomplete _treasure_box_tr ge_treasure_box_zo common incomplete _treasure_box_zo -ge_tr_wea_trib_dague common tryker weapon tribe one-handed piercing dagger -ge_tr_wea_trib_epee1m common tryker weapon tribe one-handed slashing sword -ge_tr_wea_trib_epee2m common tryker weapon tribe two-handed slashing sword -ge_tr_wea_trib_fusil common tryker weapon tribe two-handed rifle -ge_tr_wea_trib_pistolarc common tryker weapon tribe one-handed bowpistol -ge_wea_baton common weapon one-handed blunt staff -ge_wea_dague common weapon one-handed piercing dagger -ge_wea_epee1m common weapon one-handed slashing sword -ge_wea_epee2m common weapon two-handed slashing sword -ge_wea_fusarc common weapon two-handed bowrifle -ge_wea_fusil common weapon two-handed rifle -ge_wea_gatling common weapon two-handed autolauncher +ge_tr_wea_trib_dague common tryker weapon tribe melee one-handed piercing dagger +ge_tr_wea_trib_epee1m common tryker weapon tribe melee one-handed slashing sword +ge_tr_wea_trib_epee2m common tryker weapon tribe melee two-handed slashing sword +ge_tr_wea_trib_fusil common tryker weapon tribe ranged two-handed rifle +ge_tr_wea_trib_pistolarc common tryker weapon tribe ranged one-handed bowpistol +ge_wea_baton common weapon melee one-handed blunt staff +ge_wea_dague common weapon melee one-handed piercing dagger +ge_wea_epee1m common weapon melee one-handed slashing sword +ge_wea_epee2m common weapon melee two-handed slashing sword +ge_wea_fusarc common weapon ranged two-handed bowrifle +ge_wea_fusil common weapon ranged two-handed rifle +ge_wea_gatling common weapon ranged two-handed autolauncher ge_wea_grand_bouclier common weapon large shield -ge_wea_hache1m common weapon one-handed slashing axe -ge_wea_hache2m common weapon two-handed slashing axe -ge_wea_high_baton1m common weapon high tribe one-handed blunt staff -ge_wea_high_dague common weapon high tribe one-handed piercing dagger -ge_wea_high_epee1m common weapon high tribe one-handed slashing sword -ge_wea_high_epee2m common weapon high tribe two-handed slashing sword -ge_wea_high_hache1m common weapon high tribe one-handed slashing axe -ge_wea_high_hache1m_b common weapon high tribe one-handed slashing axe b -ge_wea_high_hache2m common weapon high tribe two-handed slashing axe -ge_wea_high_hache2m_b common weapon high tribe two-handed slashing axe b -ge_wea_high_lance1m common weapon high tribe one-handed piercing spear -ge_wea_high_lance2m common weapon high tribe two-handed piercing pike -ge_wea_high_lance2m_b common weapon high tribe two-handed piercing pike b -ge_wea_high_masse1m common weapon high tribe one-handed blunt mace -ge_wea_high_masse2m common weapon high tribe two-handed blunt mace -ge_wea_lance1m common weapon one-handed piercing spear -ge_wea_lance2m common weapon two-handed piercing pike -ge_wea_lanceroquette common weapon two-handed launcher -ge_wea_masse1m common weapon one-handed blunt mace -ge_wea_masse2m common weapon two-handed blunt mace +ge_wea_hache1m common weapon melee one-handed slashing axe +ge_wea_hache2m common weapon melee two-handed slashing axe +ge_wea_high_baton1m common weapon high tribe melee one-handed blunt staff +ge_wea_high_dague common weapon high tribe melee one-handed piercing dagger +ge_wea_high_epee1m common weapon high tribe melee one-handed slashing sword +ge_wea_high_epee2m common weapon high tribe melee two-handed slashing sword +ge_wea_high_hache1m common weapon high tribe melee one-handed slashing axe +ge_wea_high_hache1m_b common weapon high tribe melee one-handed slashing axe b +ge_wea_high_hache2m common weapon high tribe melee two-handed slashing axe +ge_wea_high_hache2m_b common weapon high tribe melee two-handed slashing axe b +ge_wea_high_lance1m common weapon high tribe melee one-handed piercing spear +ge_wea_high_lance2m common weapon high tribe melee two-handed piercing pike +ge_wea_high_lance2m_b common weapon high tribe melee two-handed piercing pike b +ge_wea_high_masse1m common weapon high tribe melee one-handed blunt mace +ge_wea_high_masse2m common weapon high tribe melee two-handed blunt mace +ge_wea_lance1m common weapon melee one-handed piercing spear +ge_wea_lance2m common weapon melee two-handed piercing pike +ge_wea_lanceroquette common weapon ranged two-handed launcher +ge_wea_masse1m common weapon melee one-handed blunt mace +ge_wea_masse2m common weapon melee two-handed blunt mace ge_wea_petit_bouclier common weapon buckler shield -ge_wea_pistolarc common weapon one-handed bowpistol -ge_wea_pistolet common weapon one-handed pistol +ge_wea_pistolarc common weapon ranged one-handed bowpistol +ge_wea_pistolet common weapon ranged one-handed pistol ge_xmas_baniere common incomplete _xmas_baniere -ge_zo_wea_trib_baton common zorai weapon tribe one-handed blunt staff -ge_zo_wea_trib_fusarc common zorai weapon tribe two-handed bowrifle +ge_zo_wea_trib_baton common zorai weapon tribe melee one-handed blunt staff +ge_zo_wea_trib_fusarc common zorai weapon tribe ranged two-handed bowrifle ge_zo_wea_trib_grand_bouclier common zorai weapon tribe large shield -ge_zo_wea_trib_masse1m common zorai weapon tribe one-handed blunt mace -ge_zo_wea_trib_masse2m common zorai weapon tribe two-handed blunt mace +ge_zo_wea_trib_masse1m common zorai weapon tribe melee one-handed blunt mace +ge_zo_wea_trib_masse2m common zorai weapon tribe melee two-handed blunt mace ge_zo_wea_trib_petit_bouclier common zorai weapon tribe buckler shield gun01 incomplete _gun01 ma_acc_baniere matis accessory event banner ma_baniere matis incomplete _baniere -ma_hof_acc_gauntlet matis female accessory magic amplifier -ma_hom_acc_gauntlet matis male accessory magic amplifier -ma_wea_baton matis weapon one-handed blunt staff -ma_wea_dague matis weapon one-handed piercing dagger -ma_wea_epee1m matis weapon one-handed slashing sword -ma_wea_epee2m matis weapon two-handed slashing sword -ma_wea_fusarc matis weapon two-handed bowrifle -ma_wea_fusil matis weapon two-handed rifle -ma_wea_gatling matis weapon two-handed autolauncher +ma_hof_acc_gauntlet matis female accessory magic amplifier gloves +ma_hom_acc_gauntlet matis male accessory magic amplifier gloves +ma_wea_baton matis weapon melee one-handed blunt staff +ma_wea_dague matis weapon melee one-handed piercing dagger +ma_wea_epee1m matis weapon melee one-handed slashing sword +ma_wea_epee2m matis weapon melee two-handed slashing sword +ma_wea_fusarc matis weapon ranged two-handed bowrifle +ma_wea_fusil matis weapon ranged two-handed rifle +ma_wea_gatling matis weapon ranged two-handed autolauncher ma_wea_grand_bouclier matis weapon large shield ma_wea_grenade matis weapon grenade -ma_wea_hache1m matis weapon one-handed slashing axe -ma_wea_hache2m matis weapon two-handed slashing axe -ma_wea_lance1m matis weapon one-handed piercing spear -ma_wea_lance2m matis weapon two-handed piercing pike -ma_wea_lanceroquette matis weapon two-handed launcher -ma_wea_masse1m matis weapon one-handed blunt mace -ma_wea_masse2m matis weapon two-handed blunt mace +ma_wea_hache1m matis weapon melee one-handed slashing axe +ma_wea_hache2m matis weapon melee two-handed slashing axe +ma_wea_lance1m matis weapon melee one-handed piercing spear +ma_wea_lance2m matis weapon melee two-handed piercing pike +ma_wea_lanceroquette matis weapon ranged two-handed launcher +ma_wea_masse1m matis weapon melee one-handed blunt mace +ma_wea_masse2m matis weapon melee two-handed blunt mace ma_wea_petit_bouclier matis weapon buckler shield -ma_wea_pistolarc matis weapon one-handed bowpistol -ma_wea_pistolet matis weapon one-handed pistol +ma_wea_pistolarc matis weapon ranged one-handed bowpistol +ma_wea_pistolet matis weapon ranged one-handed pistol object01 incomplete _object01 object04 incomplete _object04 tr_acc_baniere tryker accessory event banner -tr_hof_acc_gauntlet tryker female accessory magic amplifier -tr_hom_acc_gauntlet tryker male accessory magic amplifier -tr_wea_baton tryker weapon one-handed blunt staff +tr_hof_acc_gauntlet tryker female accessory magic amplifier gloves +tr_hom_acc_gauntlet tryker male accessory magic amplifier gloves +tr_wea_baton tryker weapon melee one-handed blunt staff tr_wea_batonspellcaster tryker weapon magic amplifier staff -tr_wea_dague tryker weapon one-handed piercing dagger -tr_wea_epee1m tryker weapon one-handed slashing sword -tr_wea_epee2m tryker weapon two-handed slashing sword -tr_wea_fusarc tryker weapon two-handed bowrifle -tr_wea_fusil tryker weapon two-handed rifle -tr_wea_gatling tryker weapon two-handed autolauncher +tr_wea_dague tryker weapon melee one-handed piercing dagger +tr_wea_epee1m tryker weapon melee one-handed slashing sword +tr_wea_epee2m tryker weapon melee two-handed slashing sword +tr_wea_fusarc tryker weapon ranged two-handed bowrifle +tr_wea_fusil tryker weapon ranged two-handed rifle +tr_wea_gatling tryker weapon ranged two-handed autolauncher tr_wea_grandbouclier tryker weapon large shield tr_wea_grenade tryker weapon grenade -tr_wea_hache1m tryker weapon one-handed slashing axe -tr_wea_hache2m tryker weapon two-handed slashing axe -tr_wea_lance1m tryker weapon one-handed piercing spear -tr_wea_lance2m tryker weapon two-handed piercing pike -tr_wea_lanceroquette tryker weapon two-handed launcher -tr_wea_masse1m tryker weapon one-handed blunt mace -tr_wea_masse2m tryker weapon two-handed blunt mace +tr_wea_hache1m tryker weapon melee one-handed slashing axe +tr_wea_hache2m tryker weapon melee two-handed slashing axe +tr_wea_lance1m tryker weapon melee one-handed piercing spear +tr_wea_lance2m tryker weapon melee two-handed piercing pike +tr_wea_lanceroquette tryker weapon ranged two-handed launcher +tr_wea_masse1m tryker weapon melee one-handed blunt mace +tr_wea_masse2m tryker weapon melee two-handed blunt mace tr_wea_petit_bouclier tryker weapon buckler shield -tr_wea_pistolarc tryker weapon one-handed bowpistol -tr_wea_pistolet tryker weapon one-handed pistol -tr_wea_pistolet_sousmarin tryker weapon one-handed pistol underwater +tr_wea_pistolarc tryker weapon ranged one-handed bowpistol +tr_wea_pistolet tryker weapon ranged one-handed pistol +tr_wea_pistolet_sousmarin tryker weapon ranged one-handed pistol underwater zo_acc_baniere zorai accessory event banner -zo_hof_acc_gauntlet zorai female accessory magic amplifier -zo_hom_acc_gauntlet zorai male accessory magic amplifier -zo_wea_baton zorai weapon one-handed blunt staff +zo_hof_acc_gauntlet zorai female accessory magic amplifier gloves +zo_hom_acc_gauntlet zorai male accessory magic amplifier gloves +zo_wea_baton zorai weapon melee one-handed blunt staff zo_wea_batonspellcaster zorai weapon magic amplifier staff -zo_wea_dague zorai weapon one-handed piercing dagger -zo_wea_epee1m zorai weapon one-handed slashing sword -zo_wea_epee2m zorai weapon two-handed slashing sword -zo_wea_fusarc zorai weapon two-handed bowrifle -zo_wea_fusil zorai weapon two-handed rifle -zo_wea_gatling zorai weapon two-handed autolauncher +zo_wea_dague zorai weapon melee one-handed piercing dagger +zo_wea_epee1m zorai weapon melee one-handed slashing sword +zo_wea_epee2m zorai weapon melee two-handed slashing sword +zo_wea_fusarc zorai weapon ranged two-handed bowrifle +zo_wea_fusil zorai weapon ranged two-handed rifle +zo_wea_gatling zorai weapon ranged two-handed autolauncher zo_wea_grand_bouclier zorai weapon large shield zo_wea_grenade zorai weapon grenade -zo_wea_hache1m zorai weapon one-handed slashing axe -zo_wea_hache2m zorai weapon two-handed slashing axe -zo_wea_lance1m zorai weapon one-handed piercing spear -zo_wea_lance2m zorai weapon two-handed piercing pike -zo_wea_lanceroquette zorai weapon two-handed launcher -zo_wea_masse1m zorai weapon one-handed blunt mace -zo_wea_masse2m zorai weapon two-handed blunt mace +zo_wea_hache1m zorai weapon melee one-handed slashing axe +zo_wea_hache2m zorai weapon melee two-handed slashing axe +zo_wea_lance1m zorai weapon melee one-handed piercing spear +zo_wea_lance2m zorai weapon melee two-handed piercing pike +zo_wea_lanceroquette zorai weapon ranged two-handed launcher +zo_wea_masse1m zorai weapon melee one-handed blunt mace +zo_wea_masse2m zorai weapon melee two-handed blunt mace zo_wea_petit_bouclier zorai weapon buckler shield -zo_wea_pistolarc zorai weapon one-handed bowpistol -zo_wea_pistolet zorai weapon one-handed pistol +zo_wea_pistolarc zorai weapon ranged one-handed bowpistol +zo_wea_pistolet zorai weapon ranged one-handed pistol