Builds with protocol changes (currently untested).
This commit is contained in:
lotodore
+164
-160
@@ -161,6 +161,8 @@ message AuthClientRequestMessage {
|
||||
// Authenticated login data is according to SCRAM SHA-1
|
||||
optional bytes clientUserData = 6;
|
||||
optional bytes myLastSessionId = 7;
|
||||
// Ignored for guest login.
|
||||
optional bytes avatarHash = 8;
|
||||
}
|
||||
|
||||
message AuthServerChallengeMessage {
|
||||
@@ -172,19 +174,14 @@ message AuthClientResponseMessage {
|
||||
}
|
||||
|
||||
message AuthServerVerificationMessage {
|
||||
required bytes serverVerification = 1;
|
||||
}
|
||||
|
||||
message InitDoneMessage {
|
||||
required bytes yourSessionId = 1;
|
||||
required uint32 yourPlayerId = 2;
|
||||
optional bytes serverVerification = 3;
|
||||
}
|
||||
|
||||
message InitMessage {
|
||||
// Ignored for guest login.
|
||||
optional bytes avatarHash = 1;
|
||||
}
|
||||
|
||||
message InitAckMessage {
|
||||
optional bytes yourAvatarHash = 1;
|
||||
optional uint32 rejoinGameId = 2;
|
||||
optional bytes yourAvatarHash = 3;
|
||||
optional uint32 rejoinGameId = 4;
|
||||
}
|
||||
|
||||
message AvatarRequestMessage {
|
||||
@@ -314,19 +311,22 @@ message CreateGameFailedMessage {
|
||||
}
|
||||
|
||||
message JoinGameMessage {
|
||||
optional string password = 1;
|
||||
optional bool autoLeave = 2 [default = false];
|
||||
optional bool spectateOnly = 3 [default = false];
|
||||
required uint32 gameId = 1;
|
||||
optional string password = 2;
|
||||
optional bool autoLeave = 3 [default = false];
|
||||
optional bool spectateOnly = 4 [default = false];
|
||||
}
|
||||
|
||||
message RejoinGameMessage {
|
||||
optional bool autoLeave = 1 [default = false];
|
||||
required uint32 gameId = 1;
|
||||
optional bool autoLeave = 2 [default = false];
|
||||
}
|
||||
|
||||
message JoinGameAckMessage {
|
||||
required bool areYouGameAdmin = 1;
|
||||
required NetGameInfo gameInfo = 2;
|
||||
optional bool spectateOnly = 3;
|
||||
required uint32 gameId = 1;
|
||||
required bool areYouGameAdmin = 2;
|
||||
required NetGameInfo gameInfo = 3;
|
||||
optional bool spectateOnly = 4;
|
||||
}
|
||||
|
||||
message JoinGameFailedMessage {
|
||||
@@ -334,13 +334,15 @@ message JoinGameFailedMessage {
|
||||
invalidGame = 1;
|
||||
gameIsFull = 2;
|
||||
gameIsRunning = 3;
|
||||
invalidPassword = 4;
|
||||
notInvited = 5;
|
||||
ipAddressBlocked = 6;
|
||||
rejoinFailed = 7;
|
||||
noSpectatorsAllowed = 8;
|
||||
notAllowedAsGuest = 4;
|
||||
invalidPassword = 5;
|
||||
notInvited = 6;
|
||||
ipAddressBlocked = 7;
|
||||
rejoinFailed = 8;
|
||||
noSpectatorsAllowed = 9;
|
||||
}
|
||||
required JoinGameFailureReason joinGameFailureReason = 1;
|
||||
required uint32 gameId = 1;
|
||||
required JoinGameFailureReason joinGameFailureReason = 2;
|
||||
}
|
||||
|
||||
message GamePlayerJoinedMessage {
|
||||
@@ -746,155 +748,157 @@ message AuthMessage {
|
||||
|
||||
message LobbyMessage {
|
||||
enum LobbyMessageType {
|
||||
Type_InitMessage = 1;
|
||||
Type_InitAckMessage = 2;
|
||||
Type_AvatarRequestMessage = 3;
|
||||
Type_AvatarHeaderMessage = 4;
|
||||
Type_AvatarDataMessage = 5;
|
||||
Type_AvatarEndMessage = 6;
|
||||
Type_UnknownAvatarMessage = 7;
|
||||
Type_PlayerListMessage = 8;
|
||||
Type_GameListNewMessage = 9;
|
||||
Type_GameListUpdateMessage = 10;
|
||||
Type_GameListPlayerJoinedMessage = 11;
|
||||
Type_GameListPlayerLeftMessage = 12;
|
||||
Type_GameListSpectatorJoinedMessage = 13;
|
||||
Type_GameListSpectatorLeftMessage = 14;
|
||||
Type_GameListAdminChangedMessage = 15;
|
||||
Type_PlayerInfoRequestMessage = 16;
|
||||
Type_PlayerInfoReplyMessage = 17;
|
||||
Type_SubscriptionRequestMessage = 18;
|
||||
Type_SubscriptionReplyMessage = 19;
|
||||
Type_CreateGameMessage = 20;
|
||||
Type_CreateGameFailedMessage = 21;
|
||||
Type_InvitePlayerToGameMessage = 22;
|
||||
Type_InviteNotifyMessage = 23;
|
||||
Type_RejectGameInvitationMessage = 24;
|
||||
Type_RejectInvNotifyMessage = 25;
|
||||
Type_StatisticsMessage = 26;
|
||||
Type_ChatRequestMessage = 27;
|
||||
Type_ChatMessage = 28;
|
||||
Type_ChatRejectMessage = 29;
|
||||
Type_DialogMessage = 30;
|
||||
Type_TimeoutWarningMessage = 31;
|
||||
Type_ResetTimeoutMessage = 32;
|
||||
Type_ReportAvatarMessage = 33;
|
||||
Type_ReportAvatarAckMessage = 34;
|
||||
Type_ReportGameMessage = 35;
|
||||
Type_ReportGameAckMessage = 36;
|
||||
Type_AdminRemoveGameMessage = 37;
|
||||
Type_AdminRemoveGameAckMessage = 38;
|
||||
Type_AdminBanPlayerMessage = 39;
|
||||
Type_AdminBanPlayerAckMessage = 40;
|
||||
Type_InitDoneMessage = 1;
|
||||
Type_AvatarRequestMessage = 2;
|
||||
Type_AvatarHeaderMessage = 3;
|
||||
Type_AvatarDataMessage = 4;
|
||||
Type_AvatarEndMessage = 5;
|
||||
Type_UnknownAvatarMessage = 6;
|
||||
Type_PlayerListMessage = 7;
|
||||
Type_GameListNewMessage = 8;
|
||||
Type_GameListUpdateMessage = 9;
|
||||
Type_GameListPlayerJoinedMessage = 10;
|
||||
Type_GameListPlayerLeftMessage = 11;
|
||||
Type_GameListSpectatorJoinedMessage = 12;
|
||||
Type_GameListSpectatorLeftMessage = 13;
|
||||
Type_GameListAdminChangedMessage = 14;
|
||||
Type_PlayerInfoRequestMessage = 15;
|
||||
Type_PlayerInfoReplyMessage = 16;
|
||||
Type_SubscriptionRequestMessage = 17;
|
||||
Type_SubscriptionReplyMessage = 18;
|
||||
Type_CreateGameMessage = 19;
|
||||
Type_CreateGameFailedMessage = 20;
|
||||
Type_JoinGameMessage = 21;
|
||||
Type_RejoinGameMessage = 22;
|
||||
Type_JoinGameAckMessage = 23;
|
||||
Type_JoinGameFailedMessage = 24;
|
||||
Type_InviteNotifyMessage = 25;
|
||||
Type_RejectGameInvitationMessage = 26;
|
||||
Type_RejectInvNotifyMessage = 27;
|
||||
Type_StatisticsMessage = 28;
|
||||
Type_ChatRequestMessage = 29;
|
||||
Type_ChatMessage = 30;
|
||||
Type_ChatRejectMessage = 31;
|
||||
Type_DialogMessage = 32;
|
||||
Type_TimeoutWarningMessage = 33;
|
||||
Type_ResetTimeoutMessage = 34;
|
||||
Type_ReportAvatarMessage = 35;
|
||||
Type_ReportAvatarAckMessage = 36;
|
||||
Type_ReportGameMessage = 37;
|
||||
Type_ReportGameAckMessage = 38;
|
||||
Type_AdminRemoveGameMessage = 39;
|
||||
Type_AdminRemoveGameAckMessage = 40;
|
||||
Type_AdminBanPlayerMessage = 41;
|
||||
Type_AdminBanPlayerAckMessage = 42;
|
||||
Type_ErrorMessage = 1024;
|
||||
}
|
||||
required LobbyMessageType messageType = 1;
|
||||
|
||||
optional InitMessage initMessage = 2;
|
||||
optional InitAckMessage initAckMessage = 3;
|
||||
optional AvatarRequestMessage avatarRequestMessage = 4;
|
||||
optional AvatarHeaderMessage avatarHeaderMessage = 5;
|
||||
optional AvatarDataMessage avatarDataMessage = 6;
|
||||
optional AvatarEndMessage avatarEndMessage = 7;
|
||||
optional UnknownAvatarMessage unknownAvatarMessage = 8;
|
||||
optional PlayerListMessage playerListMessage = 9;
|
||||
optional GameListNewMessage gameListNewMessage = 10;
|
||||
optional GameListUpdateMessage gameListUpdateMessage = 11;
|
||||
optional GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12;
|
||||
optional GameListPlayerLeftMessage gameListPlayerLeftMessage = 13;
|
||||
optional GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14;
|
||||
optional GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15;
|
||||
optional GameListAdminChangedMessage gameListAdminChangedMessage = 16;
|
||||
optional PlayerInfoRequestMessage playerInfoRequestMessage = 17;
|
||||
optional PlayerInfoReplyMessage playerInfoReplyMessage = 18;
|
||||
optional SubscriptionRequestMessage subscriptionRequestMessage = 19;
|
||||
optional SubscriptionReplyMessage subscriptionReplyMessage = 20;
|
||||
optional CreateGameMessage createGameMessage = 21;
|
||||
optional CreateGameFailedMessage createGameFailedMessage = 22;
|
||||
optional InvitePlayerToGameMessage invitePlayerToGameMessage = 23;
|
||||
optional InviteNotifyMessage inviteNotifyMessage = 24;
|
||||
optional RejectGameInvitationMessage rejectGameInvitationMessage = 25;
|
||||
optional RejectInvNotifyMessage rejectInvNotifyMessage = 26;
|
||||
optional StatisticsMessage statisticsMessage = 27;
|
||||
optional ChatRequestMessage chatRequestMessage = 28;
|
||||
optional ChatMessage chatMessage = 29;
|
||||
optional ChatRejectMessage chatRejectMessage = 30;
|
||||
optional DialogMessage dialogMessage = 31;
|
||||
optional TimeoutWarningMessage timeoutWarningMessage = 32;
|
||||
optional ResetTimeoutMessage resetTimeoutMessage = 33;
|
||||
optional ReportAvatarMessage reportAvatarMessage = 34;
|
||||
optional ReportAvatarAckMessage reportAvatarAckMessage = 35;
|
||||
optional ReportGameMessage reportGameMessage = 36;
|
||||
optional ReportGameAckMessage reportGameAckMessage = 37;
|
||||
optional AdminRemoveGameMessage adminRemoveGameMessage = 38;
|
||||
optional AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39;
|
||||
optional AdminBanPlayerMessage adminBanPlayerMessage = 40;
|
||||
optional AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41;
|
||||
optional InitDoneMessage initDoneMessage = 2;
|
||||
optional AvatarRequestMessage avatarRequestMessage = 3;
|
||||
optional AvatarHeaderMessage avatarHeaderMessage = 4;
|
||||
optional AvatarDataMessage avatarDataMessage = 5;
|
||||
optional AvatarEndMessage avatarEndMessage = 6;
|
||||
optional UnknownAvatarMessage unknownAvatarMessage = 7;
|
||||
optional PlayerListMessage playerListMessage = 8;
|
||||
optional GameListNewMessage gameListNewMessage = 9;
|
||||
optional GameListUpdateMessage gameListUpdateMessage = 10;
|
||||
optional GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11;
|
||||
optional GameListPlayerLeftMessage gameListPlayerLeftMessage = 12;
|
||||
optional GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13;
|
||||
optional GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14;
|
||||
optional GameListAdminChangedMessage gameListAdminChangedMessage = 15;
|
||||
optional PlayerInfoRequestMessage playerInfoRequestMessage = 16;
|
||||
optional PlayerInfoReplyMessage playerInfoReplyMessage = 17;
|
||||
optional SubscriptionRequestMessage subscriptionRequestMessage = 18;
|
||||
optional SubscriptionReplyMessage subscriptionReplyMessage = 19;
|
||||
optional CreateGameMessage createGameMessage = 20;
|
||||
optional CreateGameFailedMessage createGameFailedMessage = 21;
|
||||
optional JoinGameMessage joinGameMessage = 22;
|
||||
optional RejoinGameMessage rejoinGameMessage = 23;
|
||||
optional JoinGameAckMessage joinGameAckMessage = 24;
|
||||
optional JoinGameFailedMessage joinGameFailedMessage = 25;
|
||||
optional InviteNotifyMessage inviteNotifyMessage = 26;
|
||||
optional RejectGameInvitationMessage rejectGameInvitationMessage = 27;
|
||||
optional RejectInvNotifyMessage rejectInvNotifyMessage = 28;
|
||||
optional StatisticsMessage statisticsMessage = 29;
|
||||
optional ChatRequestMessage chatRequestMessage = 30;
|
||||
optional ChatMessage chatMessage = 31;
|
||||
optional ChatRejectMessage chatRejectMessage = 32;
|
||||
optional DialogMessage dialogMessage = 33;
|
||||
optional TimeoutWarningMessage timeoutWarningMessage = 34;
|
||||
optional ResetTimeoutMessage resetTimeoutMessage = 35;
|
||||
optional ReportAvatarMessage reportAvatarMessage = 36;
|
||||
optional ReportAvatarAckMessage reportAvatarAckMessage = 37;
|
||||
optional ReportGameMessage reportGameMessage = 38;
|
||||
optional ReportGameAckMessage reportGameAckMessage = 39;
|
||||
optional AdminRemoveGameMessage adminRemoveGameMessage = 40;
|
||||
optional AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41;
|
||||
optional AdminBanPlayerMessage adminBanPlayerMessage = 42;
|
||||
optional AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43;
|
||||
optional ErrorMessage errorMessage = 1025;
|
||||
}
|
||||
|
||||
message GameManagementMessage {
|
||||
enum GameManagementMessageType {
|
||||
Type_JoinGameMessage = 1;
|
||||
Type_RejoinGameMessage = 2;
|
||||
Type_JoinGameAckMessage = 3;
|
||||
Type_JoinGameFailedMessage = 4;
|
||||
Type_GamePlayerJoinedMessage = 5;
|
||||
Type_GamePlayerLeftMessage = 6;
|
||||
Type_GameSpectatorJoinedMessage = 7;
|
||||
Type_GameSpectatorLeftMessage = 8;
|
||||
Type_GameAdminChangedMessage = 9;
|
||||
Type_RemovedFromGameMessage = 10;
|
||||
Type_KickPlayerRequestMessage = 11;
|
||||
Type_LeaveGameRequestMessage = 12;
|
||||
Type_StartEventMessage = 13;
|
||||
Type_StartEventAckMessage = 14;
|
||||
Type_GameStartInitialMessage = 15;
|
||||
Type_GameStartRejoinMessage = 16;
|
||||
Type_EndOfGameMessage = 17;
|
||||
Type_PlayerIdChangedMessage = 18;
|
||||
Type_AskKickPlayerMessage = 19;
|
||||
Type_AskKickDeniedMessage = 20;
|
||||
Type_StartKickPetitionMessage = 21;
|
||||
Type_VoteKickRequestMessage = 22;
|
||||
Type_VoteKickReplyMessage = 23;
|
||||
Type_KickPetitionUpdateMessage = 24;
|
||||
Type_EndKickPetitionMessage = 25;
|
||||
Type_ChatRequestMessage = 26;
|
||||
Type_ChatMessage = 27;
|
||||
Type_ChatRejectMessage = 28;
|
||||
Type_GamePlayerJoinedMessage = 1;
|
||||
Type_GamePlayerLeftMessage = 2;
|
||||
Type_GameSpectatorJoinedMessage = 3;
|
||||
Type_GameSpectatorLeftMessage = 4;
|
||||
Type_GameAdminChangedMessage = 5;
|
||||
Type_RemovedFromGameMessage = 6;
|
||||
Type_KickPlayerRequestMessage = 7;
|
||||
Type_LeaveGameRequestMessage = 8;
|
||||
Type_InvitePlayerToGameMessage = 9;
|
||||
Type_StartEventMessage = 10;
|
||||
Type_StartEventAckMessage = 11;
|
||||
Type_GameStartInitialMessage = 12;
|
||||
Type_GameStartRejoinMessage = 13;
|
||||
Type_EndOfGameMessage = 14;
|
||||
Type_PlayerIdChangedMessage = 15;
|
||||
Type_AskKickPlayerMessage = 16;
|
||||
Type_AskKickDeniedMessage = 17;
|
||||
Type_StartKickPetitionMessage = 18;
|
||||
Type_VoteKickRequestMessage = 19;
|
||||
Type_VoteKickReplyMessage = 20;
|
||||
Type_KickPetitionUpdateMessage = 21;
|
||||
Type_EndKickPetitionMessage = 22;
|
||||
Type_ChatRequestMessage = 23;
|
||||
Type_ChatMessage = 24;
|
||||
Type_ChatRejectMessage = 25;
|
||||
Type_TimeoutWarningMessage = 26;
|
||||
Type_ResetTimeoutMessage = 27;
|
||||
Type_ErrorMessage = 1024;
|
||||
}
|
||||
required GameManagementMessageType messageType = 1;
|
||||
|
||||
optional JoinGameMessage joinGameMessage = 2;
|
||||
optional RejoinGameMessage rejoinGameMessage = 3;
|
||||
optional JoinGameAckMessage joinGameAckMessage = 4;
|
||||
optional JoinGameFailedMessage joinGameFailedMessage = 5;
|
||||
optional GamePlayerJoinedMessage gamePlayerJoinedMessage = 6;
|
||||
optional GamePlayerLeftMessage gamePlayerLeftMessage = 7;
|
||||
optional GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8;
|
||||
optional GameSpectatorLeftMessage gameSpectatorLeftMessage = 9;
|
||||
optional GameAdminChangedMessage gameAdminChangedMessage = 10;
|
||||
optional RemovedFromGameMessage removedFromGameMessage = 11;
|
||||
optional KickPlayerRequestMessage kickPlayerRequestMessage = 12;
|
||||
optional LeaveGameRequestMessage leaveGameRequestMessage = 13;
|
||||
optional StartEventMessage startEventMessage = 14;
|
||||
optional StartEventAckMessage startEventAckMessage = 15;
|
||||
optional GameStartInitialMessage gameStartInitialMessage = 16;
|
||||
optional GameStartRejoinMessage gameStartRejoinMessage = 17;
|
||||
optional EndOfGameMessage endOfGameMessage = 18;
|
||||
optional PlayerIdChangedMessage playerIdChangedMessage = 19;
|
||||
optional AskKickPlayerMessage askKickPlayerMessage = 20;
|
||||
optional AskKickDeniedMessage askKickDeniedMessage = 21;
|
||||
optional StartKickPetitionMessage startKickPetitionMessage = 22;
|
||||
optional VoteKickRequestMessage voteKickRequestMessage = 23;
|
||||
optional VoteKickReplyMessage voteKickReplyMessage = 24;
|
||||
optional KickPetitionUpdateMessage kickPetitionUpdateMessage = 25;
|
||||
optional EndKickPetitionMessage endKickPetitionMessage = 26;
|
||||
optional ChatRequestMessage chatRequestMessage = 27;
|
||||
optional ChatMessage chatMessage = 28;
|
||||
optional ChatRejectMessage chatRejectMessage = 29;
|
||||
optional GamePlayerJoinedMessage gamePlayerJoinedMessage = 2;
|
||||
optional GamePlayerLeftMessage gamePlayerLeftMessage = 3;
|
||||
optional GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4;
|
||||
optional GameSpectatorLeftMessage gameSpectatorLeftMessage = 5;
|
||||
optional GameAdminChangedMessage gameAdminChangedMessage = 6;
|
||||
optional RemovedFromGameMessage removedFromGameMessage = 7;
|
||||
optional KickPlayerRequestMessage kickPlayerRequestMessage = 8;
|
||||
optional LeaveGameRequestMessage leaveGameRequestMessage = 9;
|
||||
optional InvitePlayerToGameMessage invitePlayerToGameMessage = 10;
|
||||
optional StartEventMessage startEventMessage = 11;
|
||||
optional StartEventAckMessage startEventAckMessage = 12;
|
||||
optional GameStartInitialMessage gameStartInitialMessage = 13;
|
||||
optional GameStartRejoinMessage gameStartRejoinMessage = 14;
|
||||
optional EndOfGameMessage endOfGameMessage = 15;
|
||||
optional PlayerIdChangedMessage playerIdChangedMessage = 16;
|
||||
optional AskKickPlayerMessage askKickPlayerMessage = 17;
|
||||
optional AskKickDeniedMessage askKickDeniedMessage = 18;
|
||||
optional StartKickPetitionMessage startKickPetitionMessage = 19;
|
||||
optional VoteKickRequestMessage voteKickRequestMessage = 20;
|
||||
optional VoteKickReplyMessage voteKickReplyMessage = 21;
|
||||
optional KickPetitionUpdateMessage kickPetitionUpdateMessage = 22;
|
||||
optional EndKickPetitionMessage endKickPetitionMessage = 23;
|
||||
optional ChatRequestMessage chatRequestMessage = 24;
|
||||
optional ChatMessage chatMessage = 25;
|
||||
optional ChatRejectMessage chatRejectMessage = 26;
|
||||
optional TimeoutWarningMessage timeoutWarningMessage = 27;
|
||||
optional ResetTimeoutMessage resetTimeoutMessage = 28;
|
||||
optional ErrorMessage errorMessage = 1025;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user