feat: game event list based on network protocol

fix #566
markus-wa · Dec 2, 2024 · adad9a2 · adad9a2
1 parent ae3c7a2
commit adad9a2
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/pkg/demoinfocs/demoinfocs_test.go b/pkg/demoinfocs/demoinfocs_test.go
@@ -219,7 +219,7 @@ func TestS2(t *testing.T) {
 
 	if *update {
 		p.RegisterNetMessageHandler(func(gel *msgs2.CMsgSource1LegacyGameEventList) {
-			lo.Must0(os.WriteFile("s2_CMsgSource1LegacyGameEventList.pb.bin", lo.Must(proto.Marshal(gel)), 0600))
+			lo.Must0(os.WriteFile("event-list-dump/s2_CMsgSource1LegacyGameEventList.pb.bin", lo.Must(proto.Marshal(gel)), 0600))
 		})
 	}
 

diff --git a/pkg/demoinfocs/event-list-dump/13990.bin b/pkg/demoinfocs/event-list-dump/13990.bin
diff --git a/.../s2_CMsgSource1LegacyGameEventList.pb.bin → pkg/demoinfocs/event-list-dump/13992.bin b/.../s2_CMsgSource1LegacyGameEventList.pb.bin → pkg/demoinfocs/event-list-dump/13992.bin
diff --git a/pkg/demoinfocs/event-list-dump/14023.bin b/pkg/demoinfocs/event-list-dump/14023.bin
diff --git a/pkg/demoinfocs/parser.go b/pkg/demoinfocs/parser.go
@@ -373,9 +373,6 @@ var DefaultParserConfig = ParserConfig{
 	MsgQueueBufferSize: -1,
 }
 
-//go:embed s2_CMsgSource1LegacyGameEventList.pb.bin
-var defaultSource2FallbackGameEventListBin []byte
-
 // NewParserWithConfig returns a new Parser with a custom configuration.
 //
 // See also: NewParser() & ParserConfig
@@ -399,11 +396,6 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 	p.recordingPlayerSlot = -1
 	p.disableMimicSource1GameEvents = config.DisableMimicSource1Events
 	p.source2FallbackGameEventListBin = config.Source2FallbackGameEventListBin
-
-	if p.source2FallbackGameEventListBin == nil {
-		p.source2FallbackGameEventListBin = defaultSource2FallbackGameEventListBin
-	}
-
 	p.ignorePacketEntitiesPanic = config.IgnorePacketEntitiesPanic
 
 	dispatcherCfg := dp.Config{

diff --git a/pkg/demoinfocs/s2_commands.go b/pkg/demoinfocs/s2_commands.go
@@ -2,6 +2,7 @@ package demoinfocs
 
 import (
 	"bytes"
+	"embed"
 	"fmt"
 	"sort"
 	"time"
@@ -372,12 +373,36 @@ func (p *parser) handleFileInfo(msg *msgs2.CDemoFileInfo) {
 	p.header.PlaybackTime = time.Duration(*msg.PlaybackTime) * time.Second
 }
 
+//go:embed event-list-dump/*.bin
+var eventListFolder embed.FS
+
+func getGameEventListBinForProtocol(networkProtocol int) ([]byte, error) {
+	switch {
+	case networkProtocol < 13992:
+		return eventListFolder.ReadFile("event-list-dump/13990.bin")
+	case networkProtocol >= 13992 && networkProtocol < 14023:
+		return eventListFolder.ReadFile("event-list-dump/13992.bin")
+	default:
+		return eventListFolder.ReadFile("event-list-dump/14023.bin")
+	}
+}
+
 func (p *parser) handleDemoFileHeader(msg *msgs2.CDemoFileHeader) {
 	p.header.ClientName = msg.GetClientName()
 	p.header.ServerName = msg.GetServerName()
 	p.header.GameDirectory = msg.GetGameDirectory()
 	p.header.MapName = msg.GetMapName()
-	p.header.NetworkProtocol = int(msg.GetNetworkProtocol())
+	networkProtocol := int(msg.GetNetworkProtocol())
+	p.header.NetworkProtocol = networkProtocol
+
+	if p.source2FallbackGameEventListBin == nil {
+		gameEventListBin, err := getGameEventListBinForProtocol(networkProtocol)
+		if err != nil {
+			panic(fmt.Sprintf("failed to load game event list for protocol %d: %v", networkProtocol, err))
+		}
+
+		p.source2FallbackGameEventListBin = gameEventListBin
+	}
 }
 
 func (p *parser) updatePlayersPreviousFramePosition() {