WIP: s2 entities part 2

markus-wa · markus-wa · commit 5dc8727765bd · 2023-05-19T00:33:55.000+01:00
diff --git a/pkg/demoinfocs/datatables.go b/pkg/demoinfocs/datatables.go
@@ -14,7 +14,7 @@ import (
 )
 
 func (p *parser) mapEquipment() {
-	for _, sc := range p.stParser.ServerClasses() {
+	for _, sc := range p.stParser.ServerClasses().All() {
 		switch sc.Name() {
 		case "CC4":
 			p.equipmentMapping[sc] = common.EqBomb
@@ -107,8 +107,15 @@ func (p *parser) bindBomb() {
 }
 
 func (p *parser) bindTeamStates() {
+	fmt.Println(p.stParser.ServerClasses().FindByName("CCSTeam"))
 	p.stParser.ServerClasses().FindByName("CCSTeam").OnEntityCreated(func(entity st.Entity) {
-		team := entity.PropertyValueMust("m_szTeamname").StringVal
+		teamVal := entity.PropertyValueMust("m_szTeamname")
+		team := teamVal.StringVal
+
+		// FIXME: S2 fix
+		if team == "" {
+			team = teamVal.Any.(string)
+		}
 
 		var s *common.TeamState
 
@@ -131,13 +138,21 @@ func (p *parser) bindTeamStates() {
 
 			// Register updates
 			var score int
-			entity.Property("m_scoreTotal").OnUpdate(func(val st.PropertyValue) {
+
+			scoreProp := entity.Property("m_scoreTotal")
+
+			// FIXME: S2 fix
+			if scoreProp == nil {
+				scoreProp = entity.Property("m_iScore")
+			}
+
+			scoreProp.OnUpdate(func(val st.PropertyValue) {
 				oldScore := score
-				score = val.IntVal
+				score = val.IntVal // FIXME: fix for S2
 
 				p.eventDispatcher.Dispatch(events.ScoreUpdated{
 					OldScore:  oldScore,
-					NewScore:  val.IntVal,
+					NewScore:  val.IntVal, // FIXME: fix for S2
 					TeamState: s,
 				})
 			})
@@ -161,7 +176,8 @@ func (p *parser) bindBombSites() {
 }
 
 func (p *parser) bindPlayers() {
-	p.stParser.ServerClasses().FindByName("CCSPlayer").OnEntityCreated(func(player st.Entity) {
+	fmt.Println(p.stParser.ServerClasses().FindByName("CCSPlayerPawn"))
+	p.stParser.ServerClasses().FindByName("CCSPlayerPawn").OnEntityCreated(func(player st.Entity) {
 		p.bindNewPlayer(player)
 	})
 
@@ -340,7 +356,7 @@ func (p *parser) bindPlayerWeapons(playerEntity st.Entity, pl *common.Player) {
 }
 
 func (p *parser) bindWeapons() {
-	for _, sc := range p.stParser.ServerClasses() {
+	for _, sc := range p.stParser.ServerClasses().All() {
 		for _, bc := range sc.BaseClasses() {
 			switch bc.Name() {
 			case "CWeaponCSBase":
diff --git a/pkg/demoinfocs/demoinfocs_test.go b/pkg/demoinfocs/demoinfocs_test.go
@@ -218,7 +218,7 @@ func TestS2(t *testing.T) {
 	assertions.NoError(err, "error returned by Parser.ParseHeader()")
 
 	p.RegisterEventHandler(func(event events.GenericGameEvent) {
-		fmt.Println(event.Name, event)
+		//fmt.Println(event.Name, event)
 	})
 
 	t.Log("Parsing to end")
diff --git a/pkg/demoinfocs/parser.go b/pkg/demoinfocs/parser.go
@@ -91,7 +91,7 @@ type parser struct {
 
 	bombsiteA            bombsite
 	bombsiteB            bombsite
-	equipmentMapping     map[*st.ServerClass]common.EquipmentType        // Maps server classes to equipment-types
+	equipmentMapping     map[st.ServerClass]common.EquipmentType         // Maps server classes to equipment-types
 	rawPlayers           map[int]*common.PlayerInfo                      // Maps entity IDs to 'raw' player info
 	modelPreCache        []string                                        // Used to find out whether a weapon is a p250 or cz for example (same id)
 	triggers             map[int]*boundingBoxInformation                 // Maps entity IDs to triggers (used for bombsites)
@@ -360,7 +360,7 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 
 	// Init parser
 	p.bitReader = bit.NewLargeBitReader(demostream)
-	p.equipmentMapping = make(map[*st.ServerClass]common.EquipmentType)
+	p.equipmentMapping = make(map[st.ServerClass]common.EquipmentType)
 	p.rawPlayers = make(map[int]*common.PlayerInfo)
 	p.triggers = make(map[int]*boundingBoxInformation)
 	p.demoInfoProvider = demoInfoProvider{parser: &p}
diff --git a/pkg/demoinfocs/parsing.go b/pkg/demoinfocs/parsing.go
@@ -72,7 +72,6 @@ func (p *parser) ParseHeader() (common.DemoHeader, error) {
 		p.stParser = sendtables2.NewParser()
 
 		p.RegisterNetMessageHandler(p.stParser.OnServerInfo)
-		p.RegisterNetMessageHandler(p.stParser.OnDemoClassInfo)
 		p.RegisterNetMessageHandler(p.stParser.OnPacketEntities)
 
 	default:
diff --git a/pkg/demoinfocs/s2_commands.go b/pkg/demoinfocs/s2_commands.go
@@ -25,6 +25,15 @@ func (p *parser) handleSendTables(msg *msgs2.CDemoSendTables) {
 }
 
 func (p *parser) handleClassInfo(msg *msgs2.CDemoClassInfo) {
+	p.msgDispatcher.SyncAllQueues()
+
+	err := p.stParser.OnDemoClassInfo(msg)
+	if err != nil {
+		panic(err)
+	}
+
+	p.mapEquipment()
+	p.bindEntities()
 }
 
 var netMsgCreators = map[msgs2.NET_Messages]NetMessageCreator{
diff --git a/pkg/demoinfocs/sendtables/entity.go b/pkg/demoinfocs/sendtables/entity.go
@@ -13,7 +13,7 @@ import (
 
 // entity stores a entity in the game (e.g. players etc.) with its properties.
 type entity struct {
-	serverClass *ServerClass
+	serverClass *serverClass
 	id          int
 	serialNum   int
 	props       []property
@@ -26,7 +26,7 @@ type entity struct {
 }
 
 // ServerClass returns the entity's server-class.
-func (e *entity) ServerClass() *ServerClass {
+func (e *entity) ServerClass() ServerClass {
 	return e.serverClass
 }
 
diff --git a/pkg/demoinfocs/sendtables/entity_interface.go b/pkg/demoinfocs/sendtables/entity_interface.go
@@ -4,14 +4,15 @@ package sendtables
 
 import (
 	"github.com/golang/geo/r3"
+
 	bit "github.com/markus-wa/demoinfocs-golang/v3/internal/bitread"
 )
 
 // Entity is an auto-generated interface for entity, intended to be used when mockability is needed.
 // entity stores a entity in the game (e.g. players etc.) with its properties.
 type Entity interface {
 	// ServerClass returns the entity's server-class.
-	ServerClass() *ServerClass
+	ServerClass() ServerClass
 	// ID returns the entity's ID.
 	ID() int
 	// SerialNum returns the entity's serial number.
diff --git a/pkg/demoinfocs/sendtables/entity_test.go b/pkg/demoinfocs/sendtables/entity_test.go
@@ -16,7 +16,7 @@ var testData = struct {
 			{value: PropertyValue{IntVal: 30}},
 		},
 		serialNum: 1337,
-		serverClass: &ServerClass{propNameToIndex: map[string]int{
+		serverClass: &serverClass{propNameToIndex: map[string]int{
 			"myProp":     0,
 			"test":       1,
 			"anotherOne": 2,
diff --git a/pkg/demoinfocs/sendtables/fake/entity.go b/pkg/demoinfocs/sendtables/fake/entity.go
@@ -30,8 +30,8 @@ type Entity struct {
 }
 
 // ServerClass is a mock-implementation of Entity.ServerClass().
-func (e *Entity) ServerClass() *st.ServerClass {
-	return e.Called().Get(0).(*st.ServerClass)
+func (e *Entity) ServerClass() st.ServerClass {
+	return e.Called().Get(0).(st.ServerClass)
 }
 
 // ID is a mock-implementation of Entity.ID().
diff --git a/pkg/demoinfocs/sendtables/propdecoder.go b/pkg/demoinfocs/sendtables/propdecoder.go
@@ -35,6 +35,7 @@ const (
 	PropTypeArray
 	PropTypeDataTable
 	PropTypeInt64
+	PropTypeAny
 )
 
 const (
@@ -95,6 +96,7 @@ type PropertyValue struct {
 	ArrayVal  []PropertyValue
 	StringVal string
 	FloatVal  float32
+	Any       any
 }
 
 // BoolVal returns true if IntVal > 0.
diff --git a/pkg/demoinfocs/sendtables/sendtables.go b/pkg/demoinfocs/sendtables/sendtables.go
@@ -43,13 +43,15 @@ type flattenedPropEntry struct {
 	name             string
 }
 
-// ServerClass stores meta information about Entity types (e.g. palyers, teams etc.).
-type ServerClass struct {
+//go:generate ifacemaker -f sendtables.go -s serverClass -i ServerClass -p sendtables -D -y "ServerClass is an auto-generated interface for property, intended to be used when mockability is needed." -c "DO NOT EDIT: Auto generated" -o serverclass_interface.go
+
+// serverClass stores meta information about Entity types (e.g. palyers, teams etc.).
+type serverClass struct {
 	id              int
 	name            string
 	dataTableID     int
 	dataTableName   string
-	baseClasses     []*ServerClass
+	baseClasses     []*serverClass
 	flattenedProps  []flattenedPropEntry
 	propNameToIndex map[string]int
 
@@ -59,32 +61,36 @@ type ServerClass struct {
 }
 
 // ID returns the server-class's ID.
-func (sc *ServerClass) ID() int {
+func (sc *serverClass) ID() int {
 	return sc.id
 }
 
 // Name returns the server-class's name.
-func (sc *ServerClass) Name() string {
+func (sc *serverClass) Name() string {
 	return sc.name
 }
 
 // DataTableID returns the data-table ID.
-func (sc *ServerClass) DataTableID() int {
+func (sc *serverClass) DataTableID() int {
 	return sc.dataTableID
 }
 
 // DataTableName returns the data-table name.
-func (sc *ServerClass) DataTableName() string {
+func (sc *serverClass) DataTableName() string {
 	return sc.dataTableName
 }
 
 // BaseClasses returns the base-classes of this server-class.
-func (sc *ServerClass) BaseClasses() []*ServerClass {
-	return sc.baseClasses
+func (sc *serverClass) BaseClasses() (res []ServerClass) {
+	for _, v := range sc.baseClasses {
+		res = append(res, v)
+	}
+
+	return
 }
 
 // PropertyEntries returns the names of all property-entries on this server-class.
-func (sc *ServerClass) PropertyEntries() []string {
+func (sc *serverClass) PropertyEntries() []string {
 	propEntryCount := len(sc.flattenedProps)
 	names := make([]string, propEntryCount)
 
@@ -102,7 +108,7 @@ type PropertyEntry struct {
 }
 
 // PropertyEntryDefinitions returns all property-entries on this server-class.
-func (sc *ServerClass) PropertyEntryDefinitions() []PropertyEntry {
+func (sc *serverClass) PropertyEntryDefinitions() []PropertyEntry {
 	propEntryCount := len(sc.flattenedProps)
 	res := make([]PropertyEntry, propEntryCount)
 
@@ -120,7 +126,7 @@ func (sc *ServerClass) PropertyEntryDefinitions() []PropertyEntry {
 	return res
 }
 
-func (sc *ServerClass) newEntity(entityDataReader *bit.BitReader, entityID int, serialNum int, recordingPlayerSlot int) *entity {
+func (sc *serverClass) newEntity(entityDataReader *bit.BitReader, entityID int, serialNum int, recordingPlayerSlot int) *entity {
 	props := make([]property, len(sc.flattenedProps))
 
 	for i := range sc.flattenedProps {
@@ -156,23 +162,23 @@ func (sc *ServerClass) newEntity(entityDataReader *bit.BitReader, entityID int,
 	return entity
 }
 
-// OnEntityCreated registers a function to be called when a new entity is created from this ServerClass.
-func (sc *ServerClass) OnEntityCreated(handler EntityCreatedHandler) {
+// OnEntityCreated registers a function to be called when a new entity is created from this serverClass.
+func (sc *serverClass) OnEntityCreated(handler EntityCreatedHandler) {
 	sc.createdHandlers = append(sc.createdHandlers, handler)
 }
 
 // EntityCreatedHandler is the interface for handlers that are interested in EntityCreatedEvents.
 type EntityCreatedHandler func(Entity)
 
-var serverClassStringFormat = `ServerClass: id=%d name=%s
+var serverClassStringFormat = `serverClass: id=%d name=%s
 	dataTableId=%d
 	dataTableName=%s
 	baseClasses:
 		%s
 	properties:
 		%s`
 
-func (sc *ServerClass) String() string {
+func (sc *serverClass) String() string {
 	baseClasses := make([]string, len(sc.baseClasses))
 	for i, bc := range sc.baseClasses {
 		baseClasses[i] = bc.name
diff --git a/pkg/demoinfocs/sendtables/sendtables_test.go b/pkg/demoinfocs/sendtables/sendtables_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestServerClassGetters(t *testing.T) {
-	sc := ServerClass{
+	sc := serverClass{
 		id:            1,
 		name:          "TestClass",
 		dataTableID:   2,
@@ -21,7 +21,7 @@ func TestServerClassGetters(t *testing.T) {
 }
 
 func TestServerClassPropertyEntries(t *testing.T) {
-	var sc ServerClass
+	var sc serverClass
 
 	assert.Empty(t, sc.PropertyEntries())
 
@@ -31,14 +31,14 @@ func TestServerClassPropertyEntries(t *testing.T) {
 }
 
 func TestServerClassString(t *testing.T) {
-	sc := ServerClass{
+	sc := serverClass{
 		id:            1,
 		name:          "TestClass",
 		dataTableID:   2,
 		dataTableName: "ADataTable",
 	}
 
-	expectedString := `ServerClass: id=1 name=TestClass
+	expectedString := `serverClass: id=1 name=TestClass
 	dataTableId=2
 	dataTableName=ADataTable
 	baseClasses:
@@ -48,10 +48,10 @@ func TestServerClassString(t *testing.T) {
 
 	assert.Equal(t, expectedString, sc.String())
 
-	sc.baseClasses = []*ServerClass{{name: "AnotherClass"}, {name: "YetAnotherClass"}}
+	sc.baseClasses = []*serverClass{{name: "AnotherClass"}, {name: "YetAnotherClass"}}
 	sc.flattenedProps = []flattenedPropEntry{{name: "prop1"}, {name: "prop2"}}
 
-	expectedString = `ServerClass: id=1 name=TestClass
+	expectedString = `serverClass: id=1 name=TestClass
 	dataTableId=2
 	dataTableName=ADataTable
 	baseClasses:
diff --git a/pkg/demoinfocs/sendtables/st_parser.go b/pkg/demoinfocs/sendtables/st_parser.go
diff --git a/pkg/demoinfocs/sendtables2/class.go b/pkg/demoinfocs/sendtables2/class.go
diff --git a/pkg/demoinfocs/sendtables2/entity.go b/pkg/demoinfocs/sendtables2/entity.go
diff --git a/pkg/demoinfocs/sendtables2/field_reader.go b/pkg/demoinfocs/sendtables2/field_reader.go
diff --git a/pkg/demoinfocs/sendtables2/parser.go b/pkg/demoinfocs/sendtables2/parser.go

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,15 @@ func (p parser) handleSendTables(msg msgs2.CDemoSendTables) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func (p parser) handleClassInfo(msg msgs2.CDemoClassInfo) {`
	`28`	`+ p.msgDispatcher.SyncAllQueues()`
	`29`	`+`
	`30`	`+ err := p.stParser.OnDemoClassInfo(msg)`
	`31`	`+ if err != nil {`
	`32`	`+ panic(err)`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ p.mapEquipment()`
	`36`	`+ p.bindEntities()`
`28`	`37`	`}`
`29`	`38`
`30`	`39`	`var netMsgCreators = map[msgs2.NET_Messages]NetMessageCreator{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`// entity stores a entity in the game (e.g. players etc.) with its properties.`
`15`	`15`	`type entity struct {`
`16`		`- serverClass *ServerClass`
	`16`	`+ serverClass *serverClass`
`17`	`17`	`id int`
`18`	`18`	`serialNum int`
`19`	`19`	`props []property`
`@@ -26,7 +26,7 @@ type entity struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// ServerClass returns the entity's server-class.`
`29`		`-func (e entity) ServerClass() ServerClass {`
	`29`	`+func (e *entity) ServerClass() ServerClass {`
`30`	`30`	`return e.serverClass`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ type Entity struct {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// ServerClass is a mock-implementation of Entity.ServerClass().`
`33`		`-func (e Entity) ServerClass() st.ServerClass {`
`34`		`- return e.Called().Get(0).(*st.ServerClass)`
	`33`	`+func (e *Entity) ServerClass() st.ServerClass {`
	`34`	`+ return e.Called().Get(0).(st.ServerClass)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// ID is a mock-implementation of Entity.ID().`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ const (`
`35`	`35`	`PropTypeArray`
`36`	`36`	`PropTypeDataTable`
`37`	`37`	`PropTypeInt64`
	`38`	`+ PropTypeAny`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`const (`
`@@ -95,6 +96,7 @@ type PropertyValue struct {`
`95`	`96`	`ArrayVal []PropertyValue`
`96`	`97`	`StringVal string`
`97`	`98`	`FloatVal float32`
	`99`	`+ Any any`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`// BoolVal returns true if IntVal > 0.`