Merge remote-tracking branch 'origin/master' into s2-fake-CMsgSource1LegacyGameEventList

Author: markus-wa

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2023 Markus Walther
+Copyright (c) 2017-2024 Markus Walther
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
-# demoinfocs-golang - CS:GO & CS2 Demo Parser
+# demoinfocs-golang - Counter-Strike 2 & CS:GO Demo Parser
 
-A blazing fast, feature complete and production ready Go library for parsing and analysing of Counter-Strike: Global Offensive (CS:GO) demos (aka replays).
+A blazing fast, feature complete and production ready Go library for parsing and analysing of Counter-Strike 2 and Counter-Strike: Global Offensive (CS:GO) demos (aka replays).
 
 Counter-Strike 2 support is experimental.
 
@@ -23,12 +23,10 @@ For business inquiries please use the contact information found on the [GitHub p
 
 ## Go Get
 
-### CS2 - ⚠️ Experimental
+### Counter-Strike 2
 
 	go get -u github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs
 
- ⚠️ The CS2 / v4 API may change in backwards incompatible ways without warning. 
-
 ### CS:GO
 
 	go get -u github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs
@@ -67,11 +65,7 @@ You can download the latest version of Go [here](https://golang.org/).
 ```terminal
 mkdir my-project
 cd my-project
-
-go mod init github.com/<YOUR_GITHUB_USER>/my-project
-# the module name (github.com/<YOUR_GITHUB_USER>/my-project) can always be changed later
-# you can also put example.com/my-project or anything else if you don't plan to publish your project
-
+go mod init my-project
 go get -u github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs
 ```
 

examples/voice-capture/README.md

@@ -1,5 +1,11 @@
 # Capturing Voice Data
 
+## CS2
+
+See https://github.com/DandrewsDev/CS2VoiceData
+
+## CS:GO
+
 This example shows how to use the library to capture voice audio from demos.
 
 Since the build process is somewhat different from the library itself (due to usage of CGO), the example has it's own repository which you can find here:

pkg/demoinfocs/common/common_test.go

@@ -212,7 +212,7 @@ type fakeProp struct {
 type demoInfoProviderMock struct {
 	tickRate             float64
 	ingameTick           int
-	playersByHandle      map[int]*Player
+	playersByHandle      map[uint64]*Player
 	entitiesByHandle     map[uint64]st.Entity
 	playerResourceEntity st.Entity
 	equipment            *Equipment
@@ -235,12 +235,12 @@ func (p demoInfoProviderMock) IngameTick() int {
 	return p.ingameTick
 }
 
-func (p demoInfoProviderMock) FindPlayerByHandle(handle int) *Player {
+func (p demoInfoProviderMock) FindPlayerByHandle(handle uint64) *Player {
 	return p.playersByHandle[handle]
 }
 
 func (p demoInfoProviderMock) FindPlayerByPawnHandle(handle uint64) *Player {
-	return p.playersByHandle[int(handle)]
+	return p.playersByHandle[handle]
 }
 
 func (p demoInfoProviderMock) PlayerResourceEntity() st.Entity {

pkg/demoinfocs/common/equipment.go

@@ -281,7 +281,18 @@ func MapEquipment(eqName string) EquipmentType {
 		wep = EqKnife
 	} else {
 		// If the eqName isn't known it will be EqUnknown as that is the default value for EquipmentType
-		wep = eqNameToWeapon[eqName]
+		if strings.HasPrefix(eqName, "m4a1_silencer") {
+			wep = EqM4A1
+		} else if strings.HasPrefix(eqName, "vesthelm") {
+			wep = EqHelmet
+		} else {
+			for name := range eqNameToWeapon {
+				if strings.HasPrefix(eqName, name) || strings.HasSuffix(eqName, name) {
+					wep = eqNameToWeapon[name]
+					break
+				}
+			}
+		}
 	}
 
 	return wep

pkg/demoinfocs/common/equipment_test.go

@@ -24,9 +24,19 @@ func TestMapEquipment(t *testing.T) {
 	assert.Equal(t, EqKnife, MapEquipment("weapon_knife_butterfly"), "'weapon_knife_butterfly' should be mapped to EqKnife")
 	assert.Equal(t, EqM4A4, MapEquipment("weapon_m4a1"), "'weapon_m4a1' should be mapped to EqM4A4") // This is correct, weapon_m4a1 == M4A4
 	assert.Equal(t, EqM4A1, MapEquipment("weapon_m4a1_silencer"), "'weapon_m4a1_silencer' should be mapped to EqM4A1")
+	assert.Equal(t, EqKevlar, MapEquipment("weapon_vest"), "'weapon_vest' should be mapped to EqKevlar")
+	assert.Equal(t, EqHelmet, MapEquipment("weapon_vesthelm"), "'weapon_vesthelm' should be mapped to EqHelmet")
 	assert.Equal(t, EqUnknown, MapEquipment("asdf"), "'asdf' should be mapped to EqUnknown")
 }
 
+func TestWeirdCS2Values(t *testing.T) {
+	assert.Equal(t, EqDeagle, MapEquipment("deagle_vip"), "'deagle_vip' should be mapped to EqDeagle")
+	assert.Equal(t, EqUSP, MapEquipment("usp_silencer_vip"), "'usp_silencer_vip' should be mapped to EqUSP")
+	assert.Equal(t, EqUSP, MapEquipment("5e_vip_usp_silencer"), "'5e_vip_usp_silencer' should be mapped to EqUSP")
+	assert.Equal(t, EqAK47, MapEquipment("5e_vip_ak47"), "'5e_vip_ak47' should be mapped to EqAK47")
+	assert.Equal(t, EqDeagle, MapEquipment("5e_default_deagle"), "'5e_default_deagle' should be mapped to EqDeagle")
+}
+
 func TestEquipment_Class(t *testing.T) {
 	assert.Equal(t, EqClassUnknown, NewEquipment(EqUnknown).Class(), "EqUnknown should have the class EqClassUnknown")
 	assert.Equal(t, EqClassPistols, NewEquipment(EqP2000).Class(), "EqP2000 should have the class EqClassPistols")

pkg/demoinfocs/common/hostage.go

@@ -57,7 +57,7 @@ func (hostage *Hostage) Leader() *Player {
 		return hostage.demoInfoProvider.FindPlayerByPawnHandle(getUInt64(hostage.Entity, "m_leader"))
 	}
 
-	return hostage.demoInfoProvider.FindPlayerByHandle(getInt(hostage.Entity, "m_leader"))
+	return hostage.demoInfoProvider.FindPlayerByHandle(uint64(getInt(hostage.Entity, "m_leader")))
 }
 
 // NewHostage creates a hostage.

pkg/demoinfocs/common/hostage_test.go

@@ -12,7 +12,7 @@ func TestHostage_Leader(t *testing.T) {
 	player := new(Player)
 	player.EntityID = 10
 	provider := demoInfoProviderMock{
-		playersByHandle: map[int]*Player{10: player},
+		playersByHandle: map[uint64]*Player{10: player},
 	}
 	hostage := hostageWithProperty("m_leader", st.PropertyValue{IntVal: 10}, provider)
 

pkg/demoinfocs/common/inferno.go

@@ -57,7 +57,7 @@ func (inf *Inferno) Thrower() *Player {
 		return inf.demoInfoProvider.FindPlayerByPawnHandle(handleProp.Handle())
 	}
 
-	return inf.demoInfoProvider.FindPlayerByHandle(handleProp.Int())
+	return inf.demoInfoProvider.FindPlayerByHandle(uint64(handleProp.Int()))
 }
 
 // Fires returns all fires (past + present).

pkg/demoinfocs/common/inferno_test.go

@@ -116,7 +116,7 @@ func TestInferno_Thrower(t *testing.T) {
 
 	player := new(Player)
 	provider := demoInfoProviderMock{
-		playersByHandle: map[int]*Player{1: player},
+		playersByHandle: map[uint64]*Player{1: player},
 	}
 
 	assert.Equal(t, player, NewInferno(provider, entity, nil).Thrower())