Merge pull request #385 from markus-wa/s2-entities-part2

WIP: s2 entities part 2

Author: markus-wa

.golangci.yml

@@ -13,7 +13,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - exportloopref

pkg/demoinfocs/common/common.go

@@ -217,9 +217,7 @@ func NewTeamState(team Team, membersCallback func(Team) []*Player) TeamState {
 // ConvertSteamIDTxtTo32 converts a Steam-ID in text format to a 32-bit variant.
 // See https://developer.valvesoftware.com/wiki/SteamID
 func ConvertSteamIDTxtTo32(steamID string) (uint32, error) {
-	if strings.HasSuffix(steamID, "]") {
-		steamID = strings.TrimSuffix(steamID, "]") // Source 2 has [U:1:397560266] instead of STEAM_0:1:198780133
-	}
+	steamID = strings.TrimSuffix(steamID, "]") // Source 2 has [U:1:397560266] instead of STEAM_0:1:198780133
 
 	arr := strings.Split(steamID, ":")
 

pkg/demoinfocs/common/common_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/golang/geo/r3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 
 	st "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/sendtables"
 	stfake "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/sendtables/fake"
@@ -179,6 +180,10 @@ type demoInfoProviderMock struct {
 	equipment            *Equipment
 }
 
+func (p demoInfoProviderMock) FindEntityByHandle(handle uint64) st.Entity {
+	panic("implement me")
+}
+
 func (p demoInfoProviderMock) TickRate() float64 {
 	return p.tickRate
 }
@@ -229,6 +234,8 @@ func entityWithProperty(propName string, value st.PropertyValue) *stfake.Entity
 func entityWithProperties(properties []fakeProp) *stfake.Entity {
 	entity := entityWithID(1)
 
+	entity.On("Property", mock.Anything).Return(nil)
+
 	for _, prop := range properties {
 		property := new(stfake.Property)
 		property.On("Value").Return(prop.value)

pkg/demoinfocs/common/entity_util.go

@@ -7,23 +7,23 @@ func getInt(entity st.Entity, propName string) int {
 		return 0
 	}
 
-	return entity.PropertyValueMust(propName).IntVal
+	return entity.PropertyValueMust(propName).Int()
 }
 
 func getFloat(entity st.Entity, propName string) float32 {
 	if entity == nil {
 		return 0
 	}
 
-	return entity.PropertyValueMust(propName).FloatVal
+	return entity.PropertyValueMust(propName).Float()
 }
 
 func getString(entity st.Entity, propName string) string {
 	if entity == nil {
 		return ""
 	}
 
-	return entity.PropertyValueMust(propName).StringVal
+	return entity.PropertyValueMust(propName).String()
 }
 
 func getBool(entity st.Entity, propName string) bool {

pkg/demoinfocs/common/player.go

@@ -35,6 +35,18 @@ type Player struct {
 	IsUnknown         bool // Used to identify unknown/broken players. see https://github.com/markus-wa/demoinfocs-golang/issues/162
 }
 
+func (p *Player) PlayerPawnEntity() st.Entity {
+	return p.demoInfoProvider.FindEntityByHandle(p.Entity.PropertyValueMust("m_hPlayerPawn").Handle())
+}
+
+func (p *Player) GetTeam() Team {
+	return Team(p.PlayerPawnEntity().PropertyValueMust("m_iTeamNum").S2UInt64())
+}
+
+func (p *Player) GetFlashDuration() float32 {
+	return p.PlayerPawnEntity().PropertyValueMust("m_flFlashDuration").Float()
+}
+
 // String returns the player's name.
 // Implements fmt.Stringer.
 func (p *Player) String() string {
@@ -53,6 +65,12 @@ func (p *Player) SteamID32() uint32 {
 
 // IsAlive returns true if the player is alive.
 func (p *Player) IsAlive() bool {
+	s2IsAlive := p.Entity.Property("m_bPawnIsAlive")
+
+	if s2IsAlive != nil {
+		return s2IsAlive.Value().BoolVal()
+	}
+
 	return p.Health() > 0 || getInt(p.Entity, "m_lifeState") == 0
 }
 
@@ -245,6 +263,12 @@ func (p *Player) ControlledBot() *Player {
 
 // Health returns the player's health points, normally 0-100.
 func (p *Player) Health() int {
+	s2Prop := p.Entity.Property("m_iPawnHealth")
+
+	if s2Prop != nil {
+		return int(s2Prop.Value().S2UInt64())
+	}
+
 	return getInt(p.Entity, "m_iHealth")
 }
 
@@ -501,6 +525,7 @@ type demoInfoProvider interface {
 	FindPlayerByHandle(handle int) *Player
 	PlayerResourceEntity() st.Entity
 	FindWeaponByEntityID(id int) *Equipment
+	FindEntityByHandle(handle uint64) st.Entity
 }
 
 // NewPlayer creates a *Player with an initialized equipment map.