Skip to content

Commit 073f1a3

Browse files
committed
Update protobuf file with game events and adapt texts accordingly
1 parent d964caa commit 073f1a3

File tree

3 files changed

+309
-193
lines changed

3 files changed

+309
-193
lines changed

src/proto/ssl_game_event_2019.proto

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ message GameEvent {
4444
KickTimeout kick_timeout = 12;
4545
KeeperHeldBall keeper_held_ball = 13;
4646
AttackerDoubleTouchedBall attacker_double_touched_ball = 14;
47-
AttackerInDefenseArea attacker_in_defense_area = 15;
48-
AttackerTouchedKeeper attacker_touched_keeper = 16;
47+
AttackerTouchedBallInDefenseArea attacker_touched_ball_in_defense_area = 15;
48+
AttackerTouchedOpponentInDefenseArea attacker_touched_opponent_in_defense_area = 16;
49+
AttackerTouchedOpponentInDefenseArea attacker_touched_opponent_in_defense_area_skipped = 42;
4950
BotDribbledBallTooFar bot_dribbled_ball_too_far = 17;
5051
BotKickedBallTooFast bot_kicked_ball_too_fast = 18;
5152

@@ -237,7 +238,7 @@ message GameEvent {
237238
optional float distance = 4;
238239
}
239240
// an attacker touched the ball inside the opponent defense area
240-
message AttackerInDefenseArea {
241+
message AttackerTouchedBallInDefenseArea {
241242
// the team that found guilty
242243
required Team by_team = 1;
243244
// the bot that is inside the penalty area
@@ -272,11 +273,13 @@ message GameEvent {
272273
optional Location end = 4;
273274
}
274275
// an attacker touched the opponent keeper
275-
message AttackerTouchedKeeper {
276+
message AttackerTouchedOpponentInDefenseArea {
276277
// the team that found guilty
277278
required Team by_team = 1;
278279
// the bot that touched the opponent keeper
279280
optional uint32 by_bot = 2;
281+
// the bot of the opposite team that was touched
282+
optional uint32 victim = 4;
280283
// the location of the contact point between bot and keeper
281284
optional Location location = 3;
282285
}
@@ -428,8 +431,9 @@ enum GameEventType {
428431
KICK_TIMEOUT = 12;
429432
KEEPER_HELD_BALL = 13;
430433
ATTACKER_DOUBLE_TOUCHED_BALL = 14;
431-
ATTACKER_IN_DEFENSE_AREA = 15;
432-
ATTACKER_TOUCHED_KEEPER = 16;
434+
ATTACKER_TOUCHED_BALL_IN_DEFENSE_AREA = 15;
435+
ATTACKER_TOUCHED_OPPONENT_IN_DEFENSE_AREA = 16;
436+
ATTACKER_TOUCHED_OPPONENT_IN_DEFENSE_AREA_SKIPPED = 40;
433437
BOT_DRIBBLED_BALL_TOO_FAR = 17;
434438
BOT_KICKED_BALL_TOO_FAST = 18;
435439
ATTACKER_TOO_CLOSE_TO_DEFENSE_AREA = 19;

0 commit comments

Comments
 (0)