Bump version, fix for Immortal Pillars

Fix one command type, start debugging xmb

Bump version to v0.3.0 and fix for Immortal Pillars

add comment

Author: jerkeeler

.gitignore

@@ -3,3 +3,4 @@ restoration
 releases/
 test.json
 .idea
+decompressed.hex

parser/consts.go

@@ -3,7 +3,7 @@ package parser
 const MAX_SCAN_OFFSET = 50
 const DATA_OFFSET = 6
 const ROOT_NODE_TOKEN = "BG"
-const VERSION = "v0.2.4"
+const VERSION = "v0.3.0"
 
 var FOOTER = []uint8{0, 1, 0, 0, 0, 0, 0, 0}
 

parser/gameCommandParser.go

@@ -222,7 +222,6 @@ func parseGameCommand(data *[]byte, offset int, lastCommandListIdx int) (RawGame
 	*/
 	derefedData := *data
 	commandType := int(derefedData[offset+1])
-	// slog.Debug(fmt.Sprintf("Parsing game command with type=%v at offset=%v", commandType, offset))
 	tenBytesOffset := offset
 	offset += 10
 	if commandType == 14 {
@@ -293,6 +292,7 @@ func parseGameCommand(data *[]byte, offset int, lastCommandListIdx int) (RawGame
 		&sourceVectors,
 		&preArgumentBytes,
 	)
+	//slog.Debug(fmt.Sprintf("Parsing game command with type=%v at offset=%v", commandType, strconv.FormatInt(int64(offset), 16)))
 	gameCommand := refiner(&baseCmd, data)
 	offset += gameCommand.ByteLength()
 

parser/gameCommands.go

@@ -602,7 +602,7 @@ type FinishUnitTransformCommand struct {
 }
 
 func (cmd FinishUnitTransformCommand) Refine(baseCommand *BaseCommand, data *[]byte) RawGameCommand {
-	inputTypes := []func() int{unpackInt32, unpackInt32, unpackInt32, unpackInt8, unpackInt8}
+	inputTypes := []func() int{unpackInt32, unpackInt32, unpackInt32, unpackInt32, unpackInt8, unpackInt8}
 	byteLength := 0
 	for _, f := range inputTypes {
 		byteLength += f()

parser/header.go

@@ -112,6 +112,18 @@ func areBytesValidTokens(bytes ...byte) bool {
 		Determine whether any byte sequence is a valid Node token. Although there are no restrictions
 		on this function, a valid token must only be two bytes.
 	*/
+	if len(bytes) != 2 {
+		return false
+	}
+
+	// For now, we are skipping the values "kL" as that is not a valid node, but it now appears directly after the
+	// BG => GM => GD node, which was breaking the XMB parsing logic.
+	// TODO: Figure out what kL actually is, probably some data identifier, showcasing data length or something like
+	// that.
+	if bytes[0] == 107 && bytes[1] == 76 {
+		slog.Debug("Skipping token kL")
+		return false
+	}
 	allValid := true
 	for _, b := range bytes {
 		allValid = allValid && validAlphaNumericAscii(b)

parser/parser.go

@@ -54,7 +54,7 @@ func Parse(replayPath string, slim bool, stats bool, isGzip bool) (ReplayFormatt
 	if err != nil {
 		return ReplayFormatted{}, err
 	}
-	// saveHex(&data, "decompressed.hex")
+	//saveHex(&data, "decompressed.hex")
 
 	rootNode := parseHeader(&data)
 
@@ -74,12 +74,16 @@ func Parse(replayPath string, slim bool, stats bool, isGzip bool) (ReplayFormatt
 		return ReplayFormatted{}, err
 	}
 	//printProfileKeys(profileKeys)
-	// techtreerootnode, err := parseXmb(&data, xmbMap["techtree"])
+	// for key, _ := range xmbMap {
+	// 	fmt.Println("==========================")
+	// 	fmt.Println(key)
+	// }
+	// techtreerootnode, err := parseXmb(&data, xmbMap["protounitcommands"])
 	// if err != nil {
 	// 	return ReplayFormatted{}, err
 	// }
 	// for _, child := range techtreerootnode.children {
-	// 	fmt.Println(child.attributes["name"])
+	// 	fmt.Println(child)
 	// }
 
 	svBytes := bytes.Index(raw_data, []byte{0x73, 0x76}) // search for index of the "sv" bytes

parser/types.go

@@ -118,7 +118,7 @@ func (err FooterNotFoundError) Error() string {
 type UnkNotEqualTo1Error int
 
 func (err UnkNotEqualTo1Error) Error() string {
-	return fmt.Sprintf("The unknown byte in footer search did not equal 1 at offset %v", int(err))
+	return fmt.Sprintf("The unknown byte in footer search did not equal 1 at offset %v", strconv.FormatInt(int64(err), 16))
 }
 
 // ===============================

parser/xmb.go

@@ -25,7 +25,9 @@ func parseXmbMap(data *[]byte, rootNode Node) (map[string]XmbFile, error) {
 			if numFiles > 1 {
 				// Read two strings, keep the second as xmbName
 				str1 := readString(data, offset)
+				// slog.Debug("String 1", "str1", str1.value)
 				xmbName = readString(data, str1.endOffset)
+				// slog.Debug("String 2", "xmbName", xmbName.value)
 				offset = xmbName.endOffset
 			} else {
 				// If there is only one XMB file, it is stored 20 bytes after the start of the node
@@ -44,6 +46,7 @@ func parseXmbMap(data *[]byte, rootNode Node) (map[string]XmbFile, error) {
 }
 
 func parseXmb(data *[]byte, xmbFile XmbFile) (XmbNode, error) {
+	slog.Debug("Parsing XMB file", "xmbFile", xmbFile.name)
 	offset := xmbFile.offset
 	x1 := readUint16(data, offset)
 	if x1 != 12632 {