Fix type extensions 2

internal/erf/erf.go

@@ -109,9 +109,17 @@ var extensionTypes = map[string]uint16{
 	"ptt": 0x0812,
 	"ltr": 0x0813,
 	"shd": 0x0815,
+	"mdb": 0x0816,
 	"mtr": 0x0818,
+	"jpg": 0x081C,
 	"lod": 0x081E,
 	"png": 0x083E,
+	"lyt": 0x0BB8,
+	"vis": 0x0BB9,
+	"mdx": 0x0BC0,
+	"wlk": 0x0BCC,
+	"xml": 0x0BCD,
+	"gr2": 0x0FA3,
 }
 
 var typeExtensions = map[uint16]string{
@@ -164,9 +172,17 @@ var typeExtensions = map[uint16]string{
 	0x0812: "ptt",
 	0x0813: "ltr",
 	0x0815: "shd",
+	0x0816: "mdb",
 	0x0818: "mtr",
+	0x081C: "jpg",
 	0x081E: "lod",
 	0x083E: "png",
+	0x0BB8: "lyt",
+	0x0BB9: "vis",
+	0x0BC0: "mdx",
+	0x0BCC: "wlk",
+	0x0BCD: "xml",
+	0x0FA3: "gr2",
 }
 
 func init() {
@@ -337,6 +353,10 @@ func ResourceTypeForExtension(extension string) (uint16, bool) {
 	return resourceType, ok
 }
 
+func HAKResourceTypeForExtension(extension string) (uint16, bool) {
+	return ResourceTypeForExtension(extension)
+}
+
 func ExtensionForResourceType(resourceType uint16) (string, bool) {
 	extension, ok := typeExtensions[resourceType]
 	return extension, ok

internal/erf/erf_test.go

@@ -56,3 +56,44 @@ func TestExtensionMappingsKeep2DAAndTLKDistinct(t *testing.T) {
 		t.Fatal("expected 2da and tlk resource types to stay distinct")
 	}
 }
+
+func TestHAKResourceTypeForExtensionSupportsPNG(t *testing.T) {
+	if resourceType, ok := HAKResourceTypeForExtension("png"); !ok || resourceType != 0x083E {
+		t.Fatalf("expected png to stay valid for HAK generation, got ok=%v type=0x%04X", ok, resourceType)
+	}
+	if resourceType, ok := HAKResourceTypeForExtension("2da"); !ok || resourceType != 0x07E1 {
+		t.Fatalf("expected 2da to stay valid for HAK generation, got ok=%v type=0x%04X", ok, resourceType)
+	}
+}
+
+func TestExtensionMappingsSupportModernAssetTypes(t *testing.T) {
+	cases := map[string]uint16{
+		"mtr": 0x0818,
+		"shd": 0x0815,
+		"txi": 0x07E6,
+		"jpg": 0x081C,
+		"mdb": 0x0816,
+		"lyt": 0x0BB8,
+		"vis": 0x0BB9,
+		"mdx": 0x0BC0,
+		"xml": 0x0BCD,
+		"wlk": 0x0BCC,
+		"gr2": 0x0FA3,
+	}
+	for ext, wantType := range cases {
+		gotType, ok := ResourceTypeForExtension(ext)
+		if !ok {
+			t.Fatalf("expected %s to resolve to a resource type", ext)
+		}
+		if gotType != wantType {
+			t.Fatalf("expected %s type 0x%04X, got 0x%04X", ext, wantType, gotType)
+		}
+		gotExt, ok := ExtensionForResourceType(wantType)
+		if !ok {
+			t.Fatalf("expected type 0x%04X to resolve back to an extension", wantType)
+		}
+		if gotExt != ext {
+			t.Fatalf("expected type 0x%04X to resolve to %s, got %s", wantType, ext, gotExt)
+		}
+	}
+}