Merge pull request #166 from markus-wa/issue/164-identify-bots-controlled-by-players

add Player bot utility functions

Author: markus-wa

common/player.go

@@ -43,7 +43,7 @@ type Player struct {
 	FlashTick                   int        // In-game tick at which the player was last flashed
 	TeamState                   *TeamState // When keeping the reference make sure you notice when the player changes teams
 	Team                        Team
-	IsBot                       bool
+	IsBot                       bool // True if this is a bot-entity. See also IsControllingBot and ControlledBot().
 	IsConnected                 bool
 	IsDucking                   bool
 	IsDefusing                  bool
@@ -204,6 +204,28 @@ func (p *Player) CashSpentTotal() int {
 	return p.AdditionalPlayerInformation.TotalCashSpent
 }
 
+// IsControllingBot returns true if the player is currently controlling a bot.
+// See also ControlledBot().
+func (p *Player) IsControllingBot() bool {
+	if p.Entity == nil {
+		return false
+	}
+
+	return p.Entity.FindPropertyI("m_bIsControllingBot").Value().IntVal != 0
+}
+
+// ControlledBot returns the player instance of the bot that the player is controlling, if any.
+// Returns nil if the player is not controlling a bot.
+func (p *Player) ControlledBot() *Player {
+	if p.Entity == nil {
+		return nil
+	}
+
+	botHandle := p.Entity.FindPropertyI("m_iControlledBotEntIndex").Value().IntVal
+
+	return p.demoInfoProvider.FindPlayerByHandle(botHandle)
+}
+
 // AdditionalPlayerInformation contains mostly scoreboard information.
 type AdditionalPlayerInformation struct {
 	Kills              int

common/player_test.go

@@ -206,6 +206,50 @@ func TestPlayer_IsAirborne(t *testing.T) {
 	assert.True(t, pl.IsAirborne())
 }
 
+func TestPlayer_IsControllingBot_NilEntity(t *testing.T) {
+	pl := new(Player)
+
+	assert.False(t, pl.IsControllingBot())
+}
+
+func TestPlayer_IsControllingBot(t *testing.T) {
+	pl := playerWithProperty("m_bIsControllingBot", st.PropertyValue{IntVal: 0})
+
+	assert.False(t, pl.IsControllingBot())
+
+	pl = playerWithProperty("m_bIsControllingBot", st.PropertyValue{IntVal: 1})
+
+	assert.True(t, pl.IsControllingBot())
+}
+
+func TestPlayer_ControlledBot_NilEntity(t *testing.T) {
+	pl := new(Player)
+
+	assert.Nil(t, pl.ControlledBot())
+}
+
+func TestPlayer_ControlledBot(t *testing.T) {
+	dave := &Player{
+		Name:  "Dave",
+		IsBot: true,
+	}
+	demoInfoProvider := &demoInfoProviderMock{
+		playersByHandle: map[int]*Player{
+			12: dave,
+		},
+	}
+
+	pl := playerWithProperty("m_iControlledBotEntIndex", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = demoInfoProvider
+
+	assert.Nil(t, pl.ControlledBot())
+
+	pl = playerWithProperty("m_iControlledBotEntIndex", st.PropertyValue{IntVal: 12})
+	pl.demoInfoProvider = demoInfoProvider
+
+	assert.Same(t, dave, pl.ControlledBot())
+}
+
 func newPlayer(tick int) *Player {
 	return NewPlayer(mockDemoInfoProvider(128, tick))
 }

game_events.go

@@ -109,7 +109,7 @@ func newGameEventHandler(parser *Parser) gameEventHandler {
 		"bomb_exploded":                   geh.bombExploded,                     // Bomb exploded
 		"bomb_pickup":                     geh.bombPickup,                       // Bomb picked up
 		"bomb_planted":                    geh.bombPlanted,                      // Plant finished
-		"bot_takeover":                    geh.botTakeover,                      // Bot got taken over
+		"bot_takeover":                    delay(geh.botTakeover),               // Bot got taken over
 		"buytime_ended":                   nil,                                  // Not actually end of buy time, seems to only be sent once per game at the start
 		"cs_match_end_restart":            nil,                                  // Yawn
 		"cs_pre_restart":                  nil,                                  // Not sure, doesn't seem to be important
@@ -252,8 +252,14 @@ func (geh gameEventHandler) roundMVP(data map[string]*msg.CSVCMsg_GameEventKeyT)
 }
 
 func (geh gameEventHandler) botTakeover(data map[string]*msg.CSVCMsg_GameEventKeyT) {
+	taker := geh.playerByUserID32(data["userid"].GetValShort())
+
+	unassert.True(!taker.IsBot)
+	unassert.True(taker.IsControllingBot())
+	unassert.NotNil(taker.ControlledBot())
+
 	geh.dispatch(events.BotTakenOver{
-		Taker: geh.playerByUserID32(data["userid"].GetValShort()),
+		Taker: taker,
 	})
 }