Merge pull request #254 from markus-wa/impact-data

Operation Broken Fang: RoundImpactScoreData

Author: markus-wa

.golangci.yml

@@ -17,6 +17,7 @@ linters:
     - gomnd
     - exhaustivestruct
     - godot
+    - gofumpt
 issues:
   exclude-rules:
     # Exclude some linters from running on tests files.

pkg/demoinfocs/common/player.go

@@ -281,7 +281,7 @@ func (p *Player) ViewDirectionY() float32 {
 }
 
 // Position returns the in-game coordinates.
-//Like the ones you get from cl_showpos 1.
+// Like the ones you get from cl_showpos 1.
 func (p *Player) Position() r3.Vector {
 	if p.Entity == nil {
 		return r3.Vector{}

pkg/demoinfocs/datatables_test.go

@@ -72,6 +72,7 @@ func TestParser_BindNewPlayer_Issue98_Reconnect(t *testing.T) {
 func TestParser_BindNewPlayer_PlayerSpotted_Under32(t *testing.T) {
 	testPlayerSpotted(t, "m_bSpottedByMask.000")
 }
+
 func TestParser_BindNewPlayer_PlayerSpotted_Over32(t *testing.T) {
 	testPlayerSpotted(t, "m_bSpottedByMask.001")
 }

pkg/demoinfocs/debug_on.go

@@ -18,11 +18,13 @@ const (
 
 // Can be overridden via -ldflags '-X github.com/markus-wa/demoinfocs-golang.debugServerClasses=YES'
 // Oh and btw we cant use bools for this, Go says 'cannot use -X with non-string symbol'
-var debugGameEvents = yes
-var debugUnhandledMessages = no
-var debugIngameTicks = yes
-var debugDemoCommands = no
-var debugServerClasses = no
+var (
+	debugGameEvents        = yes
+	debugUnhandledMessages = no
+	debugIngameTicks       = yes
+	debugDemoCommands      = no
+	debugServerClasses     = no
+)
 
 func debugGameEvent(d *msg.CSVCMsg_GameEventListDescriptorT, ge *msg.CSVCMsg_GameEvent) {
 	const (

pkg/demoinfocs/events/events.go

@@ -541,3 +541,8 @@ type PlayerSpottersChanged struct {
 type ConVarsUpdated struct {
 	UpdatedConVars map[string]string
 }
+
+// RoundImpactScoreData contains impact assessments of events that happened during the last round.
+type RoundImpactScoreData struct {
+	RawMessage *msg.CCSUsrMsg_RoundImpactScoreData
+}

pkg/demoinfocs/events/events_test.go

@@ -69,6 +69,7 @@ func (p demoInfoProviderMock) TickRate() float64 {
 func (p demoInfoProviderMock) FindPlayerByHandle(int) *common.Player {
 	return nil
 }
+
 func (p demoInfoProviderMock) PlayerResourceEntity() st.Entity {
 	return nil
 }

pkg/demoinfocs/user_messages.go

@@ -44,9 +44,10 @@ func newUserMessageHandler(parser *parser) userMessageHandler {
 	umh := userMessageHandler{parser: parser}
 
 	umh.msgTypeToHandler = map[msg.ECstrike15UserMessages]userMessageHandlerFunc{
-		msg.ECstrike15UserMessages_CS_UM_SayText:          umh.sayText,
-		msg.ECstrike15UserMessages_CS_UM_SayText2:         umh.sayText2,
-		msg.ECstrike15UserMessages_CS_UM_ServerRankUpdate: umh.rankUpdate,
+		msg.ECstrike15UserMessages_CS_UM_SayText:              umh.sayText,
+		msg.ECstrike15UserMessages_CS_UM_SayText2:             umh.sayText2,
+		msg.ECstrike15UserMessages_CS_UM_ServerRankUpdate:     umh.rankUpdate,
+		msg.ECstrike15UserMessages_CS_UM_RoundImpactScoreData: umh.roundImpactScoreData,
 		// TODO: handle more user messages (if they are interesting)
 		// Maybe msg.ECstrike15UserMessages_CS_UM_RadioText
 	}
@@ -142,3 +143,17 @@ func (umh userMessageHandler) rankUpdate(um *msg.CSVCMsg_UserMessage) {
 		})
 	}
 }
+
+func (umh userMessageHandler) roundImpactScoreData(um *msg.CSVCMsg_UserMessage) {
+	impactData := new(msg.CCSUsrMsg_RoundImpactScoreData)
+	err := impactData.Unmarshal(um.MsgData)
+
+	if err != nil {
+		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("failed to decode RoundImpactScoreData message: %s", err.Error())})
+		unassert.Error("failed to decode RoundImpactScoreData message: %s", err.Error())
+	}
+
+	umh.dispatch(events.RoundImpactScoreData{
+		RawMessage: impactData,
+	})
+}