Add GameState.Bomb() (#41)

Author: Michael Bang

common/structs.go

@@ -245,3 +245,22 @@ func (inf Inferno) ConvexHull3D() *s2.Loop {
 func NewInferno() *Inferno {
 	return &Inferno{uniqueID: rand.Int63()}
 }
+
+// Bomb tracks the bomb's position, and the player carrying it, if any.
+type Bomb struct {
+	// Intended for internal use only. Use Position() instead.
+	// Contains the last location of the dropped or planted bomb.
+	LastOnGroundPosition r3.Vector
+	Carrier              *Player
+}
+
+// Position returns the current position of the bomb.
+// This is either the position of the player holding it
+// or LastOnGroundPosition if it's dropped or planted.
+func (b Bomb) Position() r3.Vector {
+	if b.Carrier != nil {
+		return b.Carrier.Position
+	}
+
+	return b.LastOnGroundPosition
+}

datatables.go

@@ -65,6 +65,40 @@ func (p *Parser) bindEntities() {
 	p.bindBombSites()
 	p.bindPlayers()
 	p.bindWeapons()
+	p.bindBomb()
+}
+
+func (p *Parser) bindBomb() {
+	bomb := &p.gameState.bomb
+
+	// Track bomb when it is not held by a player
+	scDroppedC4 := p.stParser.ServerClasses().FindByName("CC4")
+	scDroppedC4.OnEntityCreated(func(bomb *st.Entity) {
+		bomb.OnPositionUpdate(func(pos r3.Vector) {
+			// Bomb only has a position when not held by a player
+			p.gameState.bomb.Carrier = nil
+
+			p.gameState.bomb.LastOnGroundPosition = pos
+		})
+	})
+
+	// Track bomb when it has been planted
+	scPlantedC4 := p.stParser.ServerClasses().FindByName("CPlantedC4")
+	scPlantedC4.OnEntityCreated(func(bombEntity *st.Entity) {
+		// Player can't hold the bomb when it has been planted
+		p.gameState.bomb.Carrier = nil
+
+		bomb.LastOnGroundPosition = bombEntity.Position()
+	})
+
+	// Track bomb when it is being held by a player
+	scPlayerC4 := p.stParser.ServerClasses().FindByName("CC4")
+	scPlayerC4.OnEntityCreated(func(bombEntity *st.Entity) {
+		bombEntity.FindProperty("m_hOwner").OnUpdate(func(val st.PropertyValue) {
+			ownerEntityID := val.IntVal & entityHandleIndexMask
+			bomb.Carrier = p.gameState.playersByEntityID[ownerEntityID]
+		})
+	})
 }
 
 func (p *Parser) bindTeamScores() {

events/events.go

@@ -271,6 +271,17 @@ type BombBeginDefuseEvent struct {
 	HasKit bool
 }
 
+// BombDropEvent signals that the bomb (C4) has been dropped.
+type BombDropEvent struct {
+	Player   *common.Player
+	EntityID int
+}
+
+// BombPickupEvent signals that the bomb (C4) has been picked up.
+type BombPickupEvent struct {
+	Player *common.Player
+}
+
 func (BombBeginDefuseEvent) implementsBombEventIf() {}
 
 // HitGroup is the type for the various HitGroupXYZ constants.

game_events.go

@@ -352,6 +352,18 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 				Weapon: weapon,
 			})
 		}
+	case "bomb_dropped": // Bomb dropped
+		player := p.gameState.playersByUserID[int(data["userid"].GetValShort())]
+		entityID := int(data["entityid"].GetValShort())
+
+		p.eventDispatcher.Dispatch(events.BombDropEvent{
+			Player:   player,
+			EntityID: entityID,
+		})
+	case "bomb_pickup": // Bomb picked up
+		p.eventDispatcher.Dispatch(events.BombPickupEvent{
+			Player: p.gameState.playersByUserID[int(data["userid"].GetValShort())],
+		})
 
 	// TODO: Might be interesting:
 	case "player_connect_full": // Connecting finished
@@ -362,10 +374,6 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 		fallthrough
 	case "weapon_reload": // Weapon reloaded
 		fallthrough
-	case "bomb_dropped": // Bomb dropped
-		fallthrough
-	case "bomb_pickup": // Bomb picked up
-		fallthrough
 	case "round_time_warning": // Round time warning
 		fallthrough
 	case "round_announce_match_point": // Match point announcement

game_state.go

@@ -15,6 +15,7 @@ type GameState struct {
 	grenadeProjectiles map[int]*common.GrenadeProjectile // Maps entity-IDs to active nade-projectiles. That's grenades that have been thrown, but have not yet detonated.
 	infernos           map[int]*common.Inferno           // Maps entity-IDs to active infernos.
 	entities           map[int]*st.Entity                // Maps entity IDs to entities
+	bomb               common.Bomb
 }
 
 type ingameTickNumber int
@@ -72,6 +73,11 @@ func (gs GameState) Entities() map[int]*st.Entity {
 	return gs.entities
 }
 
+// Bomb returns the current bomb state.
+func (gs GameState) Bomb() *common.Bomb {
+	return &gs.bomb
+}
+
 func newGameState() GameState {
 	return GameState{
 		playersByEntityID:  make(map[int]*common.Player),