events: add PlayerFlashed.Projectile attribute (#158)

Author: markus-wa

datatables.go

@@ -419,6 +419,8 @@ func (p *Parser) nadeProjectileDestroyed(proj *common.GrenadeProjectile) {
 	})
 
 	delete(p.gameState.grenadeProjectiles, proj.EntityID)
+
+	p.gameState.lastFlash.projectile = proj
 }
 
 func (p *Parser) bindWeapon(entity *st.Entity, wepType common.EquipmentElement) {

events/events.go

@@ -248,8 +248,9 @@ type GrenadeProjectileDestroy struct {
 
 // PlayerFlashed signals that a player was flashed.
 type PlayerFlashed struct {
-	Player   *common.Player
-	Attacker *common.Player
+	Player     *common.Player
+	Attacker   *common.Player
+	Projectile *common.GrenadeProjectile
 }
 
 // FlashDuration returns the duration of the blinding effect.

game_events.go

@@ -320,15 +320,16 @@ func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKey
 
 func (geh gameEventHandler) playerBlind(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	geh.dispatch(events.PlayerFlashed{
-		Player:   geh.playerByUserID32(data["userid"].GetValShort()),
-		Attacker: geh.gameState().lastFlasher,
+		Player:     geh.playerByUserID32(data["userid"].GetValShort()),
+		Attacker:   geh.gameState().lastFlash.player,
+		Projectile: geh.gameState().lastFlash.projectile,
 	})
 }
 
 func (geh gameEventHandler) flashBangDetonate(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	nadeEvent := geh.nadeEvent(data, common.EqFlash)
 
-	geh.gameState().lastFlasher = nadeEvent.Thrower
+	geh.gameState().lastFlash.player = nadeEvent.Thrower
 	geh.dispatch(events.FlashExplode{
 		GrenadeEvent: nadeEvent,
 	})

game_state.go

@@ -24,11 +24,16 @@ type GameState struct {
 	gamePhase          common.GamePhase
 	isWarmupPeriod     bool
 	isMatchStarted     bool
-	lastFlasher        *common.Player // Last player whose flash exploded, used to find the attacker for player_blind events
+	lastFlash          lastFlasher    // Information about the last flash that exploded, used to find the attacker and projectile for player_blind events
 	currentDefuser     *common.Player // Player currently defusing the bomb, if any
 	currentPlanter     *common.Player // Player currently planting the bomb, if any
 }
 
+type lastFlasher struct {
+	player     *common.Player
+	projectile *common.GrenadeProjectile
+}
+
 type ingameTickNumber int
 
 func (gs *GameState) handleIngameTickNumber(n ingameTickNumber) {