[feature] Send game events with advantage choice request

Author: g3force

internal/app/controller/teamConnection.go

@@ -93,19 +93,23 @@ func (c *GameController) askForTeamDecisionIfRequired(event Event) (handled bool
 	handled = false
 	if c.outstandingTeamChoice == nil && c.Engine.State.GameState() == GameStateRunning {
 		var byTeamProto refproto.Team
-		var choiceType refproto.AdvantageChoice_Foul
+		var choice refproto.AdvantageChoice
+		choice.Foul = new(refproto.AdvantageChoice_Foul)
 		if event.GameEvent.Details.BotCrashUnique != nil {
 			byTeamProto = *event.GameEvent.Details.BotCrashUnique.ByTeam
-			choiceType = refproto.AdvantageChoice_COLLISION
+			*choice.Foul = refproto.AdvantageChoice_COLLISION
+			choice.BotCrashUnique = new(refproto.GameEvent_BotCrashUnique)
+			*choice.BotCrashUnique = *event.GameEvent.Details.BotCrashUnique
 		} else if event.GameEvent.Details.BotPushedBot != nil {
 			byTeamProto = *event.GameEvent.Details.BotPushedBot.ByTeam
-			choiceType = refproto.AdvantageChoice_PUSHING
+			*choice.Foul = refproto.AdvantageChoice_PUSHING
+			choice.BotPushedBot = new(refproto.GameEvent_BotPushedBot)
+			*choice.BotPushedBot = *event.GameEvent.Details.BotPushedBot
 		}
 
 		forTeam := NewTeam(byTeamProto).Opposite()
 		if forTeam != "" {
 			teamName := c.Engine.State.TeamState[forTeam].Name
-			choice := refproto.AdvantageChoice{Foul: &choiceType}
 			requestPayload := refproto.ControllerToTeam_AdvantageChoice{AdvantageChoice: &choice}
 			request := refproto.ControllerToTeam{Msg: &requestPayload}
 			err := c.TeamServer.SendRequest(teamName, request)

pkg/refproto/ssl_game_controller_team.pb.go

@@ -1,5 +1,6 @@
 syntax = "proto2";
 
+import "ssl_game_event_2019.proto";
 import "ssl_game_controller_common.proto";
 
 // a registration that must be send by teams and autoRefs to the controller as the very first message
@@ -50,6 +51,10 @@ message ControllerToTeam {
 message AdvantageChoice {
     // the type of foul that occurred
     required Foul foul = 1;
+    // the bot crash event that was the source for this advantage choice
+    optional GameEvent.BotCrashUnique bot_crash_unique = 2;
+    // the bot push event that was the source for this advantage choice
+    optional GameEvent.BotPushedBot bot_pushed_bot = 3;
 
     enum Foul {
         // default value when not set
@@ -59,4 +64,4 @@ message AdvantageChoice {
         // an opponent bot has pushed one of your bots
         PUSHING = 2;
     }
-}
+}