event: add the real value of damage taken

(#244)

Author: Julien2313

pkg/demoinfocs/events/events.go

@@ -359,15 +359,17 @@ const (
 
 // PlayerHurt signals that a player has been damaged.
 type PlayerHurt struct {
-	Player       *common.Player // May be nil if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
-	Attacker     *common.Player // May be nil if the player is taking world damage (e.g. fall damage) or if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
-	Health       int
-	Armor        int
-	Weapon       *common.Equipment // May be EqUnknown for world-damage (falling / bomb).
-	WeaponString string            // Wrong for CZ, M4A1-S etc.
-	HealthDamage int
-	ArmorDamage  int
-	HitGroup     HitGroup
+	Player            *common.Player // May be nil if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
+	Attacker          *common.Player // May be nil if the player is taking world damage (e.g. fall damage) or if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
+	Health            int
+	Armor             int
+	Weapon            *common.Equipment // May be EqUnknown for world-damage (falling / bomb).
+	WeaponString      string            // Wrong for CZ, M4A1-S etc.
+	HealthDamage      int
+	ArmorDamage       int
+	HealthDamageTaken int // HealthDamage excluding over-damage (e.g. if player has 5 health and is hit for 15 damage this would be 5 instead of 15)
+	ArmorDamageTaken  int // ArmorDamage excluding over-damage (e.g. if player has 5 armor and is hit for 15 armor damage this would be 5 instead of 15)
+	HitGroup          HitGroup
 }
 
 // PlayerConnect signals that a player has started connecting.

pkg/demoinfocs/game_events.go

@@ -340,20 +340,50 @@ func (geh gameEventHandler) playerDeath(data map[string]*msg.CSVCMsg_GameEventKe
 }
 
 func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKeyT) {
+	userID := data["userid"].GetValShort()
+	player := geh.playerByUserID32(userID)
 	attacker := geh.playerByUserID32(data["attacker"].GetValShort())
+
 	wepType := common.MapEquipment(data["weapon"].GetValString())
-	userID := data["userid"].GetValShort()
 	wepType = geh.attackerWeaponType(wepType, userID)
 
+	health := int(data["health"].GetValByte())
+	armor := int(data["armor"].GetValByte())
+
+	healthDamage := int(data["dmg_health"].GetValShort())
+	armorDamage := int(data["dmg_armor"].GetValByte())
+	healthDamageTaken := healthDamage
+	armorDamageTaken := armorDamage
+
+	if healthDamageTaken > 100 {
+		healthDamageTaken = 100
+	}
+
+	if armorDamageTaken > 100 {
+		armorDamageTaken = 100
+	}
+
+	if player != nil {
+		if health == 0 {
+			healthDamageTaken = player.Health()
+		}
+
+		if armor == 0 {
+			armorDamageTaken = player.Armor()
+		}
+	}
+
 	geh.dispatch(events.PlayerHurt{
-		Player:       geh.playerByUserID32(userID),
-		Attacker:     attacker,
-		Health:       int(data["health"].GetValByte()),
-		Armor:        int(data["armor"].GetValByte()),
-		HealthDamage: int(data["dmg_health"].GetValShort()),
-		ArmorDamage:  int(data["dmg_armor"].GetValByte()),
-		HitGroup:     events.HitGroup(data["hitgroup"].GetValByte()),
-		Weapon:       geh.getEquipmentInstance(attacker, wepType),
+		Player:            player,
+		Attacker:          attacker,
+		Health:            health,
+		Armor:             armor,
+		HealthDamage:      healthDamage,
+		ArmorDamage:       armorDamage,
+		HealthDamageTaken: healthDamageTaken,
+		ArmorDamageTaken:  armorDamageTaken,
+		HitGroup:          events.HitGroup(data["hitgroup"].GetValByte()),
+		Weapon:            geh.getEquipmentInstance(attacker, wepType),
 	})
 }