ShadowsOverWestgate/sow-tools
7
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 38 Activity

Fix alignment/id encoding

Browse Source
This commit is contained in:
archvillainette
2026-05-26 14:18:04 +02:00
parent 22e3fabbbb
commit 28d487565a
3 changed files with 93 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/topdata/native.go
+10
View File
@@ -420,6 +420,16 @@ func applyTopDataValueEncodings(datasets []nativeDataset, encodings []project.To
}
out := append([]nativeDataset(nil), datasets...)
for index := range out {
for _, encoding := range encodings {
dataset := filepath.ToSlash(strings.TrimSpace(encoding.Dataset))
if dataset != "*" {
continue
}
if out[index].ValueEncodings == nil {
out[index].ValueEncodings = map[string]project.TopDataValueEncodingConfig{}
}
out[index].ValueEncodings[strings.ToLower(strings.TrimSpace(encoding.Column))] = encoding
}
for _, encoding := range encodings {
if filepath.ToSlash(strings.TrimSpace(encoding.Dataset)) != out[index].Name {
continue
internal/topdata/topdata_test.go
+78
View File
@@ -348,6 +348,84 @@ func TestBuildNativeEncodesConfiguredIDHexLists(t *testing.T) {
}
}
func TestBuildNativeAppliesWildcardConfiguredValueEncodings(t *testing.T) {
root := testProjectRoot(t)
mkdirAll(t, filepath.Join(root, "topdata", "data", "feat"))
mkdirAll(t, filepath.Join(root, "topdata", "data", "classes", "core", "modules"))
mkdirAll(t, filepath.Join(root, "topdata", "data", "baseitems", "modules"))
writeFile(t, filepath.Join(root, "topdata", "base_dialog.json"), "{}\n")
writeFile(t, filepath.Join(root, "topdata", "data", "feat", "base.json"), `{
"output": "feat.2da",
"columns": ["LABEL"],
"rows": [
{"id": 2, "key": "feat:weapon_proficiency_simple", "LABEL": "WeaponProfSimple"},
{"id": 9, "key": "feat:weapon_proficiency_martial", "LABEL": "WeaponProfMartial"}
]
}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "feat", "lock.json"), `{
"feat:weapon_proficiency_simple": 2,
"feat:weapon_proficiency_martial": 9
}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "classes", "core", "base.json"), `{
"output": "classes.2da",
"columns": ["Label", "PreferredAlignments"],
"rows": [
{"id": 0, "key": "classes:barbarian", "Label": "Barbarian"}
]
}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "classes", "core", "lock.json"), `{"classes:barbarian":0}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "classes", "core", "modules", "10_barbarian.json"), `{
"overrides": [
{
"key": "classes:barbarian",
"PreferredAlignments": {"alignments": ["ng", "cg", "tn", "cn", "ne", "ce"]}
}
]
}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "baseitems", "base.json"), `{
"output": "baseitems.2da",
"columns": ["Label", "ProficiencyFeats"],
"rows": [
{"id": 42, "key": "baseitems:testclub", "Label": "Test Club"}
]
}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "baseitems", "lock.json"), `{"baseitems:testclub":42}`+"\n")
writeFile(t, filepath.Join(root, "topdata", "data", "baseitems", "modules", "10_testclub.json"), `{
"overrides": [
{
"key": "baseitems:testclub",
"ProficiencyFeats": {"ids": ["feat:weapon_proficiency_simple", "feat:weapon_proficiency_martial"]}
}
]
}`+"\n")
proj := testProject(root)
proj.Config.TopData.ValueEncodings = []project.TopDataValueEncodingConfig{
{Dataset: "classes/core", Column: "PreferredAlignments", Mode: "alignment_hex_list", Min: 0, Max: 31, HexWidth: 3},
{Dataset: "*", Column: "PreferredAlignments", Mode: "alignment_hex_list", Min: 0, Max: 31, HexWidth: 2},
{Dataset: "*", Column: "ProficiencyFeats", Mode: "id_hex_list", Min: 0, Max: 65535, HexWidth: 4},
}
result, err := BuildNativeWithOptions(proj, NativeBuildOptions{BuildWiki: false}, nil)
if err != nil {
t.Fatalf("BuildNativeWithOptions failed: %v", err)
}
classesRaw, err := os.ReadFile(filepath.Join(result.Output2DADir, "classes.2da"))
if err != nil {
t.Fatalf("read classes.2da: %v", err)
}
if got := string(classesRaw); !strings.Contains(got, "0x00900C001005011014") {
t.Fatalf("expected wildcard alignment encoding in classes.2da, got:\n%s", got)
}
baseitemsRaw, err := os.ReadFile(filepath.Join(result.Output2DADir, "baseitems.2da"))
if err != nil {
t.Fatalf("read baseitems.2da: %v", err)
}
if got := string(baseitemsRaw); !strings.Contains(got, "0x00020009") {
t.Fatalf("expected wildcard id encoding in baseitems.2da, got:\n%s", got)
}
}
func TestBuildNativeAppliesConfiguredValueDefaults(t *testing.T) {
root := testProjectRoot(t)
mkdirAll(t, filepath.Join(root, "topdata", "data", "racialtypes", "core", "modules"))