Merge branch 'master' into v5

Author: markus-wa

README.md

@@ -1,4 +1,4 @@
-# demoinfocs-golang - Counter-Strike 2 & CS:GO Demo Parser
+# demoinfocs-golang - CS2 Demo Parser
 
 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).
 

examples/nade-trajectories/nade_trajectories.go

@@ -11,12 +11,11 @@ import (
 	"github.com/golang/geo/r2"
 	"github.com/llgcode/draw2d/draw2dimg"
 
-	msg "github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs/msg"
-
 	ex "github.com/markus-wa/demoinfocs-golang/v5/examples"
 	demoinfocs "github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs"
 	common "github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs/common"
 	events "github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs/events"
+	msg "github.com/markus-wa/demoinfocs-golang/v5/pkg/demoinfocs/msg"
 )
 
 type nadePath struct {
@@ -78,7 +77,7 @@ func main() {
 			}
 		}
 
-		nadeTrajectories[id].path = e.Projectile.Trajectory2
+		nadeTrajectories[id].path = e.Projectile.Trajectory
 	})
 
 	var infernos []*common.Inferno

examples/nade-trajectories/nade_trajectories.jpg

@@ -400,7 +400,7 @@ func (e *Equipment) AmmoReserve() int {
 	}
 
 	s2Prop := e.Entity.Property("m_pReserveAmmo.0000")
-	if s2Prop != nil {
+	if s2Prop != nil && s2Prop.Value().Any != nil {
 		return s2Prop.Value().Int()
 	}
 
@@ -413,6 +413,10 @@ func (e *Equipment) AmmoReserve() int {
 		return 0
 	}
 
+	if e.Class() == EqClassEquipment {
+		return 0
+	}
+
 	// if the property doesn't exist we return 0 by default
 	val, _ := e.Entity.PropertyValue("m_iPrimaryReserveAmmoCount")
 

pkg/demoinfocs/common/equipment.go

@@ -682,6 +682,13 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 			flashedEntityIDs: []int{},
 		})
 
+		proj.Trajectory = append(proj.Trajectory, common.TrajectoryEntry{
+			Tick:     p.gameState.ingameTick,
+			Position: proj.Position(),
+			FrameID:  p.CurrentFrame(),
+			Time:     p.CurrentTime(),
+		})
+
 		if !p.disableMimicSource1GameEvents {
 			p.eventDispatcher.Dispatch(events.WeaponFire{
 				Shooter: proj.Owner,
@@ -695,6 +702,13 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 	})
 
 	entity.OnDestroy(func() {
+		proj.Trajectory = append(proj.Trajectory, common.TrajectoryEntry{
+			Tick:     p.gameState.ingameTick,
+			Position: proj.Position(),
+			FrameID:  p.CurrentFrame(),
+			Time:     p.CurrentTime(),
+		})
+
 		if wep == common.EqFlash && !p.disableMimicSource1GameEvents {
 			p.gameEventHandler.dispatch(events.FlashExplode{
 				GrenadeEvent: events.GrenadeEvent{
@@ -734,15 +748,6 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 		proj.Owner = p.gameState.Participants().FindByPawnHandle(val.Handle())
 	})
 
-	entity.OnPositionUpdate(func(newPos r3.Vector) {
-		proj.Trajectory = append(proj.Trajectory, common.TrajectoryEntry{
-			Tick:     p.gameState.ingameTick,
-			Position: newPos,
-			FrameID:  p.CurrentFrame(),
-			Time:     p.CurrentTime(),
-		})
-	})
-
 	// Some demos don't have this property as it seems
 	// So we need to check for nil and can't send out bounce events if it's missing
 	if bounceProp := entity.Property("m_nBounces"); bounceProp != nil {
@@ -758,6 +763,13 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 					BounceNr:   bounceNumber,
 				})
 			}
+
+			proj.Trajectory = append(proj.Trajectory, common.TrajectoryEntry{
+				Tick:     p.gameState.ingameTick,
+				Position: proj.Position(),
+				FrameID:  p.CurrentFrame(),
+				Time:     p.CurrentTime(),
+			})
 		})
 	}
 }

pkg/demoinfocs/datatables.go

@@ -214,7 +214,7 @@ func TestS2(t *testing.T) {
 
 	if *update {
 		p.RegisterNetMessageHandler(func(gel *msg.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))
 		})
 	}
 

pkg/demoinfocs/demoinfocs_test.go

@@ -401,9 +401,6 @@ var DefaultParserConfig = ParserConfig{
 	CSTVTimeout:        10 * time.Second,
 }
 
-//go:embed s2_CMsgSource1LegacyGameEventList.pb.bin
-var defaultSource2FallbackGameEventListBin []byte
-
 // NewParserWithConfig returns a new Parser with a custom configuration.
 //
 // See also: NewParser() & ParserConfig
@@ -430,11 +427,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{