common: add Player.IsPlanting attribute (#132)

Author: markus-wa

common/player.go

@@ -40,6 +40,7 @@ type Player struct {
 	IsConnected                 bool
 	IsDucking                   bool
 	IsDefusing                  bool
+	IsPlanting                  bool
 	HasDefuseKit                bool
 	HasHelmet                   bool
 }

datatables.go

@@ -72,14 +72,27 @@ func (p *Parser) bindEntities() {
 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) {
+	// Track bomb when it is dropped on the ground or being held by a player
+	scC4 := p.stParser.ServerClasses().FindByName("CC4")
+	scC4.OnEntityCreated(func(bombEntity *st.Entity) {
+		bombEntity.OnPositionUpdate(func(pos r3.Vector) {
 			// Bomb only has a position when not held by a player
-			p.gameState.bomb.Carrier = nil
+			bomb.Carrier = nil
 
-			p.gameState.bomb.LastOnGroundPosition = pos
+			bomb.LastOnGroundPosition = pos
+		})
+
+		bombEntity.FindPropertyI("m_hOwner").OnUpdate(func(val st.PropertyValue) {
+			bomb.Carrier = p.gameState.Participants().FindByHandle(val.IntVal)
+		})
+
+		bombEntity.FindPropertyI("m_bStartedArming").OnUpdate(func(val st.PropertyValue) {
+			if val.IntVal != 0 {
+				p.gameState.currentPlanter = bomb.Carrier
+			} else if p.gameState.currentPlanter != nil {
+				p.gameState.currentPlanter.IsPlanting = false
+				p.eventDispatcher.Dispatch(events.BombPlantAborted{Player: p.gameState.currentPlanter})
+			}
 		})
 	})
 
@@ -91,14 +104,6 @@ func (p *Parser) bindBomb() {
 
 		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.FindPropertyI("m_hOwner").OnUpdate(func(val st.PropertyValue) {
-			bomb.Carrier = p.gameState.Participants().FindByHandle(val.IntVal)
-		})
-	})
 }
 
 func (p *Parser) bindTeamStates() {

demoinfocs_test.go

@@ -98,6 +98,23 @@ func TestDemoInfoCs(t *testing.T) {
 		}
 	})
 
+	// bomb planting checks
+	p.RegisterEventHandler(func(begin events.BombPlantBegin) {
+		if !begin.Player.IsPlanting {
+			t.Error("Player started planting but IsPlanting is false")
+		}
+	})
+	p.RegisterEventHandler(func(abort events.BombPlantAborted) {
+		if abort.Player.IsPlanting {
+			t.Error("Player aborted planting but IsPlanting is true")
+		}
+	})
+	p.RegisterEventHandler(func(planted events.BombPlanted) {
+		if planted.Player.IsPlanting {
+			t.Error("Player finished planting but IsPlanting is true")
+		}
+	})
+
 	// Check some things at match start
 	p.RegisterEventHandler(func(events.MatchStart) {
 		participants := gs.Participants()

events/events.go

@@ -286,6 +286,13 @@ type BombPlantBegin struct {
 	BombEvent
 }
 
+// BombPlantAbort signals the abortion of a plant.
+type BombPlantAborted struct {
+	Player *common.Player
+}
+
+func (BombPlantAborted) implementsBombEventIf() {}
+
 // BombPlanted signals that the bomb has been planted.
 type BombPlanted struct {
 	BombEvent

game_events.go

@@ -433,11 +433,17 @@ func (geh gameEventHandler) playerTeam(data map[string]*msg.CSVCMsg_GameEventKey
 }
 
 func (geh gameEventHandler) bombBeginPlant(data map[string]*msg.CSVCMsg_GameEventKeyT) {
-	geh.dispatch(events.BombPlantBegin{BombEvent: geh.bombEvent(data)})
+	event := events.BombPlantBegin{BombEvent: geh.bombEvent(data)}
+	event.Player.IsPlanting = true
+	geh.parser.gameState.currentPlanter = event.Player
+	geh.dispatch(event)
 }
 
 func (geh gameEventHandler) bombPlanted(data map[string]*msg.CSVCMsg_GameEventKeyT) {
-	geh.dispatch(events.BombPlanted{BombEvent: geh.bombEvent(data)})
+	event := events.BombPlanted{BombEvent: geh.bombEvent(data)}
+	event.Player.IsPlanting = false
+	geh.parser.gameState.currentPlanter = nil
+	geh.dispatch(event)
 }
 
 func (geh gameEventHandler) bombDefused(data map[string]*msg.CSVCMsg_GameEventKeyT) {

game_state.go

@@ -26,6 +26,7 @@ type GameState struct {
 	isMatchStarted     bool
 	lastFlasher        *common.Player // Last player whose flash exploded, used to find the attacker 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 ingameTickNumber int