Merge branch 'master' into fix-nade-counts

Author: markus-wa

pkg/demoinfocs/common/player.go

@@ -363,7 +363,7 @@ func (p *Player) Health() int {
 // Armor returns the player's armor points, normally 0-100.
 func (p *Player) Armor() int {
 	if p.demoInfoProvider.IsSource2() {
-		return getInt(p.Entity, "m_iPawnArmor")
+		return getInt(p.PlayerPawnEntity(), "m_ArmorValue")
 	}
 
 	return getInt(p.Entity, "m_ArmorValue")

pkg/demoinfocs/events/events.go

@@ -510,6 +510,25 @@ func (ru RankUpdate) SteamID64() uint64 {
 	return common.ConvertSteamID32To64(uint32(ru.SteamID32))
 }
 
+// OtherDeath signals that there has occurred a death of something that is not a player.
+// For example chickens.
+type OtherDeath struct {
+	Killer            *common.Player // May be nil
+	Weapon            *common.Equipment
+	PenetratedObjects int
+	NoScope           bool
+	KillerBlind       bool
+	ThroughSmoke      bool
+
+	OtherType     string
+	OtherID       int32
+	OtherPosition r3.Vector
+}
+
+func (od OtherDeath) IsWallBang() bool {
+	return od.PenetratedObjects > 0
+}
+
 // ItemEquip signals an item was equipped.
 // This event is not available in all demos.
 type ItemEquip struct {

pkg/demoinfocs/game_events.go

@@ -210,7 +210,7 @@ func newGameEventHandler(parser *parser, ignoreBombsiteIndexNotFound bool) gameE
 		"item_pickup_slerp":               nil,                                   // Not sure, only in locally recorded (POV) demos
 		"item_remove":                     geh.itemRemove,                        // Dropped?
 		"jointeam_failed":                 nil,                                   // Dunno, only in locally recorded (POV) demos
-		"other_death":                     nil,                                   // Dunno
+		"other_death":                     geh.otherDeath,                        // Other deaths, like chickens.
 		"player_blind":                    delay(geh.playerBlind),                // Player got blinded by a flash. Delayed because Player.FlashDuration hasn't been updated yet
 		"player_changename":               nil,                                   // Name change
 		"player_connect":                  geh.playerConnect,                     // Bot connected or player reconnected, players normally come in via string tables & data tables
@@ -839,6 +839,28 @@ func (geh gameEventHandler) itemRemove(data map[string]*msg.CSVCMsg_GameEventKey
 	})
 }
 
+func (geh gameEventHandler) otherDeath(data map[string]*msg.CSVCMsg_GameEventKeyT) {
+	killer := geh.playerByUserID32(data["attacker"].GetValShort())
+	otherType := data["othertype"].GetValString()
+	otherID := data["otherid"].GetValShort()
+	otherPosition := geh.gameState().entities[int(otherID)].Position()
+	wepType := common.MapEquipment(data["weapon"].GetValString())
+	weapon := getPlayerWeapon(killer, wepType)
+
+	geh.dispatch(events.OtherDeath{
+		Killer:            killer,
+		Weapon:            weapon,
+		PenetratedObjects: int(data["penetrated"].GetValShort()),
+		NoScope:           data["noscope"].GetValBool(),
+		ThroughSmoke:      data["thrusmoke"].GetValBool(),
+		KillerBlind:       data["attackerblind"].GetValBool(),
+
+		OtherType:     otherType,
+		OtherID:       otherID,
+		OtherPosition: otherPosition,
+	})
+}
+
 func (geh gameEventHandler) itemEvent(data map[string]*msg.CSVCMsg_GameEventKeyT) (*common.Player, *common.Equipment) {
 	player := geh.playerByUserID32(data["userid"].GetValShort())
 

pkg/demoinfocs/sendtables2/field_decoder.go

@@ -327,7 +327,7 @@ func runeTimeDecoder(r *reader) interface{} {
 }
 
 func simulationTimeDecoder(r *reader) interface{} {
-	return float32(r.readVarUint32()) * (1.0 / 30)
+	return float32(r.readVarUint32()) * (1.0 / 64)
 }
 
 func readBitCoordPres(r *reader) float32 {