From 34bb64cea7817fb3b5865beed151e3d3da0d41ce Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 30 Jun 2021 08:04:34 +0800 Subject: [PATCH] Generate craftable refugee armor sheets --- ryzom/tools/extract_r2_required/brick_families.tsv | 2 +- ryzom/tools/extract_r2_required/generate_sitem.py | 6 +++--- ryzom/tools/extract_r2_required/match_sitem_shape.tsv | 2 ++ ryzom/tools/extract_r2_required/sitem_list.txt | 2 ++ ryzom/tools/extract_r2_required/sitem_list_wk.txt | 4 ++++ ryzom/tools/extract_r2_required/sitem_parsed.tsv | 2 ++ ryzom/tools/extract_r2_required/sitem_shape_matcher.py | 1 + 7 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ryzom/tools/extract_r2_required/brick_families.tsv b/ryzom/tools/extract_r2_required/brick_families.tsv index 940d673c0..2e42831f8 100644 --- a/ryzom/tools/extract_r2_required/brick_families.tsv +++ b/ryzom/tools/extract_r2_required/brick_families.tsv @@ -167,7 +167,7 @@ BCRPE * BCRPEA * BCRA armor BCRAE * -BCRAEA light +BCRAEA * BCRAEB medium BCRAEC heavy BCRAED caster diff --git a/ryzom/tools/extract_r2_required/generate_sitem.py b/ryzom/tools/extract_r2_required/generate_sitem.py index 9a4e107ff..26ecbb323 100644 --- a/ryzom/tools/extract_r2_required/generate_sitem.py +++ b/ryzom/tools/extract_r2_required/generate_sitem.py @@ -117,6 +117,8 @@ def findSkill(tags): t.remove("ranged") if "magic" in t and "two-handed" in t: t.remove("two-handed") + if "refugee" in t and not "heavy" in t and not "medium" in t and not "light" in t: + t += [ "light" ] res = findTreeEntry(skillTree, t) if len(res) == 7: return res @@ -130,8 +132,6 @@ def findBrickFamily(tags): t.remove("ranged") if "caster" in t and "light" in t: t.remove("light") - if "refugee" in t and "light" in t: - t.remove("light") res = findTreeEntry(brickFamilyTree, t) return res @@ -674,7 +674,7 @@ def generateSitems(): if "armor" in tags and "caster" in tags and not "pants" in tags: continue # Only include caster pants - if "armor" in tags and "refugee" in tags: + if "armor" in tags and "refugee" in tags and len(name) > 5: continue # No need to generate these for now parent = findSitemParent(tags) diff --git a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv index 3cc99005e..8f69a3ecd 100644 --- a/ryzom/tools/extract_r2_required/match_sitem_shape.tsv +++ b/ryzom/tools/extract_r2_required/match_sitem_shape.tsv @@ -386,3 +386,5 @@ ictauwv tr_hom_underwear_gilet tr_hof_underwear_gilet 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 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/sitem_list.txt b/ryzom/tools/extract_r2_required/sitem_list.txt index 0d65ab078..ade19cf44 100644 --- a/ryzom/tools/extract_r2_required/sitem_list.txt +++ b/ryzom/tools/extract_r2_required/sitem_list.txt @@ -398,3 +398,5 @@ ictauwv.sitem ictauwp.sitem iczauwv.sitem iczauwp.sitem +icrav.sitem +icrap.sitam diff --git a/ryzom/tools/extract_r2_required/sitem_list_wk.txt b/ryzom/tools/extract_r2_required/sitem_list_wk.txt index b8014f93f..2a92268e6 100644 --- a/ryzom/tools/extract_r2_required/sitem_list_wk.txt +++ b/ryzom/tools/extract_r2_required/sitem_list_wk.txt @@ -34,3 +34,7 @@ ictauwv.sitem ictauwp.sitem iczauwv.sitem iczauwp.sitem + +; refugee +icrav.sitem +icrap.sitam diff --git a/ryzom/tools/extract_r2_required/sitem_parsed.tsv b/ryzom/tools/extract_r2_required/sitem_parsed.tsv index eb12d98c2..73d2ff0d4 100644 --- a/ryzom/tools/extract_r2_required/sitem_parsed.tsv +++ b/ryzom/tools/extract_r2_required/sitem_parsed.tsv @@ -386,3 +386,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 diff --git a/ryzom/tools/extract_r2_required/sitem_shape_matcher.py b/ryzom/tools/extract_r2_required/sitem_shape_matcher.py index 07340e09f..c66321af9 100644 --- a/ryzom/tools/extract_r2_required/sitem_shape_matcher.py +++ b/ryzom/tools/extract_r2_required/sitem_shape_matcher.py @@ -17,6 +17,7 @@ boostTags = { "sleeves": 2, "helmet": 2, "boots": 2, + "refugee": 2, # "hands": 2, }