From cfebd53d5dbe0e7b199aa28b43e5f25601331e6d Mon Sep 17 00:00:00 2001 From: woogerboy21 Date: Tue, 25 Aug 2015 23:31:09 -0400 Subject: [PATCH] Corrected proto warnings --- common/pb/admin_commands.proto | 47 ++++++------ common/pb/card_attributes.proto | 15 ++-- common/pb/color.proto | 9 +-- common/pb/command_attach_card.proto | 17 ++--- .../pb/command_change_zone_properties.proto | 13 ++-- common/pb/command_concede.proto | 7 +- common/pb/command_create_arrow.proto | 21 +++--- common/pb/command_create_counter.proto | 15 ++-- common/pb/command_create_token.proto | 27 +++---- common/pb/command_deck_del.proto | 9 +-- common/pb/command_deck_del_dir.proto | 9 +-- common/pb/command_deck_download.proto | 9 +-- common/pb/command_deck_list.proto | 7 +- common/pb/command_deck_new_dir.proto | 11 +-- common/pb/command_deck_select.proto | 11 +-- common/pb/command_deck_upload.proto | 13 ++-- common/pb/command_del_counter.proto | 9 +-- common/pb/command_delete_arrow.proto | 9 +-- common/pb/command_draw_cards.proto | 9 +-- common/pb/command_dump_zone.proto | 13 ++-- common/pb/command_flip_card.proto | 13 ++-- common/pb/command_game_say.proto | 9 +-- common/pb/command_inc_card_counter.proto | 15 ++-- common/pb/command_inc_counter.proto | 11 +-- common/pb/command_kick_from_game.proto | 7 +- common/pb/command_leave_game.proto | 7 +- common/pb/command_move_card.proto | 31 ++++---- common/pb/command_mulligan.proto | 7 +- common/pb/command_next_turn.proto | 7 +- common/pb/command_ready_start.proto | 9 +-- common/pb/command_replay_delete_match.proto | 9 +-- common/pb/command_replay_download.proto | 9 +-- common/pb/command_replay_list.proto | 7 +- common/pb/command_replay_modify_match.proto | 11 +-- common/pb/command_reveal_cards.proto | 15 ++-- common/pb/command_roll_die.proto | 9 +-- common/pb/command_set_active_phase.proto | 9 +-- common/pb/command_set_card_attr.proto | 15 ++-- common/pb/command_set_card_counter.proto | 15 ++-- common/pb/command_set_counter.proto | 11 +-- common/pb/command_set_sideboard_lock.proto | 11 +-- common/pb/command_set_sideboard_plan.proto | 9 +-- common/pb/command_shuffle.proto | 7 +- common/pb/command_stop_dump_zone.proto | 11 +-- common/pb/command_undo_draw.proto | 7 +- common/pb/commands.proto | 21 +++--- common/pb/context_concede.proto | 7 +- .../pb/context_connection_state_changed.proto | 7 +- common/pb/context_deck_select.proto | 1 + common/pb/context_move_card.proto | 7 +- common/pb/context_mulligan.proto | 9 +-- common/pb/context_ping_changed.proto | 7 +- common/pb/context_ready_start.proto | 7 +- common/pb/context_set_sideboard_lock.proto | 7 +- common/pb/context_undo_draw.proto | 7 +- common/pb/event_add_to_list.proto | 11 +-- common/pb/event_attach_card.proto | 17 ++--- common/pb/event_change_zone_properties.proto | 13 ++-- common/pb/event_connection_closed.proto | 33 ++++----- common/pb/event_create_arrow.proto | 9 +-- common/pb/event_create_counter.proto | 9 +-- common/pb/event_create_token.proto | 25 +++---- common/pb/event_del_counter.proto | 9 +-- common/pb/event_delete_arrow.proto | 9 +-- common/pb/event_destroy_card.proto | 11 +-- common/pb/event_draw_cards.proto | 11 +-- common/pb/event_dump_zone.proto | 13 ++-- common/pb/event_flip_card.proto | 15 ++-- common/pb/event_game_closed.proto | 7 +- common/pb/event_game_host_changed.proto | 7 +- common/pb/event_game_joined.proto | 19 ++--- common/pb/event_game_say.proto | 9 +-- common/pb/event_game_state_changed.proto | 17 ++--- common/pb/event_join.proto | 9 +-- common/pb/event_join_room.proto | 9 +-- common/pb/event_kicked.proto | 7 +- common/pb/event_leave.proto | 7 +- common/pb/event_leave_room.proto | 9 +-- common/pb/event_list_games.proto | 9 +-- common/pb/event_list_rooms.proto | 9 +-- common/pb/event_move_card.proto | 29 ++++---- common/pb/event_notify_user.proto | 11 +-- .../pb/event_player_properties_changed.proto | 9 +-- common/pb/event_remove_from_list.proto | 11 +-- common/pb/event_replay_added.proto | 9 +-- common/pb/event_reveal_cards.proto | 17 ++--- common/pb/event_roll_die.proto | 11 +-- common/pb/event_room_say.proto | 11 +-- common/pb/event_server_complete_list.proto | 13 ++-- common/pb/event_server_identification.proto | 13 ++-- common/pb/event_server_message.proto | 9 +-- common/pb/event_server_shutdown.proto | 11 +-- common/pb/event_set_active_phase.proto | 9 +-- common/pb/event_set_active_player.proto | 9 +-- common/pb/event_set_card_attr.proto | 15 ++-- common/pb/event_set_card_counter.proto | 15 ++-- common/pb/event_set_counter.proto | 11 +-- common/pb/event_shuffle.proto | 9 +-- common/pb/event_stop_dump_zone.proto | 11 +-- common/pb/event_user_joined.proto | 9 +-- common/pb/event_user_left.proto | 9 +-- common/pb/event_user_message.proto | 13 ++-- common/pb/game_commands.proto | 71 ++++++++++--------- common/pb/game_event.proto | 67 ++++++++--------- common/pb/game_event_container.proto | 9 +-- common/pb/game_event_context.proto | 25 +++---- common/pb/game_replay.proto | 9 +-- common/pb/isl_message.proto | 41 +++++------ common/pb/moderator_commands.proto | 27 +++---- common/pb/move_card_to_zone.proto | 7 +- common/pb/response.proto | 1 + common/pb/response_activate.proto | 7 +- common/pb/response_adjust_mod.proto | 7 +- common/pb/response_deck_download.proto | 9 +-- common/pb/response_deck_list.proto | 9 +-- common/pb/response_deck_upload.proto | 9 +-- common/pb/response_dump_zone.proto | 9 +-- common/pb/response_get_games_of_user.proto | 11 +-- common/pb/response_get_user_info.proto | 9 +-- common/pb/response_join_room.proto | 9 +-- common/pb/response_list_users.proto | 9 +-- common/pb/response_login.proto | 17 ++--- common/pb/response_register.proto | 11 +-- common/pb/response_replay_download.proto | 9 +-- common/pb/response_replay_list.proto | 9 +-- common/pb/room_commands.proto | 69 +++++++++--------- common/pb/room_event.proto | 17 ++--- common/pb/server_message.proto | 25 +++---- common/pb/serverinfo_arrow.proto | 17 ++--- common/pb/serverinfo_card.proto | 33 ++++----- common/pb/serverinfo_cardcounter.proto | 5 +- common/pb/serverinfo_counter.proto | 11 +-- common/pb/serverinfo_deckstorage.proto | 13 ++-- common/pb/serverinfo_game.proto | 39 +++++----- common/pb/serverinfo_gametype.proto | 5 +- common/pb/serverinfo_player.proto | 11 +-- common/pb/serverinfo_playerping.proto | 5 +- common/pb/serverinfo_playerproperties.proto | 17 ++--- common/pb/serverinfo_replay.proto | 7 +- common/pb/serverinfo_replay_match.proto | 19 ++--- common/pb/serverinfo_room.proto | 21 +++--- common/pb/serverinfo_user.proto | 1 + common/pb/serverinfo_zone.proto | 41 +++++------ common/pb/session_commands.proto | 1 + common/pb/session_event.proto | 35 ++++----- 145 files changed, 1063 insertions(+), 918 deletions(-) diff --git a/common/pb/admin_commands.proto b/common/pb/admin_commands.proto index 8e2757ae..9d5e5414 100644 --- a/common/pb/admin_commands.proto +++ b/common/pb/admin_commands.proto @@ -1,38 +1,39 @@ +syntax = "proto2"; message AdminCommand { - enum AdminCommandType { - UPDATE_SERVER_MESSAGE = 1000; - SHUTDOWN_SERVER = 1001; - RELOAD_CONFIG = 1002; - ADJUST_MOD = 1003; - } - extensions 100 to max; + enum AdminCommandType { + UPDATE_SERVER_MESSAGE = 1000; + SHUTDOWN_SERVER = 1001; + RELOAD_CONFIG = 1002; + ADJUST_MOD = 1003; + } + extensions 100 to max; } message Command_UpdateServerMessage { - extend AdminCommand { - optional Command_UpdateServerMessage ext = 1000; - } + extend AdminCommand { + optional Command_UpdateServerMessage ext = 1000; + } } message Command_ShutdownServer { - extend AdminCommand { - optional Command_ShutdownServer ext = 1001; - } - optional string reason = 1; - optional uint32 minutes = 2; + extend AdminCommand { + optional Command_ShutdownServer ext = 1001; + } + optional string reason = 1; + optional uint32 minutes = 2; } message Command_ReloadConfig { - extend AdminCommand { - optional Command_ReloadConfig ext = 1002; - } + extend AdminCommand { + optional Command_ReloadConfig ext = 1002; + } } message Command_AdjustMod { - extend AdminCommand { - optional Command_AdjustMod ext = 1003; - } - required string user_name = 1; - required bool should_be_mod = 2; + extend AdminCommand { + optional Command_AdjustMod ext = 1003; + } + required string user_name = 1; + required bool should_be_mod = 2; } diff --git a/common/pb/card_attributes.proto b/common/pb/card_attributes.proto index d7a9d1e0..ac23ca0d 100644 --- a/common/pb/card_attributes.proto +++ b/common/pb/card_attributes.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; enum CardAttribute { - AttrTapped = 1; - AttrAttacking = 2; - AttrFaceDown = 3; - AttrColor = 4; - AttrPT = 5; - AttrAnnotation = 6; - AttrDoesntUntap = 7; + AttrTapped = 1; + AttrAttacking = 2; + AttrFaceDown = 3; + AttrColor = 4; + AttrPT = 5; + AttrAnnotation = 6; + AttrDoesntUntap = 7; } diff --git a/common/pb/color.proto b/common/pb/color.proto index 90fdb781..d932ba76 100644 --- a/common/pb/color.proto +++ b/common/pb/color.proto @@ -1,6 +1,7 @@ +syntax = "proto2"; message color { - optional uint32 r = 1; - optional uint32 g = 2; - optional uint32 b = 3; - optional uint32 a = 4; + optional uint32 r = 1; + optional uint32 g = 2; + optional uint32 b = 3; + optional uint32 a = 4; } \ No newline at end of file diff --git a/common/pb/command_attach_card.proto b/common/pb/command_attach_card.proto index 02fbb9ce..654e57c5 100644 --- a/common/pb/command_attach_card.proto +++ b/common/pb/command_attach_card.proto @@ -1,13 +1,14 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_AttachCard { - extend GameCommand { - optional Command_AttachCard ext = 1009; - } - optional string start_zone = 1; - optional sint32 card_id = 2 [default = -1]; - optional sint32 target_player_id = 3 [default = -1]; - optional string target_zone = 4; - optional sint32 target_card_id = 5 [default = -1]; + extend GameCommand { + optional Command_AttachCard ext = 1009; + } + optional string start_zone = 1; + optional sint32 card_id = 2 [default = -1]; + optional sint32 target_player_id = 3 [default = -1]; + optional string target_zone = 4; + optional sint32 target_card_id = 5 [default = -1]; } diff --git a/common/pb/command_change_zone_properties.proto b/common/pb/command_change_zone_properties.proto index 5bbc2900..f89e36aa 100644 --- a/common/pb/command_change_zone_properties.proto +++ b/common/pb/command_change_zone_properties.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_ChangeZoneProperties { - extend GameCommand { - optional Command_ChangeZoneProperties ext = 1031; - } - optional string zone_name = 1; - - optional bool always_reveal_top_card = 10; + extend GameCommand { + optional Command_ChangeZoneProperties ext = 1031; + } + optional string zone_name = 1; + + optional bool always_reveal_top_card = 10; } diff --git a/common/pb/command_concede.proto b/common/pb/command_concede.proto index 22028af2..5ac74235 100644 --- a/common/pb/command_concede.proto +++ b/common/pb/command_concede.proto @@ -1,6 +1,7 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_Concede { - extend GameCommand { - optional Command_Concede ext = 1017; - } + extend GameCommand { + optional Command_Concede ext = 1017; + } } diff --git a/common/pb/command_create_arrow.proto b/common/pb/command_create_arrow.proto index 31c29c5b..55048031 100644 --- a/common/pb/command_create_arrow.proto +++ b/common/pb/command_create_arrow.proto @@ -1,15 +1,16 @@ +syntax = "proto2"; import "game_commands.proto"; import "color.proto"; message Command_CreateArrow { - extend GameCommand { - optional Command_CreateArrow ext = 1011; - } - optional sint32 start_player_id = 1 [default = -1]; - optional string start_zone = 2; - optional sint32 start_card_id = 3 [default = -1]; - optional sint32 target_player_id = 4 [default = -1]; - optional string target_zone = 5; - optional sint32 target_card_id = 6 [default = -1]; - optional color arrow_color = 7; + extend GameCommand { + optional Command_CreateArrow ext = 1011; + } + optional sint32 start_player_id = 1 [default = -1]; + optional string start_zone = 2; + optional sint32 start_card_id = 3 [default = -1]; + optional sint32 target_player_id = 4 [default = -1]; + optional string target_zone = 5; + optional sint32 target_card_id = 6 [default = -1]; + optional color arrow_color = 7; } diff --git a/common/pb/command_create_counter.proto b/common/pb/command_create_counter.proto index 047b6551..d60fbdc2 100644 --- a/common/pb/command_create_counter.proto +++ b/common/pb/command_create_counter.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "game_commands.proto"; import "color.proto"; message Command_CreateCounter { - extend GameCommand { - optional Command_CreateCounter ext = 1019; - } - optional string counter_name = 1; - optional color counter_color = 2; - optional uint32 radius = 3; - optional sint32 value = 4; + extend GameCommand { + optional Command_CreateCounter ext = 1019; + } + optional string counter_name = 1; + optional color counter_color = 2; + optional uint32 radius = 3; + optional sint32 value = 4; } diff --git a/common/pb/command_create_token.proto b/common/pb/command_create_token.proto index 9c34a478..9fc61b70 100644 --- a/common/pb/command_create_token.proto +++ b/common/pb/command_create_token.proto @@ -1,18 +1,19 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_CreateToken { - extend GameCommand { - optional Command_CreateToken ext = 1010; - } - optional string zone = 1; - optional string card_name = 2; - optional string color = 3; - optional string pt = 4; - optional string annotation = 5; - optional bool destroy_on_zone_change = 6; - optional sint32 x = 7; - optional sint32 y = 8; - optional string target_zone = 9; - optional sint32 target_card_id = 10 [default = -1]; + extend GameCommand { + optional Command_CreateToken ext = 1010; + } + optional string zone = 1; + optional string card_name = 2; + optional string color = 3; + optional string pt = 4; + optional string annotation = 5; + optional bool destroy_on_zone_change = 6; + optional sint32 x = 7; + optional sint32 y = 8; + optional string target_zone = 9; + optional sint32 target_card_id = 10 [default = -1]; } diff --git a/common/pb/command_deck_del.proto b/common/pb/command_deck_del.proto index 261ad630..a231ca08 100644 --- a/common/pb/command_deck_del.proto +++ b/common/pb/command_deck_del.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckDel { - extend SessionCommand { - optional Command_DeckDel ext = 1011; - } - optional sint32 deck_id = 1 [default = -1]; + extend SessionCommand { + optional Command_DeckDel ext = 1011; + } + optional sint32 deck_id = 1 [default = -1]; } diff --git a/common/pb/command_deck_del_dir.proto b/common/pb/command_deck_del_dir.proto index 2eb80f7c..3364cac4 100644 --- a/common/pb/command_deck_del_dir.proto +++ b/common/pb/command_deck_del_dir.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckDelDir { - extend SessionCommand { - optional Command_DeckDelDir ext = 1010; - } - optional string path = 1; + extend SessionCommand { + optional Command_DeckDelDir ext = 1010; + } + optional string path = 1; } diff --git a/common/pb/command_deck_download.proto b/common/pb/command_deck_download.proto index 822754ca..19dda152 100644 --- a/common/pb/command_deck_download.proto +++ b/common/pb/command_deck_download.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckDownload { - extend SessionCommand { - optional Command_DeckDownload ext = 1012; - } - optional sint32 deck_id = 1 [default = -1]; + extend SessionCommand { + optional Command_DeckDownload ext = 1012; + } + optional sint32 deck_id = 1 [default = -1]; } diff --git a/common/pb/command_deck_list.proto b/common/pb/command_deck_list.proto index a1e99208..43f1b0e0 100644 --- a/common/pb/command_deck_list.proto +++ b/common/pb/command_deck_list.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckList { - extend SessionCommand { - optional Command_DeckList ext = 1008; - } + extend SessionCommand { + optional Command_DeckList ext = 1008; + } } diff --git a/common/pb/command_deck_new_dir.proto b/common/pb/command_deck_new_dir.proto index a88d1513..ecb3b106 100644 --- a/common/pb/command_deck_new_dir.proto +++ b/common/pb/command_deck_new_dir.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckNewDir { - extend SessionCommand { - optional Command_DeckNewDir ext = 1009; - } - optional string path = 1; - optional string dir_name = 2; + extend SessionCommand { + optional Command_DeckNewDir ext = 1009; + } + optional string path = 1; + optional string dir_name = 2; } \ No newline at end of file diff --git a/common/pb/command_deck_select.proto b/common/pb/command_deck_select.proto index e696dae0..d79bf37e 100644 --- a/common/pb/command_deck_select.proto +++ b/common/pb/command_deck_select.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_DeckSelect { - extend GameCommand { - optional Command_DeckSelect ext = 1029; - } - optional string deck = 1; - optional sint32 deck_id = 2 [default = -1]; + extend GameCommand { + optional Command_DeckSelect ext = 1029; + } + optional string deck = 1; + optional sint32 deck_id = 2 [default = -1]; } diff --git a/common/pb/command_deck_upload.proto b/common/pb/command_deck_upload.proto index 41f43ab4..0f250c5f 100644 --- a/common/pb/command_deck_upload.proto +++ b/common/pb/command_deck_upload.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_DeckUpload { - extend SessionCommand { - optional Command_DeckUpload ext = 1013; - } - optional string path = 1; // to upload a new deck - optional uint32 deck_id = 2; // to replace an existing deck - optional string deck_list = 3; + extend SessionCommand { + optional Command_DeckUpload ext = 1013; + } + optional string path = 1; // to upload a new deck + optional uint32 deck_id = 2; // to replace an existing deck + optional string deck_list = 3; } diff --git a/common/pb/command_del_counter.proto b/common/pb/command_del_counter.proto index 1e59b336..8d2689a2 100644 --- a/common/pb/command_del_counter.proto +++ b/common/pb/command_del_counter.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_DelCounter { - extend GameCommand { - optional Command_DelCounter ext = 1021; - } - optional sint32 counter_id = 1 [default = -1]; + extend GameCommand { + optional Command_DelCounter ext = 1021; + } + optional sint32 counter_id = 1 [default = -1]; } diff --git a/common/pb/command_delete_arrow.proto b/common/pb/command_delete_arrow.proto index ffccacf0..ba204989 100644 --- a/common/pb/command_delete_arrow.proto +++ b/common/pb/command_delete_arrow.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_DeleteArrow { - extend GameCommand { - optional Command_DeleteArrow ext = 1012; - } - optional sint32 arrow_id = 1 [default = -1]; + extend GameCommand { + optional Command_DeleteArrow ext = 1012; + } + optional sint32 arrow_id = 1 [default = -1]; } diff --git a/common/pb/command_draw_cards.proto b/common/pb/command_draw_cards.proto index 2873d915..6851ac00 100644 --- a/common/pb/command_draw_cards.proto +++ b/common/pb/command_draw_cards.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_DrawCards { - extend GameCommand { - optional Command_DrawCards ext = 1006; - } - optional uint32 number = 1; + extend GameCommand { + optional Command_DrawCards ext = 1006; + } + optional uint32 number = 1; } diff --git a/common/pb/command_dump_zone.proto b/common/pb/command_dump_zone.proto index 15fbe3c0..07bfe195 100644 --- a/common/pb/command_dump_zone.proto +++ b/common/pb/command_dump_zone.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_DumpZone { - extend GameCommand { - optional Command_DumpZone ext = 1024; - } - optional sint32 player_id = 1 [default = -1]; - optional string zone_name = 2; - optional sint32 number_cards = 3; + extend GameCommand { + optional Command_DumpZone ext = 1024; + } + optional sint32 player_id = 1 [default = -1]; + optional string zone_name = 2; + optional sint32 number_cards = 3; } diff --git a/common/pb/command_flip_card.proto b/common/pb/command_flip_card.proto index 25692f9c..d825c64f 100644 --- a/common/pb/command_flip_card.proto +++ b/common/pb/command_flip_card.proto @@ -1,11 +1,12 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_FlipCard { - extend GameCommand { - optional Command_FlipCard ext = 1008; - } - optional string zone = 1; - optional sint32 card_id = 2 [default = -1]; - optional bool face_down = 3; + extend GameCommand { + optional Command_FlipCard ext = 1008; + } + optional string zone = 1; + optional sint32 card_id = 2 [default = -1]; + optional bool face_down = 3; } diff --git a/common/pb/command_game_say.proto b/common/pb/command_game_say.proto index 906bd6f1..6aa47e0e 100644 --- a/common/pb/command_game_say.proto +++ b/common/pb/command_game_say.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_GameSay { - extend GameCommand { - optional Command_GameSay ext = 1002; - } - optional string message = 1; + extend GameCommand { + optional Command_GameSay ext = 1002; + } + optional string message = 1; } diff --git a/common/pb/command_inc_card_counter.proto b/common/pb/command_inc_card_counter.proto index e8b5f1ca..8676fc89 100644 --- a/common/pb/command_inc_card_counter.proto +++ b/common/pb/command_inc_card_counter.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_IncCardCounter { - extend GameCommand { - optional Command_IncCardCounter ext = 1015; - } - optional string zone = 1; - optional sint32 card_id = 2 [default = -1]; - optional sint32 counter_id = 3 [default = -1]; - optional sint32 counter_delta = 4; + extend GameCommand { + optional Command_IncCardCounter ext = 1015; + } + optional string zone = 1; + optional sint32 card_id = 2 [default = -1]; + optional sint32 counter_id = 3 [default = -1]; + optional sint32 counter_delta = 4; } diff --git a/common/pb/command_inc_counter.proto b/common/pb/command_inc_counter.proto index a14a2801..d99521b7 100644 --- a/common/pb/command_inc_counter.proto +++ b/common/pb/command_inc_counter.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_IncCounter { - extend GameCommand { - optional Command_IncCounter ext = 1018; - } - optional sint32 counter_id = 1 [default = -1]; - optional sint32 delta = 2; + extend GameCommand { + optional Command_IncCounter ext = 1018; + } + optional sint32 counter_id = 1 [default = -1]; + optional sint32 delta = 2; } diff --git a/common/pb/command_kick_from_game.proto b/common/pb/command_kick_from_game.proto index b340cb07..e95037c7 100644 --- a/common/pb/command_kick_from_game.proto +++ b/common/pb/command_kick_from_game.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_KickFromGame { - extend GameCommand { - optional Command_KickFromGame ext = 1000; + extend GameCommand { + optional Command_KickFromGame ext = 1000; } - optional sint32 player_id = 1 [default = -1]; + optional sint32 player_id = 1 [default = -1]; } diff --git a/common/pb/command_leave_game.proto b/common/pb/command_leave_game.proto index cdae43af..afa1e6c4 100644 --- a/common/pb/command_leave_game.proto +++ b/common/pb/command_leave_game.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_LeaveGame { - extend GameCommand { - optional Command_LeaveGame ext = 1001; - } + extend GameCommand { + optional Command_LeaveGame ext = 1001; + } } diff --git a/common/pb/command_move_card.proto b/common/pb/command_move_card.proto index 315d6423..ad3f7c57 100644 --- a/common/pb/command_move_card.proto +++ b/common/pb/command_move_card.proto @@ -1,25 +1,26 @@ +syntax = "proto2"; import "game_commands.proto"; message CardToMove { - optional sint32 card_id = 1 [default = -1]; - optional bool face_down = 2; - optional string pt = 3; - optional bool tapped = 4; + optional sint32 card_id = 1 [default = -1]; + optional bool face_down = 2; + optional string pt = 3; + optional bool tapped = 4; } message ListOfCardsToMove { - repeated CardToMove card = 1; + repeated CardToMove card = 1; } message Command_MoveCard { - extend GameCommand { - optional Command_MoveCard ext = 1027; - } - optional sint32 start_player_id = 1 [default = -1]; - optional string start_zone = 2; - optional ListOfCardsToMove cards_to_move = 3; - optional sint32 target_player_id = 4 [default = -1]; - optional string target_zone = 5; - optional sint32 x = 6 [default = -1]; - optional sint32 y = 7 [default = -1]; + extend GameCommand { + optional Command_MoveCard ext = 1027; + } + optional sint32 start_player_id = 1 [default = -1]; + optional string start_zone = 2; + optional ListOfCardsToMove cards_to_move = 3; + optional sint32 target_player_id = 4 [default = -1]; + optional string target_zone = 5; + optional sint32 x = 6 [default = -1]; + optional sint32 y = 7 [default = -1]; } diff --git a/common/pb/command_mulligan.proto b/common/pb/command_mulligan.proto index 79c3fde2..f0ffb87c 100644 --- a/common/pb/command_mulligan.proto +++ b/common/pb/command_mulligan.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_Mulligan { - extend GameCommand { - optional Command_Mulligan ext = 1004; - } + extend GameCommand { + optional Command_Mulligan ext = 1004; + } } diff --git a/common/pb/command_next_turn.proto b/common/pb/command_next_turn.proto index d3012df8..802d63cf 100644 --- a/common/pb/command_next_turn.proto +++ b/common/pb/command_next_turn.proto @@ -1,6 +1,7 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_NextTurn { - extend GameCommand { - optional Command_NextTurn ext = 1022; - } + extend GameCommand { + optional Command_NextTurn ext = 1022; + } } diff --git a/common/pb/command_ready_start.proto b/common/pb/command_ready_start.proto index 5f797a0f..1d7d203c 100644 --- a/common/pb/command_ready_start.proto +++ b/common/pb/command_ready_start.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_ReadyStart { - extend GameCommand { - optional Command_ReadyStart ext = 1016; - } - optional bool ready = 1; + extend GameCommand { + optional Command_ReadyStart ext = 1016; + } + optional bool ready = 1; } diff --git a/common/pb/command_replay_delete_match.proto b/common/pb/command_replay_delete_match.proto index 841e7cfc..33d6d44b 100644 --- a/common/pb/command_replay_delete_match.proto +++ b/common/pb/command_replay_delete_match.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_ReplayDeleteMatch { - extend SessionCommand { - optional Command_ReplayDeleteMatch ext = 1103; - } - optional sint32 game_id = 1 [default = -1]; + extend SessionCommand { + optional Command_ReplayDeleteMatch ext = 1103; + } + optional sint32 game_id = 1 [default = -1]; } diff --git a/common/pb/command_replay_download.proto b/common/pb/command_replay_download.proto index ff7e2b34..17724e5b 100644 --- a/common/pb/command_replay_download.proto +++ b/common/pb/command_replay_download.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_ReplayDownload { - extend SessionCommand { - optional Command_ReplayDownload ext = 1101; - } - optional sint32 replay_id = 1 [default = -1]; + extend SessionCommand { + optional Command_ReplayDownload ext = 1101; + } + optional sint32 replay_id = 1 [default = -1]; } diff --git a/common/pb/command_replay_list.proto b/common/pb/command_replay_list.proto index 2dc0e92e..8fbcdc5a 100644 --- a/common/pb/command_replay_list.proto +++ b/common/pb/command_replay_list.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_ReplayList { - extend SessionCommand { - optional Command_ReplayList ext = 1100; - } + extend SessionCommand { + optional Command_ReplayList ext = 1100; + } } diff --git a/common/pb/command_replay_modify_match.proto b/common/pb/command_replay_modify_match.proto index 28e0fc0a..6b342f44 100644 --- a/common/pb/command_replay_modify_match.proto +++ b/common/pb/command_replay_modify_match.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_commands.proto"; message Command_ReplayModifyMatch { - extend SessionCommand { - optional Command_ReplayModifyMatch ext = 1102; - } - optional sint32 game_id = 1 [default = -1]; - optional bool do_not_hide = 2; + extend SessionCommand { + optional Command_ReplayModifyMatch ext = 1102; + } + optional sint32 game_id = 1 [default = -1]; + optional bool do_not_hide = 2; } diff --git a/common/pb/command_reveal_cards.proto b/common/pb/command_reveal_cards.proto index 263fef63..5c4024ba 100644 --- a/common/pb/command_reveal_cards.proto +++ b/common/pb/command_reveal_cards.proto @@ -1,11 +1,12 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_RevealCards { - extend GameCommand { - optional Command_RevealCards ext = 1026; - } - optional string zone_name = 1; - optional sint32 card_id = 2 [default = -1]; - optional sint32 player_id = 3 [default = -1]; - optional bool grant_write_access = 4; + extend GameCommand { + optional Command_RevealCards ext = 1026; + } + optional string zone_name = 1; + optional sint32 card_id = 2 [default = -1]; + optional sint32 player_id = 3 [default = -1]; + optional bool grant_write_access = 4; optional sint32 top_cards = 5 [default = -1]; } diff --git a/common/pb/command_roll_die.proto b/common/pb/command_roll_die.proto index f5d9c72e..bdcc7b51 100644 --- a/common/pb/command_roll_die.proto +++ b/common/pb/command_roll_die.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_RollDie { - extend GameCommand { - optional Command_RollDie ext = 1005; - } - optional uint32 sides = 1; + extend GameCommand { + optional Command_RollDie ext = 1005; + } + optional uint32 sides = 1; } diff --git a/common/pb/command_set_active_phase.proto b/common/pb/command_set_active_phase.proto index 66404cd2..ded7d819 100644 --- a/common/pb/command_set_active_phase.proto +++ b/common/pb/command_set_active_phase.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_SetActivePhase { - extend GameCommand { - optional Command_SetActivePhase ext = 1023; - } - optional uint32 phase = 1; + extend GameCommand { + optional Command_SetActivePhase ext = 1023; + } + optional uint32 phase = 1; } diff --git a/common/pb/command_set_card_attr.proto b/common/pb/command_set_card_attr.proto index b8a8fb60..1e1d8664 100644 --- a/common/pb/command_set_card_attr.proto +++ b/common/pb/command_set_card_attr.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "game_commands.proto"; import "card_attributes.proto"; message Command_SetCardAttr { - extend GameCommand { - optional Command_SetCardAttr ext = 1013; - } - optional string zone = 1; - optional sint32 card_id = 2 [default = -1]; - optional CardAttribute attribute = 3; - optional string attr_value = 4; + extend GameCommand { + optional Command_SetCardAttr ext = 1013; + } + optional string zone = 1; + optional sint32 card_id = 2 [default = -1]; + optional CardAttribute attribute = 3; + optional string attr_value = 4; } diff --git a/common/pb/command_set_card_counter.proto b/common/pb/command_set_card_counter.proto index b258a861..5fa9c3ee 100644 --- a/common/pb/command_set_card_counter.proto +++ b/common/pb/command_set_card_counter.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_SetCardCounter { - extend GameCommand { - optional Command_SetCardCounter ext = 1014; - } - optional string zone = 1; - optional sint32 card_id = 2 [default = -1]; - optional sint32 counter_id = 3 [default = -1]; - optional sint32 counter_value = 4; + extend GameCommand { + optional Command_SetCardCounter ext = 1014; + } + optional string zone = 1; + optional sint32 card_id = 2 [default = -1]; + optional sint32 counter_id = 3 [default = -1]; + optional sint32 counter_value = 4; } diff --git a/common/pb/command_set_counter.proto b/common/pb/command_set_counter.proto index a2f34cc2..33cae56a 100644 --- a/common/pb/command_set_counter.proto +++ b/common/pb/command_set_counter.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_SetCounter { - extend GameCommand { - optional Command_SetCounter ext = 1020; - } - optional sint32 counter_id = 1 [default = -1]; - optional sint32 value = 2; + extend GameCommand { + optional Command_SetCounter ext = 1020; + } + optional sint32 counter_id = 1 [default = -1]; + optional sint32 value = 2; } diff --git a/common/pb/command_set_sideboard_lock.proto b/common/pb/command_set_sideboard_lock.proto index 1f9e8ba1..5aa6a64b 100644 --- a/common/pb/command_set_sideboard_lock.proto +++ b/common/pb/command_set_sideboard_lock.proto @@ -1,7 +1,8 @@ - import "game_commands.proto"; +syntax = "proto2"; +import "game_commands.proto"; message Command_SetSideboardLock { - extend GameCommand { - optional Command_SetSideboardLock ext = 1030; - } - optional bool locked = 1; + extend GameCommand { + optional Command_SetSideboardLock ext = 1030; + } + optional bool locked = 1; } diff --git a/common/pb/command_set_sideboard_plan.proto b/common/pb/command_set_sideboard_plan.proto index 09061c8b..7ed0d10c 100644 --- a/common/pb/command_set_sideboard_plan.proto +++ b/common/pb/command_set_sideboard_plan.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_commands.proto"; import "move_card_to_zone.proto"; message Command_SetSideboardPlan { - extend GameCommand { - optional Command_SetSideboardPlan ext = 1028; - } - repeated MoveCard_ToZone move_list = 1; + extend GameCommand { + optional Command_SetSideboardPlan ext = 1028; + } + repeated MoveCard_ToZone move_list = 1; } diff --git a/common/pb/command_shuffle.proto b/common/pb/command_shuffle.proto index 26ee0422..e2e1d5ec 100644 --- a/common/pb/command_shuffle.proto +++ b/common/pb/command_shuffle.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_Shuffle { - extend GameCommand { - optional Command_Shuffle ext = 1003; - } + extend GameCommand { + optional Command_Shuffle ext = 1003; + } } diff --git a/common/pb/command_stop_dump_zone.proto b/common/pb/command_stop_dump_zone.proto index 1a7539c1..1896c9dc 100644 --- a/common/pb/command_stop_dump_zone.proto +++ b/common/pb/command_stop_dump_zone.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_StopDumpZone { - extend GameCommand { - optional Command_StopDumpZone ext = 1025; - } - optional sint32 player_id = 1; - optional string zone_name = 2; + extend GameCommand { + optional Command_StopDumpZone ext = 1025; + } + optional sint32 player_id = 1; + optional string zone_name = 2; } diff --git a/common/pb/command_undo_draw.proto b/common/pb/command_undo_draw.proto index f51cb46c..09428933 100644 --- a/common/pb/command_undo_draw.proto +++ b/common/pb/command_undo_draw.proto @@ -1,6 +1,7 @@ +syntax = "proto2"; import "game_commands.proto"; message Command_UndoDraw { - extend GameCommand { - optional Command_UndoDraw ext = 1007; - } + extend GameCommand { + optional Command_UndoDraw ext = 1007; + } } diff --git a/common/pb/commands.proto b/common/pb/commands.proto index 3796190d..b417550a 100644 --- a/common/pb/commands.proto +++ b/common/pb/commands.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; import "session_commands.proto"; import "game_commands.proto"; import "room_commands.proto"; @@ -5,14 +6,14 @@ import "moderator_commands.proto"; import "admin_commands.proto"; message CommandContainer { - optional uint64 cmd_id = 1; - - optional uint32 game_id = 10; - optional uint32 room_id = 20; - - repeated SessionCommand session_command = 100; - repeated GameCommand game_command = 101; - repeated RoomCommand room_command = 102; - repeated ModeratorCommand moderator_command = 103; - repeated AdminCommand admin_command = 104; + optional uint64 cmd_id = 1; + + optional uint32 game_id = 10; + optional uint32 room_id = 20; + + repeated SessionCommand session_command = 100; + repeated GameCommand game_command = 101; + repeated RoomCommand room_command = 102; + repeated ModeratorCommand moderator_command = 103; + repeated AdminCommand admin_command = 104; } diff --git a/common/pb/context_concede.proto b/common/pb/context_concede.proto index 2ece178f..7b82aa31 100644 --- a/common/pb/context_concede.proto +++ b/common/pb/context_concede.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_Concede { - extend GameEventContext { - optional Context_Concede ext = 1001; - } + extend GameEventContext { + optional Context_Concede ext = 1001; + } } diff --git a/common/pb/context_connection_state_changed.proto b/common/pb/context_connection_state_changed.proto index d1f592ee..c87f8bed 100644 --- a/common/pb/context_connection_state_changed.proto +++ b/common/pb/context_connection_state_changed.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_ConnectionStateChanged { - extend GameEventContext { - optional Context_ConnectionStateChanged ext = 1007; - } + extend GameEventContext { + optional Context_ConnectionStateChanged ext = 1007; + } } diff --git a/common/pb/context_deck_select.proto b/common/pb/context_deck_select.proto index f36c8b6c..dbd4ce16 100644 --- a/common/pb/context_deck_select.proto +++ b/common/pb/context_deck_select.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_DeckSelect { diff --git a/common/pb/context_move_card.proto b/common/pb/context_move_card.proto index d8f7139d..49bcb77c 100644 --- a/common/pb/context_move_card.proto +++ b/common/pb/context_move_card.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_MoveCard { - extend GameEventContext { - optional Context_MoveCard ext = 1004; - } + extend GameEventContext { + optional Context_MoveCard ext = 1004; + } } diff --git a/common/pb/context_mulligan.proto b/common/pb/context_mulligan.proto index d5ef0bcc..edcaf900 100644 --- a/common/pb/context_mulligan.proto +++ b/common/pb/context_mulligan.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_Mulligan { - extend GameEventContext { - optional Context_Mulligan ext = 1005; - } - optional uint32 number = 1; + extend GameEventContext { + optional Context_Mulligan ext = 1005; + } + optional uint32 number = 1; } diff --git a/common/pb/context_ping_changed.proto b/common/pb/context_ping_changed.proto index 8ea43c5f..e8f1b0bd 100644 --- a/common/pb/context_ping_changed.proto +++ b/common/pb/context_ping_changed.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_PingChanged { - extend GameEventContext { - optional Context_PingChanged ext = 1006; - } + extend GameEventContext { + optional Context_PingChanged ext = 1006; + } } diff --git a/common/pb/context_ready_start.proto b/common/pb/context_ready_start.proto index ac16ef64..7a4e6089 100644 --- a/common/pb/context_ready_start.proto +++ b/common/pb/context_ready_start.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_ReadyStart { - extend GameEventContext { - optional Context_ReadyStart ext = 1000; - } + extend GameEventContext { + optional Context_ReadyStart ext = 1000; + } } diff --git a/common/pb/context_set_sideboard_lock.proto b/common/pb/context_set_sideboard_lock.proto index c62c5bd1..a9a36f8b 100644 --- a/common/pb/context_set_sideboard_lock.proto +++ b/common/pb/context_set_sideboard_lock.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_SetSideboardLock { - extend GameEventContext { - optional Context_SetSideboardLock ext = 1008; - } + extend GameEventContext { + optional Context_SetSideboardLock ext = 1008; + } } diff --git a/common/pb/context_undo_draw.proto b/common/pb/context_undo_draw.proto index 513aa9ad..8b934079 100644 --- a/common/pb/context_undo_draw.proto +++ b/common/pb/context_undo_draw.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event_context.proto"; message Context_UndoDraw { - extend GameEventContext { - optional Context_UndoDraw ext = 1003; - } + extend GameEventContext { + optional Context_UndoDraw ext = 1003; + } } diff --git a/common/pb/event_add_to_list.proto b/common/pb/event_add_to_list.proto index 5f168eea..4a1072e8 100644 --- a/common/pb/event_add_to_list.proto +++ b/common/pb/event_add_to_list.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_user.proto"; message Event_AddToList { - extend SessionEvent { - optional Event_AddToList ext = 1005; - } - optional string list_name = 1; - optional ServerInfo_User user_info = 2; + extend SessionEvent { + optional Event_AddToList ext = 1005; + } + optional string list_name = 1; + optional ServerInfo_User user_info = 2; } diff --git a/common/pb/event_attach_card.proto b/common/pb/event_attach_card.proto index 56eef093..a71610f9 100644 --- a/common/pb/event_attach_card.proto +++ b/common/pb/event_attach_card.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "game_event.proto"; message Event_AttachCard { - extend GameEvent { - optional Event_AttachCard ext = 2012; - } - optional string start_zone = 1; - optional sint32 card_id = 2; - optional sint32 target_player_id = 3; - optional string target_zone = 4; - optional sint32 target_card_id = 5; + extend GameEvent { + optional Event_AttachCard ext = 2012; + } + optional string start_zone = 1; + optional sint32 card_id = 2; + optional sint32 target_player_id = 3; + optional string target_zone = 4; + optional sint32 target_card_id = 5; } diff --git a/common/pb/event_change_zone_properties.proto b/common/pb/event_change_zone_properties.proto index 7e86fe0a..0f1deb6d 100644 --- a/common/pb/event_change_zone_properties.proto +++ b/common/pb/event_change_zone_properties.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_event.proto"; message Event_ChangeZoneProperties { - extend GameEvent { - optional Event_ChangeZoneProperties ext = 2020; - } - optional string zone_name = 1; - - optional bool always_reveal_top_card = 10; + extend GameEvent { + optional Event_ChangeZoneProperties ext = 2020; + } + optional string zone_name = 1; + + optional bool always_reveal_top_card = 10; } diff --git a/common/pb/event_connection_closed.proto b/common/pb/event_connection_closed.proto index c1c85ab5..03018b80 100644 --- a/common/pb/event_connection_closed.proto +++ b/common/pb/event_connection_closed.proto @@ -1,20 +1,21 @@ +syntax = "proto2"; import "session_event.proto"; message Event_ConnectionClosed { - extend SessionEvent { - optional Event_ConnectionClosed ext = 1002; - } - enum CloseReason { - OTHER = 1; - SERVER_SHUTDOWN = 2; - TOO_MANY_CONNECTIONS = 3; - BANNED = 4; - USERNAMEINVALID = 5; - USER_LIMIT_REACHED = 6; - DEMOTED = 7; - LOGGEDINELSEWERE = 8; - } - optional CloseReason reason = 1; - optional string reason_str = 2; - optional uint32 end_time = 3; + extend SessionEvent { + optional Event_ConnectionClosed ext = 1002; + } + enum CloseReason { + OTHER = 1; + SERVER_SHUTDOWN = 2; + TOO_MANY_CONNECTIONS = 3; + BANNED = 4; + USERNAMEINVALID = 5; + USER_LIMIT_REACHED = 6; + DEMOTED = 7; + LOGGEDINELSEWERE = 8; + } + optional CloseReason reason = 1; + optional string reason_str = 2; + optional uint32 end_time = 3; } diff --git a/common/pb/event_create_arrow.proto b/common/pb/event_create_arrow.proto index 6cbd04f3..820d3cea 100644 --- a/common/pb/event_create_arrow.proto +++ b/common/pb/event_create_arrow.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_arrow.proto"; message Event_CreateArrow { - extend GameEvent { - optional Event_CreateArrow ext = 2000; - } - optional ServerInfo_Arrow arrow_info = 1; + extend GameEvent { + optional Event_CreateArrow ext = 2000; + } + optional ServerInfo_Arrow arrow_info = 1; } diff --git a/common/pb/event_create_counter.proto b/common/pb/event_create_counter.proto index 09499964..5dfca01e 100644 --- a/common/pb/event_create_counter.proto +++ b/common/pb/event_create_counter.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_counter.proto"; message Event_CreateCounter { - extend GameEvent { - optional Event_CreateCounter ext = 2002; - } - optional ServerInfo_Counter counter_info = 1; + extend GameEvent { + optional Event_CreateCounter ext = 2002; + } + optional ServerInfo_Counter counter_info = 1; } diff --git a/common/pb/event_create_token.proto b/common/pb/event_create_token.proto index 4dde7251..42c32eff 100644 --- a/common/pb/event_create_token.proto +++ b/common/pb/event_create_token.proto @@ -1,16 +1,17 @@ +syntax = "proto2"; import "game_event.proto"; message Event_CreateToken { - extend GameEvent { - optional Event_CreateToken ext = 2013; - } - optional string zone_name = 1; - optional sint32 card_id = 2; - optional string card_name = 3; - optional string color = 4; - optional string pt = 5; - optional string annotation = 6; - optional bool destroy_on_zone_change = 7; - optional sint32 x = 8; - optional sint32 y = 9; + extend GameEvent { + optional Event_CreateToken ext = 2013; + } + optional string zone_name = 1; + optional sint32 card_id = 2; + optional string card_name = 3; + optional string color = 4; + optional string pt = 5; + optional string annotation = 6; + optional bool destroy_on_zone_change = 7; + optional sint32 x = 8; + optional sint32 y = 9; } diff --git a/common/pb/event_del_counter.proto b/common/pb/event_del_counter.proto index 85616e4e..c693fc86 100644 --- a/common/pb/event_del_counter.proto +++ b/common/pb/event_del_counter.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_DelCounter { - extend GameEvent { - optional Event_DelCounter ext = 2004; - } - optional sint32 counter_id = 1; + extend GameEvent { + optional Event_DelCounter ext = 2004; + } + optional sint32 counter_id = 1; } diff --git a/common/pb/event_delete_arrow.proto b/common/pb/event_delete_arrow.proto index f1d40d24..bd165c97 100644 --- a/common/pb/event_delete_arrow.proto +++ b/common/pb/event_delete_arrow.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_DeleteArrow { - extend GameEvent { - optional Event_DeleteArrow ext = 2001; - } - optional sint32 arrow_id = 1; + extend GameEvent { + optional Event_DeleteArrow ext = 2001; + } + optional sint32 arrow_id = 1; } diff --git a/common/pb/event_destroy_card.proto b/common/pb/event_destroy_card.proto index 6bea092c..8bef2242 100644 --- a/common/pb/event_destroy_card.proto +++ b/common/pb/event_destroy_card.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; message Event_DestroyCard { - extend GameEvent { - optional Event_DestroyCard ext = 2011; - } - optional string zone_name = 1; - optional uint32 card_id = 2; + extend GameEvent { + optional Event_DestroyCard ext = 2011; + } + optional string zone_name = 1; + optional uint32 card_id = 2; } diff --git a/common/pb/event_draw_cards.proto b/common/pb/event_draw_cards.proto index a4165d29..cea343a1 100644 --- a/common/pb/event_draw_cards.proto +++ b/common/pb/event_draw_cards.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_card.proto"; message Event_DrawCards { - extend GameEvent { - optional Event_DrawCards ext = 2005; - } - optional sint32 number = 1; - repeated ServerInfo_Card cards = 2; + extend GameEvent { + optional Event_DrawCards ext = 2005; + } + optional sint32 number = 1; + repeated ServerInfo_Card cards = 2; } diff --git a/common/pb/event_dump_zone.proto b/common/pb/event_dump_zone.proto index 933b9c50..f3dc0852 100644 --- a/common/pb/event_dump_zone.proto +++ b/common/pb/event_dump_zone.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "game_event.proto"; message Event_DumpZone { - extend GameEvent { - optional Event_DumpZone ext = 2018; - } - optional sint32 zone_owner_id = 1; - optional string zone_name = 2; - optional sint32 number_cards = 3; + extend GameEvent { + optional Event_DumpZone ext = 2018; + } + optional sint32 zone_owner_id = 1; + optional string zone_name = 2; + optional sint32 number_cards = 3; } diff --git a/common/pb/event_flip_card.proto b/common/pb/event_flip_card.proto index 4d870440..08a5d8c6 100644 --- a/common/pb/event_flip_card.proto +++ b/common/pb/event_flip_card.proto @@ -1,11 +1,12 @@ +syntax = "proto2"; import "game_event.proto"; message Event_FlipCard { - extend GameEvent { - optional Event_FlipCard ext = 2010; - } - optional string zone_name = 1; - optional sint32 card_id = 2; - optional string card_name = 3; - optional bool face_down = 4; + extend GameEvent { + optional Event_FlipCard ext = 2010; + } + optional string zone_name = 1; + optional sint32 card_id = 2; + optional string card_name = 3; + optional bool face_down = 4; } diff --git a/common/pb/event_game_closed.proto b/common/pb/event_game_closed.proto index 723f8263..e400926c 100644 --- a/common/pb/event_game_closed.proto +++ b/common/pb/event_game_closed.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event.proto"; message Event_GameClosed { - extend GameEvent { - optional Event_GameClosed ext = 1002; - } + extend GameEvent { + optional Event_GameClosed ext = 1002; + } } diff --git a/common/pb/event_game_host_changed.proto b/common/pb/event_game_host_changed.proto index c4c42f6d..50e3f968 100644 --- a/common/pb/event_game_host_changed.proto +++ b/common/pb/event_game_host_changed.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_GameHostChanged { - extend GameEvent { - optional Event_GameHostChanged ext = 1003; - } + extend GameEvent { + optional Event_GameHostChanged ext = 1003; + } } diff --git a/common/pb/event_game_joined.proto b/common/pb/event_game_joined.proto index aa344ade..eaf2894c 100644 --- a/common/pb/event_game_joined.proto +++ b/common/pb/event_game_joined.proto @@ -1,15 +1,16 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_game.proto"; import "serverinfo_gametype.proto"; message Event_GameJoined { - extend SessionEvent { - optional Event_GameJoined ext = 1009; - } - optional ServerInfo_Game game_info = 1; - repeated ServerInfo_GameType game_types = 2; - optional sint32 host_id = 3; - optional sint32 player_id = 4; - optional bool spectator = 5; - optional bool resuming = 6; + extend SessionEvent { + optional Event_GameJoined ext = 1009; + } + optional ServerInfo_Game game_info = 1; + repeated ServerInfo_GameType game_types = 2; + optional sint32 host_id = 3; + optional sint32 player_id = 4; + optional bool spectator = 5; + optional bool resuming = 6; } diff --git a/common/pb/event_game_say.proto b/common/pb/event_game_say.proto index 4746b7b5..8aa42eca 100644 --- a/common/pb/event_game_say.proto +++ b/common/pb/event_game_say.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_GameSay { - extend GameEvent { - optional Event_GameSay ext = 1009; - } - optional string message = 1; + extend GameEvent { + optional Event_GameSay ext = 1009; + } + optional string message = 1; } diff --git a/common/pb/event_game_state_changed.proto b/common/pb/event_game_state_changed.proto index a4055c02..092d45de 100644 --- a/common/pb/event_game_state_changed.proto +++ b/common/pb/event_game_state_changed.proto @@ -1,13 +1,14 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_player.proto"; message Event_GameStateChanged { - extend GameEvent { - optional Event_GameStateChanged ext = 1005; - } - repeated ServerInfo_Player player_list = 1; - optional bool game_started = 2; - optional sint32 active_player_id = 3; - optional sint32 active_phase = 4; - optional uint32 seconds_elapsed = 5; + extend GameEvent { + optional Event_GameStateChanged ext = 1005; + } + repeated ServerInfo_Player player_list = 1; + optional bool game_started = 2; + optional sint32 active_player_id = 3; + optional sint32 active_phase = 4; + optional uint32 seconds_elapsed = 5; } diff --git a/common/pb/event_join.proto b/common/pb/event_join.proto index 94757838..1c91dc09 100644 --- a/common/pb/event_join.proto +++ b/common/pb/event_join.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_playerproperties.proto"; message Event_Join { - extend GameEvent { - optional Event_Join ext = 1000; - } - optional ServerInfo_PlayerProperties player_properties = 1; + extend GameEvent { + optional Event_Join ext = 1000; + } + optional ServerInfo_PlayerProperties player_properties = 1; } diff --git a/common/pb/event_join_room.proto b/common/pb/event_join_room.proto index f031eee9..e575edc4 100644 --- a/common/pb/event_join_room.proto +++ b/common/pb/event_join_room.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "room_event.proto"; import "serverinfo_user.proto"; message Event_JoinRoom { - extend RoomEvent { - optional Event_JoinRoom ext = 1001; - } - optional ServerInfo_User user_info = 1; + extend RoomEvent { + optional Event_JoinRoom ext = 1001; + } + optional ServerInfo_User user_info = 1; } diff --git a/common/pb/event_kicked.proto b/common/pb/event_kicked.proto index 0163f5c5..02036cee 100644 --- a/common/pb/event_kicked.proto +++ b/common/pb/event_kicked.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event.proto"; message Event_Kicked { - extend GameEvent { - optional Event_Kicked ext = 1004; - } + extend GameEvent { + optional Event_Kicked ext = 1004; + } } diff --git a/common/pb/event_leave.proto b/common/pb/event_leave.proto index 19b46e25..c4a3740f 100644 --- a/common/pb/event_leave.proto +++ b/common/pb/event_leave.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "game_event.proto"; message Event_Leave { - extend GameEvent { - optional Event_Leave ext = 1001; - } + extend GameEvent { + optional Event_Leave ext = 1001; + } } diff --git a/common/pb/event_leave_room.proto b/common/pb/event_leave_room.proto index a49737a4..98dafe2d 100644 --- a/common/pb/event_leave_room.proto +++ b/common/pb/event_leave_room.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "room_event.proto"; message Event_LeaveRoom { - extend RoomEvent { - optional Event_LeaveRoom ext = 1000; - } - optional string name = 1; + extend RoomEvent { + optional Event_LeaveRoom ext = 1000; + } + optional string name = 1; } diff --git a/common/pb/event_list_games.proto b/common/pb/event_list_games.proto index e3c5b8ac..b69c7b5c 100644 --- a/common/pb/event_list_games.proto +++ b/common/pb/event_list_games.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "room_event.proto"; import "serverinfo_game.proto"; message Event_ListGames { - extend RoomEvent { - optional Event_ListGames ext = 1003; - } - repeated ServerInfo_Game game_list = 1; + extend RoomEvent { + optional Event_ListGames ext = 1003; + } + repeated ServerInfo_Game game_list = 1; } diff --git a/common/pb/event_list_rooms.proto b/common/pb/event_list_rooms.proto index 3969cbd5..e72d2ba1 100644 --- a/common/pb/event_list_rooms.proto +++ b/common/pb/event_list_rooms.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_room.proto"; message Event_ListRooms { - extend SessionEvent { - optional Event_ListRooms ext = 1004; - } - repeated ServerInfo_Room room_list = 1; + extend SessionEvent { + optional Event_ListRooms ext = 1004; + } + repeated ServerInfo_Room room_list = 1; } diff --git a/common/pb/event_move_card.proto b/common/pb/event_move_card.proto index 048f3a8d..f6d309f3 100644 --- a/common/pb/event_move_card.proto +++ b/common/pb/event_move_card.proto @@ -1,18 +1,19 @@ +syntax = "proto2"; import "game_event.proto"; message Event_MoveCard { - extend GameEvent { - optional Event_MoveCard ext = 2009; - } - optional sint32 card_id = 1 [default = -1]; - optional string card_name = 2; - optional sint32 start_player_id = 3 [default = -1]; - optional string start_zone = 4; - optional sint32 position = 5 [default = -1]; - optional sint32 target_player_id = 6 [default = -1]; - optional string target_zone = 7; - optional sint32 x = 8 [default = -1]; - optional sint32 y = 9 [default = -1]; - optional sint32 new_card_id = 10 [default = -1]; - optional bool face_down = 11; + extend GameEvent { + optional Event_MoveCard ext = 2009; + } + optional sint32 card_id = 1 [default = -1]; + optional string card_name = 2; + optional sint32 start_player_id = 3 [default = -1]; + optional string start_zone = 4; + optional sint32 position = 5 [default = -1]; + optional sint32 target_player_id = 6 [default = -1]; + optional string target_zone = 7; + optional sint32 x = 8 [default = -1]; + optional sint32 y = 9 [default = -1]; + optional sint32 new_card_id = 10 [default = -1]; + optional bool face_down = 11; } diff --git a/common/pb/event_notify_user.proto b/common/pb/event_notify_user.proto index e300f45a..dadc5b99 100644 --- a/common/pb/event_notify_user.proto +++ b/common/pb/event_notify_user.proto @@ -1,14 +1,15 @@ +syntax = "proto2"; import "session_event.proto"; message Event_NotifyUser { - enum NotificationType { + enum NotificationType { PROMOTED = 1; } - extend SessionEvent { - optional Event_NotifyUser ext = 1010; - } - optional NotificationType type = 1; + extend SessionEvent { + optional Event_NotifyUser ext = 1010; + } + optional NotificationType type = 1; } diff --git a/common/pb/event_player_properties_changed.proto b/common/pb/event_player_properties_changed.proto index 03a12c24..c0feaf53 100644 --- a/common/pb/event_player_properties_changed.proto +++ b/common/pb/event_player_properties_changed.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_playerproperties.proto"; message Event_PlayerPropertiesChanged { - extend GameEvent { - optional Event_PlayerPropertiesChanged ext = 1007; - } - optional ServerInfo_PlayerProperties player_properties = 1; + extend GameEvent { + optional Event_PlayerPropertiesChanged ext = 1007; + } + optional ServerInfo_PlayerProperties player_properties = 1; } diff --git a/common/pb/event_remove_from_list.proto b/common/pb/event_remove_from_list.proto index 4b90b1e7..81bb64ed 100644 --- a/common/pb/event_remove_from_list.proto +++ b/common/pb/event_remove_from_list.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_event.proto"; message Event_RemoveFromList { - extend SessionEvent { - optional Event_RemoveFromList ext = 1006; - } - optional string list_name = 1; - optional string user_name = 2; + extend SessionEvent { + optional Event_RemoveFromList ext = 1006; + } + optional string list_name = 1; + optional string user_name = 2; } diff --git a/common/pb/event_replay_added.proto b/common/pb/event_replay_added.proto index c3de2082..2efb5f37 100644 --- a/common/pb/event_replay_added.proto +++ b/common/pb/event_replay_added.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_replay_match.proto"; message Event_ReplayAdded { - extend SessionEvent { - optional Event_ReplayAdded ext = 1100; - } - optional ServerInfo_ReplayMatch match_info = 1; + extend SessionEvent { + optional Event_ReplayAdded ext = 1100; + } + optional ServerInfo_ReplayMatch match_info = 1; } diff --git a/common/pb/event_reveal_cards.proto b/common/pb/event_reveal_cards.proto index 1bb386e2..f6742c69 100644 --- a/common/pb/event_reveal_cards.proto +++ b/common/pb/event_reveal_cards.proto @@ -1,13 +1,14 @@ +syntax = "proto2"; import "game_event.proto"; import "serverinfo_card.proto"; message Event_RevealCards { - extend GameEvent { - optional Event_RevealCards ext = 2006; - } - optional string zone_name = 1; - optional sint32 card_id = 2 [default = -1]; - optional sint32 other_player_id = 3 [default = -1]; - repeated ServerInfo_Card cards = 4; - optional bool grant_write_access = 5; + extend GameEvent { + optional Event_RevealCards ext = 2006; + } + optional string zone_name = 1; + optional sint32 card_id = 2 [default = -1]; + optional sint32 other_player_id = 3 [default = -1]; + repeated ServerInfo_Card cards = 4; + optional bool grant_write_access = 5; } diff --git a/common/pb/event_roll_die.proto b/common/pb/event_roll_die.proto index dcc87bce..4d99f2be 100644 --- a/common/pb/event_roll_die.proto +++ b/common/pb/event_roll_die.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; message Event_RollDie { - extend GameEvent { - optional Event_RollDie ext = 2008; - } - optional uint32 sides = 1; - optional uint32 value = 2; + extend GameEvent { + optional Event_RollDie ext = 2008; + } + optional uint32 sides = 1; + optional uint32 value = 2; } diff --git a/common/pb/event_room_say.proto b/common/pb/event_room_say.proto index e5cc1792..49e70e69 100644 --- a/common/pb/event_room_say.proto +++ b/common/pb/event_room_say.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "room_event.proto"; message Event_RoomSay { - extend RoomEvent { - optional Event_RoomSay ext = 1002; - } - optional string name = 1; - optional string message = 2; + extend RoomEvent { + optional Event_RoomSay ext = 1002; + } + optional string name = 1; + optional string message = 2; } diff --git a/common/pb/event_server_complete_list.proto b/common/pb/event_server_complete_list.proto index 4e402e9b..8adba1fd 100644 --- a/common/pb/event_server_complete_list.proto +++ b/common/pb/event_server_complete_list.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_user.proto"; import "serverinfo_room.proto"; message Event_ServerCompleteList { - extend SessionEvent { - optional Event_ServerCompleteList ext = 600; - } - optional uint32 server_id = 1; - repeated ServerInfo_User user_list = 2; - repeated ServerInfo_Room room_list = 3; + extend SessionEvent { + optional Event_ServerCompleteList ext = 600; + } + optional uint32 server_id = 1; + repeated ServerInfo_User user_list = 2; + repeated ServerInfo_Room room_list = 3; } diff --git a/common/pb/event_server_identification.proto b/common/pb/event_server_identification.proto index d4417c03..6548043e 100644 --- a/common/pb/event_server_identification.proto +++ b/common/pb/event_server_identification.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_event.proto"; message Event_ServerIdentification { - extend SessionEvent { - optional Event_ServerIdentification ext = 500; - } - optional string server_name = 1; - optional string server_version = 2; - optional uint32 protocol_version = 3; + extend SessionEvent { + optional Event_ServerIdentification ext = 500; + } + optional string server_name = 1; + optional string server_version = 2; + optional uint32 protocol_version = 3; } diff --git a/common/pb/event_server_message.proto b/common/pb/event_server_message.proto index a0fc252d..a47d4eb7 100644 --- a/common/pb/event_server_message.proto +++ b/common/pb/event_server_message.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "session_event.proto"; message Event_ServerMessage { - extend SessionEvent { - optional Event_ServerMessage ext = 1000; - } - optional string message = 1; + extend SessionEvent { + optional Event_ServerMessage ext = 1000; + } + optional string message = 1; } diff --git a/common/pb/event_server_shutdown.proto b/common/pb/event_server_shutdown.proto index 9a3439a7..879ec1ea 100644 --- a/common/pb/event_server_shutdown.proto +++ b/common/pb/event_server_shutdown.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_event.proto"; message Event_ServerShutdown { - extend SessionEvent { - optional Event_ServerShutdown ext = 1001; - } - optional string reason = 1; - optional uint32 minutes = 2; + extend SessionEvent { + optional Event_ServerShutdown ext = 1001; + } + optional string reason = 1; + optional uint32 minutes = 2; } diff --git a/common/pb/event_set_active_phase.proto b/common/pb/event_set_active_phase.proto index fe4a8088..a19dd4b9 100644 --- a/common/pb/event_set_active_phase.proto +++ b/common/pb/event_set_active_phase.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_SetActivePhase { - extend GameEvent { - optional Event_SetActivePhase ext = 2017; - } - optional sint32 phase = 1; + extend GameEvent { + optional Event_SetActivePhase ext = 2017; + } + optional sint32 phase = 1; } diff --git a/common/pb/event_set_active_player.proto b/common/pb/event_set_active_player.proto index fe872b26..7962ac15 100644 --- a/common/pb/event_set_active_player.proto +++ b/common/pb/event_set_active_player.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_SetActivePlayer { - extend GameEvent { - optional Event_SetActivePlayer ext = 2016; - } - optional sint32 active_player_id = 1; + extend GameEvent { + optional Event_SetActivePlayer ext = 2016; + } + optional sint32 active_player_id = 1; } diff --git a/common/pb/event_set_card_attr.proto b/common/pb/event_set_card_attr.proto index a41bfc31..aa902fdd 100644 --- a/common/pb/event_set_card_attr.proto +++ b/common/pb/event_set_card_attr.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "game_event.proto"; import "card_attributes.proto"; message Event_SetCardAttr { - extend GameEvent { - optional Event_SetCardAttr ext = 2014; - } - optional string zone_name = 1; - optional sint32 card_id = 2; - optional CardAttribute attribute = 3; - optional string attr_value = 4; + extend GameEvent { + optional Event_SetCardAttr ext = 2014; + } + optional string zone_name = 1; + optional sint32 card_id = 2; + optional CardAttribute attribute = 3; + optional string attr_value = 4; } diff --git a/common/pb/event_set_card_counter.proto b/common/pb/event_set_card_counter.proto index 6072b18f..e0426271 100644 --- a/common/pb/event_set_card_counter.proto +++ b/common/pb/event_set_card_counter.proto @@ -1,11 +1,12 @@ +syntax = "proto2"; import "game_event.proto"; message Event_SetCardCounter { - extend GameEvent { - optional Event_SetCardCounter ext = 2015; - } - optional string zone_name = 1; - optional sint32 card_id = 2; - optional sint32 counter_id = 3; - optional sint32 counter_value = 4; + extend GameEvent { + optional Event_SetCardCounter ext = 2015; + } + optional string zone_name = 1; + optional sint32 card_id = 2; + optional sint32 counter_id = 3; + optional sint32 counter_value = 4; } diff --git a/common/pb/event_set_counter.proto b/common/pb/event_set_counter.proto index 941f7201..55541a02 100644 --- a/common/pb/event_set_counter.proto +++ b/common/pb/event_set_counter.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; message Event_SetCounter { - extend GameEvent { - optional Event_SetCounter ext = 2003; - } - optional sint32 counter_id = 1; - optional sint32 value = 2; + extend GameEvent { + optional Event_SetCounter ext = 2003; + } + optional sint32 counter_id = 1; + optional sint32 value = 2; } diff --git a/common/pb/event_shuffle.proto b/common/pb/event_shuffle.proto index e8a461c5..c1fc1afb 100644 --- a/common/pb/event_shuffle.proto +++ b/common/pb/event_shuffle.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "game_event.proto"; message Event_Shuffle { - extend GameEvent { - optional Event_Shuffle ext = 2007; - } - optional string zone_name = 1; + extend GameEvent { + optional Event_Shuffle ext = 2007; + } + optional string zone_name = 1; } diff --git a/common/pb/event_stop_dump_zone.proto b/common/pb/event_stop_dump_zone.proto index f0cff4dd..3e8f1693 100644 --- a/common/pb/event_stop_dump_zone.proto +++ b/common/pb/event_stop_dump_zone.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; message Event_StopDumpZone { - extend GameEvent { - optional Event_StopDumpZone ext = 2019; - } - optional sint32 zone_owner_id = 1; - optional string zone_name = 2; + extend GameEvent { + optional Event_StopDumpZone ext = 2019; + } + optional sint32 zone_owner_id = 1; + optional string zone_name = 2; } diff --git a/common/pb/event_user_joined.proto b/common/pb/event_user_joined.proto index 87e117e1..15ae93c3 100644 --- a/common/pb/event_user_joined.proto +++ b/common/pb/event_user_joined.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "session_event.proto"; import "serverinfo_user.proto"; message Event_UserJoined { - extend SessionEvent { - optional Event_UserJoined ext = 1007; - } - optional ServerInfo_User user_info = 1; + extend SessionEvent { + optional Event_UserJoined ext = 1007; + } + optional ServerInfo_User user_info = 1; } diff --git a/common/pb/event_user_left.proto b/common/pb/event_user_left.proto index b2bf1976..c857640d 100644 --- a/common/pb/event_user_left.proto +++ b/common/pb/event_user_left.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "session_event.proto"; message Event_UserLeft { - extend SessionEvent { - optional Event_UserLeft ext = 1008; - } - optional string name = 1; + extend SessionEvent { + optional Event_UserLeft ext = 1008; + } + optional string name = 1; } diff --git a/common/pb/event_user_message.proto b/common/pb/event_user_message.proto index b41585c2..9cf6003d 100644 --- a/common/pb/event_user_message.proto +++ b/common/pb/event_user_message.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "session_event.proto"; message Event_UserMessage { - extend SessionEvent { - optional Event_UserMessage ext = 1003; - } - optional string sender_name = 1; - optional string receiver_name = 2; - optional string message = 3; + extend SessionEvent { + optional Event_UserMessage ext = 1003; + } + optional string sender_name = 1; + optional string receiver_name = 2; + optional string message = 3; } diff --git a/common/pb/game_commands.proto b/common/pb/game_commands.proto index a9f28699..47d15441 100644 --- a/common/pb/game_commands.proto +++ b/common/pb/game_commands.proto @@ -1,37 +1,38 @@ +syntax = "proto2"; message GameCommand { - enum GameCommandType { - KICK_FROM_GAME = 1000; - LEAVE_GAME = 1001; - GAME_SAY = 1002; - SHUFFLE = 1003; - MULLIGAN = 1004; - ROLL_DIE = 1005; - DRAW_CARDS = 1006; - UNDO_DRAW = 1007; - FLIP_CARD = 1008; - ATTACH_CARD = 1009; - CREATE_TOKEN = 1010; - CREATE_ARROW = 1011; - DELETE_ARROW = 1012; - SET_CARD_ATTR = 1013; - SET_CARD_COUNTER = 1014; - INC_CARD_COUNTER = 1015; - READY_START = 1016; - CONCEDE = 1017; - INC_COUNTER = 1018; - CREATE_COUNTER = 1019; - SET_COUNTER = 1020; - DEL_COUNTER = 1021; - NEXT_TURN = 1022; - SET_ACTIVE_PHASE = 1023; - DUMP_ZONE = 1024; - STOP_DUMP_ZONE = 1025; - REVEAL_CARDS = 1026; - MOVE_CARD = 1027; - SET_SIDEBOARD_PLAN = 1028; - DECK_SELECT = 1029; - SET_SIDEBOARD_LOCK = 1030; - CHANGE_ZONE_PROPERTIES = 1031; - } - extensions 100 to max; + enum GameCommandType { + KICK_FROM_GAME = 1000; + LEAVE_GAME = 1001; + GAME_SAY = 1002; + SHUFFLE = 1003; + MULLIGAN = 1004; + ROLL_DIE = 1005; + DRAW_CARDS = 1006; + UNDO_DRAW = 1007; + FLIP_CARD = 1008; + ATTACH_CARD = 1009; + CREATE_TOKEN = 1010; + CREATE_ARROW = 1011; + DELETE_ARROW = 1012; + SET_CARD_ATTR = 1013; + SET_CARD_COUNTER = 1014; + INC_CARD_COUNTER = 1015; + READY_START = 1016; + CONCEDE = 1017; + INC_COUNTER = 1018; + CREATE_COUNTER = 1019; + SET_COUNTER = 1020; + DEL_COUNTER = 1021; + NEXT_TURN = 1022; + SET_ACTIVE_PHASE = 1023; + DUMP_ZONE = 1024; + STOP_DUMP_ZONE = 1025; + REVEAL_CARDS = 1026; + MOVE_CARD = 1027; + SET_SIDEBOARD_PLAN = 1028; + DECK_SELECT = 1029; + SET_SIDEBOARD_LOCK = 1030; + CHANGE_ZONE_PROPERTIES = 1031; + } + extensions 100 to max; } diff --git a/common/pb/game_event.proto b/common/pb/game_event.proto index 830c783c..09fbe93b 100644 --- a/common/pb/game_event.proto +++ b/common/pb/game_event.proto @@ -1,35 +1,36 @@ +syntax = "proto2"; message GameEvent { - enum GameEventType { - JOIN = 1000; - LEAVE = 1001; - GAME_CLOSED = 1002; - GAME_HOST_CHANGED = 1003; - KICKED = 1004; - GAME_STATE_CHANGED = 1005; - PLAYER_PROPERTIES_CHANGED = 1007; - GAME_SAY = 1009; - CREATE_ARROW = 2000; - DELETE_ARROW = 2001; - CREATE_COUNTER = 2002; - SET_COUNTER = 2003; - DEL_COUNTER = 2004; - DRAW_CARDS = 2005; - REVEAL_CARDS = 2006; - SHUFFLE = 2007; - ROLL_DIE = 2008; - MOVE_CARD = 2009; - FLIP_CARD = 2010; - DESTROY_CARD = 2011; - ATTACH_CARD = 2012; - CREATE_TOKEN = 2013; - SET_CARD_ATTR = 2014; - SET_CARD_COUNTER = 2015; - SET_ACTIVE_PLAYER = 2016; - SET_ACTIVE_PHASE = 2017; - DUMP_ZONE = 2018; - STOP_DUMP_ZONE = 2019; - CHANGE_ZONE_PROPERTIES = 2020; - } - optional sint32 player_id = 1 [default = -1]; - extensions 100 to max; + enum GameEventType { + JOIN = 1000; + LEAVE = 1001; + GAME_CLOSED = 1002; + GAME_HOST_CHANGED = 1003; + KICKED = 1004; + GAME_STATE_CHANGED = 1005; + PLAYER_PROPERTIES_CHANGED = 1007; + GAME_SAY = 1009; + CREATE_ARROW = 2000; + DELETE_ARROW = 2001; + CREATE_COUNTER = 2002; + SET_COUNTER = 2003; + DEL_COUNTER = 2004; + DRAW_CARDS = 2005; + REVEAL_CARDS = 2006; + SHUFFLE = 2007; + ROLL_DIE = 2008; + MOVE_CARD = 2009; + FLIP_CARD = 2010; + DESTROY_CARD = 2011; + ATTACH_CARD = 2012; + CREATE_TOKEN = 2013; + SET_CARD_ATTR = 2014; + SET_CARD_COUNTER = 2015; + SET_ACTIVE_PLAYER = 2016; + SET_ACTIVE_PHASE = 2017; + DUMP_ZONE = 2018; + STOP_DUMP_ZONE = 2019; + CHANGE_ZONE_PROPERTIES = 2020; + } + optional sint32 player_id = 1 [default = -1]; + extensions 100 to max; } diff --git a/common/pb/game_event_container.proto b/common/pb/game_event_container.proto index 69b92d23..fd4ca430 100644 --- a/common/pb/game_event_container.proto +++ b/common/pb/game_event_container.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "game_event.proto"; import "game_event_context.proto"; message GameEventContainer { - optional uint32 game_id = 1; - repeated GameEvent event_list = 2; - optional GameEventContext context = 3; - optional uint32 seconds_elapsed = 4; + optional uint32 game_id = 1; + repeated GameEvent event_list = 2; + optional GameEventContext context = 3; + optional uint32 seconds_elapsed = 4; } diff --git a/common/pb/game_event_context.proto b/common/pb/game_event_context.proto index 6abd35db..98d5047b 100644 --- a/common/pb/game_event_context.proto +++ b/common/pb/game_event_context.proto @@ -1,14 +1,15 @@ +syntax = "proto2"; message GameEventContext { - enum ContextType { - READY_START = 1000; - CONCEDE = 1001; - DECK_SELECT = 1002; - UNDO_DRAW = 1003; - MOVE_CARD = 1004; - MULLIGAN = 1005; - PING_CHANGED = 1006; - CONNECTION_STATE_CHANGED = 1007; - SET_SIDEBOARD_LOCK = 1008; - } - extensions 100 to max; + enum ContextType { + READY_START = 1000; + CONCEDE = 1001; + DECK_SELECT = 1002; + UNDO_DRAW = 1003; + MOVE_CARD = 1004; + MULLIGAN = 1005; + PING_CHANGED = 1006; + CONNECTION_STATE_CHANGED = 1007; + SET_SIDEBOARD_LOCK = 1008; + } + extensions 100 to max; } diff --git a/common/pb/game_replay.proto b/common/pb/game_replay.proto index 05bc67d0..e8a0aa0b 100644 --- a/common/pb/game_replay.proto +++ b/common/pb/game_replay.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "serverinfo_game.proto"; import "game_event_container.proto"; message GameReplay { - optional uint64 replay_id = 1; - optional ServerInfo_Game game_info = 2; - repeated GameEventContainer event_list = 3; - optional uint32 duration_seconds = 4; + optional uint64 replay_id = 1; + optional ServerInfo_Game game_info = 2; + repeated GameEventContainer event_list = 3; + optional uint32 duration_seconds = 4; } diff --git a/common/pb/isl_message.proto b/common/pb/isl_message.proto index 20dec29d..12520533 100644 --- a/common/pb/isl_message.proto +++ b/common/pb/isl_message.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; import "response.proto"; import "session_event.proto"; import "commands.proto"; @@ -5,25 +6,25 @@ import "game_event_container.proto"; import "room_event.proto"; message IslMessage { - enum MessageType { - GAME_COMMAND_CONTAINER = 0; - ROOM_COMMAND_CONTAINER = 1; - - RESPONSE = 10; - SESSION_EVENT = 11; - GAME_EVENT_CONTAINER = 12; - ROOM_EVENT = 13; - } - optional MessageType message_type = 1; - - optional uint64 session_id = 9; - optional sint32 player_id = 10 [default = -1]; - - optional CommandContainer game_command = 100; - optional CommandContainer room_command = 101; + enum MessageType { + GAME_COMMAND_CONTAINER = 0; + ROOM_COMMAND_CONTAINER = 1; + + RESPONSE = 10; + SESSION_EVENT = 11; + GAME_EVENT_CONTAINER = 12; + ROOM_EVENT = 13; + } + optional MessageType message_type = 1; + + optional uint64 session_id = 9; + optional sint32 player_id = 10 [default = -1]; + + optional CommandContainer game_command = 100; + optional CommandContainer room_command = 101; - optional Response response = 200; - optional SessionEvent session_event = 201; - optional GameEventContainer game_event_container = 202; - optional RoomEvent room_event = 203; + optional Response response = 200; + optional SessionEvent session_event = 201; + optional GameEventContainer game_event_container = 202; + optional RoomEvent room_event = 203; } diff --git a/common/pb/moderator_commands.proto b/common/pb/moderator_commands.proto index 5fe8a847..89672776 100644 --- a/common/pb/moderator_commands.proto +++ b/common/pb/moderator_commands.proto @@ -1,18 +1,19 @@ +syntax = "proto2"; message ModeratorCommand { - enum ModeratorCommandType { - BAN_FROM_SERVER = 1000; - } - extensions 100 to max; + enum ModeratorCommandType { + BAN_FROM_SERVER = 1000; + } + extensions 100 to max; } message Command_BanFromServer { - extend ModeratorCommand { - optional Command_BanFromServer ext = 1000; - } - optional string user_name = 1; - optional string address = 2; - optional uint32 minutes = 3; - optional string reason = 4; - optional string visible_reason = 5; - optional string clientid = 6; + extend ModeratorCommand { + optional Command_BanFromServer ext = 1000; + } + optional string user_name = 1; + optional string address = 2; + optional uint32 minutes = 3; + optional string reason = 4; + optional string visible_reason = 5; + optional string clientid = 6; } diff --git a/common/pb/move_card_to_zone.proto b/common/pb/move_card_to_zone.proto index edb03219..10ce87c3 100644 --- a/common/pb/move_card_to_zone.proto +++ b/common/pb/move_card_to_zone.proto @@ -1,5 +1,6 @@ +syntax = "proto2"; message MoveCard_ToZone { - optional string card_name = 1; - optional string start_zone = 2; - optional string target_zone = 3; + optional string card_name = 1; + optional string start_zone = 2; + optional string target_zone = 3; } diff --git a/common/pb/response.proto b/common/pb/response.proto index aa004006..ba3ccc6a 100644 --- a/common/pb/response.proto +++ b/common/pb/response.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; message Response { enum ResponseCode { RespNotConnected = -1; diff --git a/common/pb/response_activate.proto b/common/pb/response_activate.proto index 25667534..db4ddbc6 100644 --- a/common/pb/response_activate.proto +++ b/common/pb/response_activate.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "response.proto"; message Response_Activate { - extend Response { - optional Response_Activate ext = 1010; - } + extend Response { + optional Response_Activate ext = 1010; + } } \ No newline at end of file diff --git a/common/pb/response_adjust_mod.proto b/common/pb/response_adjust_mod.proto index e5dac6d8..c91493f8 100644 --- a/common/pb/response_adjust_mod.proto +++ b/common/pb/response_adjust_mod.proto @@ -1,7 +1,8 @@ +syntax = "proto2"; import "response.proto"; message Response_AdjustMod{ - extend Response { - optional Response_AdjustMod ext = 1011; - } + extend Response { + optional Response_AdjustMod ext = 1011; + } } diff --git a/common/pb/response_deck_download.proto b/common/pb/response_deck_download.proto index 804ba47f..f1839a9e 100644 --- a/common/pb/response_deck_download.proto +++ b/common/pb/response_deck_download.proto @@ -1,8 +1,9 @@ +syntax = "proto2"; import "response.proto"; message Response_DeckDownload { - extend Response { - optional Response_DeckDownload ext = 1007; - } - optional string deck = 1; + extend Response { + optional Response_DeckDownload ext = 1007; + } + optional string deck = 1; } diff --git a/common/pb/response_deck_list.proto b/common/pb/response_deck_list.proto index 37aa8276..bc516a25 100644 --- a/common/pb/response_deck_list.proto +++ b/common/pb/response_deck_list.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_deckstorage.proto"; message Response_DeckList { - extend Response { - optional Response_DeckList ext = 1006; - } - optional ServerInfo_DeckStorage_Folder root = 1; + extend Response { + optional Response_DeckList ext = 1006; + } + optional ServerInfo_DeckStorage_Folder root = 1; } diff --git a/common/pb/response_deck_upload.proto b/common/pb/response_deck_upload.proto index eb978fe8..3648d877 100644 --- a/common/pb/response_deck_upload.proto +++ b/common/pb/response_deck_upload.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_deckstorage.proto"; message Response_DeckUpload { - extend Response { - optional Response_DeckUpload ext = 1008; - } - optional ServerInfo_DeckStorage_TreeItem new_file = 1; + extend Response { + optional Response_DeckUpload ext = 1008; + } + optional ServerInfo_DeckStorage_TreeItem new_file = 1; } diff --git a/common/pb/response_dump_zone.proto b/common/pb/response_dump_zone.proto index 8df62ea7..e37288df 100644 --- a/common/pb/response_dump_zone.proto +++ b/common/pb/response_dump_zone.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_zone.proto"; message Response_DumpZone { - extend Response { - optional Response_DumpZone ext = 1004; - } - optional ServerInfo_Zone zone_info = 1; + extend Response { + optional Response_DumpZone ext = 1004; + } + optional ServerInfo_Zone zone_info = 1; } diff --git a/common/pb/response_get_games_of_user.proto b/common/pb/response_get_games_of_user.proto index 1c64377f..f179bcc6 100644 --- a/common/pb/response_get_games_of_user.proto +++ b/common/pb/response_get_games_of_user.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_game.proto"; import "serverinfo_room.proto"; message Response_GetGamesOfUser { - extend Response { - optional Response_GetGamesOfUser ext = 1002; - } - repeated ServerInfo_Room room_list = 1; - repeated ServerInfo_Game game_list = 2; + extend Response { + optional Response_GetGamesOfUser ext = 1002; + } + repeated ServerInfo_Room room_list = 1; + repeated ServerInfo_Game game_list = 2; } diff --git a/common/pb/response_get_user_info.proto b/common/pb/response_get_user_info.proto index b1c3b90c..fbfaaf21 100644 --- a/common/pb/response_get_user_info.proto +++ b/common/pb/response_get_user_info.proto @@ -1,11 +1,12 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_user.proto"; message Response_GetUserInfo { - extend Response { - optional Response_GetUserInfo ext = 1003; - } - optional ServerInfo_User user_info = 1; + extend Response { + optional Response_GetUserInfo ext = 1003; + } + optional ServerInfo_User user_info = 1; } diff --git a/common/pb/response_join_room.proto b/common/pb/response_join_room.proto index c9f9fcd6..7023c648 100644 --- a/common/pb/response_join_room.proto +++ b/common/pb/response_join_room.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_room.proto"; message Response_JoinRoom { - extend Response { - optional Response_JoinRoom ext = 1000; - } - optional ServerInfo_Room room_info = 1; + extend Response { + optional Response_JoinRoom ext = 1000; + } + optional ServerInfo_Room room_info = 1; } diff --git a/common/pb/response_list_users.proto b/common/pb/response_list_users.proto index c9fe9847..825ae6f7 100644 --- a/common/pb/response_list_users.proto +++ b/common/pb/response_list_users.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_user.proto"; message Response_ListUsers { - extend Response { - optional Response_ListUsers ext = 1001; - } - repeated ServerInfo_User user_list = 1; + extend Response { + optional Response_ListUsers ext = 1001; + } + repeated ServerInfo_User user_list = 1; } diff --git a/common/pb/response_login.proto b/common/pb/response_login.proto index a554ca09..fecd9d83 100644 --- a/common/pb/response_login.proto +++ b/common/pb/response_login.proto @@ -1,13 +1,14 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_user.proto"; message Response_Login { - extend Response { - optional Response_Login ext = 1005; - } - optional ServerInfo_User user_info = 1; - repeated ServerInfo_User buddy_list = 2; - repeated ServerInfo_User ignore_list = 3; - optional string denied_reason_str = 4; - optional uint64 denied_end_time = 5; + extend Response { + optional Response_Login ext = 1005; + } + optional ServerInfo_User user_info = 1; + repeated ServerInfo_User buddy_list = 2; + repeated ServerInfo_User ignore_list = 3; + optional string denied_reason_str = 4; + optional uint64 denied_end_time = 5; } diff --git a/common/pb/response_register.proto b/common/pb/response_register.proto index 9c6998ef..b5360f14 100644 --- a/common/pb/response_register.proto +++ b/common/pb/response_register.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; message Response_Register { - extend Response { - optional Response_Register ext = 1009; - } - optional string denied_reason_str = 1; - optional uint64 denied_end_time = 2; + extend Response { + optional Response_Register ext = 1009; + } + optional string denied_reason_str = 1; + optional uint64 denied_end_time = 2; } \ No newline at end of file diff --git a/common/pb/response_replay_download.proto b/common/pb/response_replay_download.proto index a3df3d65..d263f8d9 100644 --- a/common/pb/response_replay_download.proto +++ b/common/pb/response_replay_download.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; message Response_ReplayDownload { - extend Response { - optional Response_ReplayDownload ext = 1101; - } - optional bytes replay_data = 1; + extend Response { + optional Response_ReplayDownload ext = 1101; + } + optional bytes replay_data = 1; } diff --git a/common/pb/response_replay_list.proto b/common/pb/response_replay_list.proto index 93ffb8bb..68e7d41b 100644 --- a/common/pb/response_replay_list.proto +++ b/common/pb/response_replay_list.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "response.proto"; import "serverinfo_replay_match.proto"; message Response_ReplayList { - extend Response { - optional Response_ReplayList ext = 1100; - } - repeated ServerInfo_ReplayMatch match_list = 1; + extend Response { + optional Response_ReplayList ext = 1100; + } + repeated ServerInfo_ReplayMatch match_list = 1; } diff --git a/common/pb/room_commands.proto b/common/pb/room_commands.proto index e7411674..d6872810 100644 --- a/common/pb/room_commands.proto +++ b/common/pb/room_commands.proto @@ -1,48 +1,49 @@ +syntax = "proto2"; message RoomCommand { - enum RoomCommandType { - LEAVE_ROOM = 1000; - ROOM_SAY = 1001; - CREATE_GAME = 1002; - JOIN_GAME = 1003; - } - extensions 100 to max; + enum RoomCommandType { + LEAVE_ROOM = 1000; + ROOM_SAY = 1001; + CREATE_GAME = 1002; + JOIN_GAME = 1003; + } + extensions 100 to max; } message Command_LeaveRoom { - extend RoomCommand { - optional Command_LeaveRoom ext = 1000; - } + extend RoomCommand { + optional Command_LeaveRoom ext = 1000; + } } message Command_RoomSay { - extend RoomCommand { - optional Command_RoomSay ext = 1001; - } - optional string message = 1; + extend RoomCommand { + optional Command_RoomSay ext = 1001; + } + optional string message = 1; } message Command_CreateGame { - extend RoomCommand { - optional Command_CreateGame ext = 1002; - } - optional string description = 1; - optional string password = 2; - optional uint32 max_players = 3; - optional bool only_buddies = 4; - optional bool only_registered = 5; - optional bool spectators_allowed = 6; - optional bool spectators_need_password = 7; - optional bool spectators_can_talk = 8; - optional bool spectators_see_everything = 9; - repeated uint32 game_type_ids = 10; + extend RoomCommand { + optional Command_CreateGame ext = 1002; + } + optional string description = 1; + optional string password = 2; + optional uint32 max_players = 3; + optional bool only_buddies = 4; + optional bool only_registered = 5; + optional bool spectators_allowed = 6; + optional bool spectators_need_password = 7; + optional bool spectators_can_talk = 8; + optional bool spectators_see_everything = 9; + repeated uint32 game_type_ids = 10; } message Command_JoinGame { - extend RoomCommand { - optional Command_JoinGame ext = 1003; - } - optional sint32 game_id = 1 [default = -1]; - optional string password = 2; - optional bool spectator = 3; - optional bool override_restrictions = 4; + extend RoomCommand { + optional Command_JoinGame ext = 1003; + } + optional sint32 game_id = 1 [default = -1]; + optional string password = 2; + optional bool spectator = 3; + optional bool override_restrictions = 4; } diff --git a/common/pb/room_event.proto b/common/pb/room_event.proto index 9a34f4c4..b0cb3702 100644 --- a/common/pb/room_event.proto +++ b/common/pb/room_event.proto @@ -1,10 +1,11 @@ +syntax = "proto2"; message RoomEvent { - enum RoomEventType { - LEAVE_ROOM = 1000; - JOIN_ROOM = 1001; - ROOM_SAY = 1002; - LIST_GAMES = 1003; - } - optional sint32 room_id = 1; - extensions 100 to max; + enum RoomEventType { + LEAVE_ROOM = 1000; + JOIN_ROOM = 1001; + ROOM_SAY = 1002; + LIST_GAMES = 1003; + } + optional sint32 room_id = 1; + extensions 100 to max; } diff --git a/common/pb/server_message.proto b/common/pb/server_message.proto index b1905598..a9330ab3 100644 --- a/common/pb/server_message.proto +++ b/common/pb/server_message.proto @@ -1,19 +1,20 @@ +syntax = "proto2"; import "response.proto"; import "session_event.proto"; import "game_event_container.proto"; import "room_event.proto"; message ServerMessage { - enum MessageType { - RESPONSE = 0; - SESSION_EVENT = 1; - GAME_EVENT_CONTAINER = 2; - ROOM_EVENT = 3; - } - optional MessageType message_type = 1; - - optional Response response = 2; - optional SessionEvent session_event = 3; - optional GameEventContainer game_event_container = 4; - optional RoomEvent room_event = 5; + enum MessageType { + RESPONSE = 0; + SESSION_EVENT = 1; + GAME_EVENT_CONTAINER = 2; + ROOM_EVENT = 3; + } + optional MessageType message_type = 1; + + optional Response response = 2; + optional SessionEvent session_event = 3; + optional GameEventContainer game_event_container = 4; + optional RoomEvent room_event = 5; } diff --git a/common/pb/serverinfo_arrow.proto b/common/pb/serverinfo_arrow.proto index 63565913..cd99bd79 100644 --- a/common/pb/serverinfo_arrow.proto +++ b/common/pb/serverinfo_arrow.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "color.proto"; message ServerInfo_Arrow { - optional sint32 id = 1; - optional sint32 start_player_id = 2; - optional string start_zone = 3; - optional sint32 start_card_id = 4; - optional sint32 target_player_id = 5; - optional string target_zone = 6; - optional sint32 target_card_id = 7; - optional color arrow_color = 8; + optional sint32 id = 1; + optional sint32 start_player_id = 2; + optional string start_zone = 3; + optional sint32 start_card_id = 4; + optional sint32 target_player_id = 5; + optional string target_zone = 6; + optional sint32 target_card_id = 7; + optional color arrow_color = 8; } diff --git a/common/pb/serverinfo_card.proto b/common/pb/serverinfo_card.proto index b628a271..4d9a585c 100644 --- a/common/pb/serverinfo_card.proto +++ b/common/pb/serverinfo_card.proto @@ -1,20 +1,21 @@ +syntax = "proto2"; import "serverinfo_cardcounter.proto"; message ServerInfo_Card { - optional sint32 id = 1 [default = -1]; - optional string name = 2; - optional sint32 x = 3 [default = -1]; - optional sint32 y = 4 [default = -1]; - optional bool face_down = 5; - optional bool tapped = 6; - optional bool attacking = 7; - optional string color = 8; - optional string pt = 9; - optional string annotation = 10; - optional bool destroy_on_zone_change = 11; - optional bool doesnt_untap = 12; - repeated ServerInfo_CardCounter counter_list = 13; - optional sint32 attach_player_id = 14 [default = -1]; - optional string attach_zone = 15; - optional sint32 attach_card_id = 16 [default = -1]; + optional sint32 id = 1 [default = -1]; + optional string name = 2; + optional sint32 x = 3 [default = -1]; + optional sint32 y = 4 [default = -1]; + optional bool face_down = 5; + optional bool tapped = 6; + optional bool attacking = 7; + optional string color = 8; + optional string pt = 9; + optional string annotation = 10; + optional bool destroy_on_zone_change = 11; + optional bool doesnt_untap = 12; + repeated ServerInfo_CardCounter counter_list = 13; + optional sint32 attach_player_id = 14 [default = -1]; + optional string attach_zone = 15; + optional sint32 attach_card_id = 16 [default = -1]; } diff --git a/common/pb/serverinfo_cardcounter.proto b/common/pb/serverinfo_cardcounter.proto index d3c6a117..d1799a65 100644 --- a/common/pb/serverinfo_cardcounter.proto +++ b/common/pb/serverinfo_cardcounter.proto @@ -1,4 +1,5 @@ +syntax = "proto2"; message ServerInfo_CardCounter { - optional sint32 id = 1; - optional sint32 value = 2; + optional sint32 id = 1; + optional sint32 value = 2; } diff --git a/common/pb/serverinfo_counter.proto b/common/pb/serverinfo_counter.proto index eaf08200..849e3b4e 100644 --- a/common/pb/serverinfo_counter.proto +++ b/common/pb/serverinfo_counter.proto @@ -1,9 +1,10 @@ +syntax = "proto2"; import "color.proto"; message ServerInfo_Counter { - optional sint32 id = 1; - optional string name = 2; - optional color counter_color = 3; - optional sint32 radius = 4; - optional sint32 count = 5; + optional sint32 id = 1; + optional string name = 2; + optional color counter_color = 3; + optional sint32 radius = 4; + optional sint32 count = 5; } diff --git a/common/pb/serverinfo_deckstorage.proto b/common/pb/serverinfo_deckstorage.proto index 531a613d..16e3f28e 100644 --- a/common/pb/serverinfo_deckstorage.proto +++ b/common/pb/serverinfo_deckstorage.proto @@ -1,14 +1,15 @@ +syntax = "proto2"; message ServerInfo_DeckStorage_File { - optional uint32 creation_time = 1; + optional uint32 creation_time = 1; } message ServerInfo_DeckStorage_Folder { - repeated ServerInfo_DeckStorage_TreeItem items = 1; + repeated ServerInfo_DeckStorage_TreeItem items = 1; } message ServerInfo_DeckStorage_TreeItem { - optional uint32 id = 1; - optional string name = 2; - optional ServerInfo_DeckStorage_File file = 10; - optional ServerInfo_DeckStorage_Folder folder = 11; + optional uint32 id = 1; + optional string name = 2; + optional ServerInfo_DeckStorage_File file = 10; + optional ServerInfo_DeckStorage_Folder folder = 11; } diff --git a/common/pb/serverinfo_game.proto b/common/pb/serverinfo_game.proto index 3a0e10d4..8ba29eee 100644 --- a/common/pb/serverinfo_game.proto +++ b/common/pb/serverinfo_game.proto @@ -1,23 +1,24 @@ +syntax = "proto2"; import "serverinfo_user.proto"; message ServerInfo_Game { - optional sint32 server_id = 1 [default = -1]; - optional sint32 room_id = 2 [default = -1]; - optional sint32 game_id = 3 [default = -1]; - optional string description = 4; - optional bool with_password = 5; - optional uint32 max_players = 6; - repeated sint32 game_types = 7; - optional ServerInfo_User creator_info = 8; - optional bool only_buddies = 9; - optional bool only_registered = 10; - optional bool spectators_allowed = 11; - optional bool spectators_need_password = 12; - optional bool spectators_can_chat = 13; - optional bool spectators_omniscient = 14; - optional uint32 player_count = 30; - optional uint32 spectators_count = 31; - optional bool started = 50; - optional uint32 start_time = 51; - optional bool closed = 52; + optional sint32 server_id = 1 [default = -1]; + optional sint32 room_id = 2 [default = -1]; + optional sint32 game_id = 3 [default = -1]; + optional string description = 4; + optional bool with_password = 5; + optional uint32 max_players = 6; + repeated sint32 game_types = 7; + optional ServerInfo_User creator_info = 8; + optional bool only_buddies = 9; + optional bool only_registered = 10; + optional bool spectators_allowed = 11; + optional bool spectators_need_password = 12; + optional bool spectators_can_chat = 13; + optional bool spectators_omniscient = 14; + optional uint32 player_count = 30; + optional uint32 spectators_count = 31; + optional bool started = 50; + optional uint32 start_time = 51; + optional bool closed = 52; } diff --git a/common/pb/serverinfo_gametype.proto b/common/pb/serverinfo_gametype.proto index 977b9abb..a135b89b 100644 --- a/common/pb/serverinfo_gametype.proto +++ b/common/pb/serverinfo_gametype.proto @@ -1,5 +1,6 @@ +syntax = "proto2"; message ServerInfo_GameType { - optional sint32 game_type_id = 1; - optional string description = 2; + optional sint32 game_type_id = 1; + optional string description = 2; }; diff --git a/common/pb/serverinfo_player.proto b/common/pb/serverinfo_player.proto index 21911f5f..69cd4498 100644 --- a/common/pb/serverinfo_player.proto +++ b/common/pb/serverinfo_player.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "serverinfo_zone.proto"; import "serverinfo_counter.proto"; import "serverinfo_arrow.proto"; import "serverinfo_playerproperties.proto"; message ServerInfo_Player { - optional ServerInfo_PlayerProperties properties = 1; - optional string deck_list = 2; - repeated ServerInfo_Zone zone_list = 3; - repeated ServerInfo_Counter counter_list = 4; - repeated ServerInfo_Arrow arrow_list = 5; + optional ServerInfo_PlayerProperties properties = 1; + optional string deck_list = 2; + repeated ServerInfo_Zone zone_list = 3; + repeated ServerInfo_Counter counter_list = 4; + repeated ServerInfo_Arrow arrow_list = 5; } diff --git a/common/pb/serverinfo_playerping.proto b/common/pb/serverinfo_playerping.proto index 78ef6393..cb27e0e9 100644 --- a/common/pb/serverinfo_playerping.proto +++ b/common/pb/serverinfo_playerping.proto @@ -1,4 +1,5 @@ +syntax = "proto2"; message ServerInfo_PlayerPing { - optional sint32 player_id = 1; - optional sint32 ping_time = 2; + optional sint32 player_id = 1; + optional sint32 ping_time = 2; } diff --git a/common/pb/serverinfo_playerproperties.proto b/common/pb/serverinfo_playerproperties.proto index 87ef5cd9..96f3644a 100644 --- a/common/pb/serverinfo_playerproperties.proto +++ b/common/pb/serverinfo_playerproperties.proto @@ -1,12 +1,13 @@ +syntax = "proto2"; import "serverinfo_user.proto"; message ServerInfo_PlayerProperties { - optional sint32 player_id = 1; - optional ServerInfo_User user_info = 2; - optional bool spectator = 3; - optional bool conceded = 4; - optional bool ready_start = 5; - optional string deck_hash = 6; - optional sint32 ping_seconds = 7; - optional bool sideboard_locked = 8; + optional sint32 player_id = 1; + optional ServerInfo_User user_info = 2; + optional bool spectator = 3; + optional bool conceded = 4; + optional bool ready_start = 5; + optional string deck_hash = 6; + optional sint32 ping_seconds = 7; + optional bool sideboard_locked = 8; } diff --git a/common/pb/serverinfo_replay.proto b/common/pb/serverinfo_replay.proto index 18f68317..4b15db18 100644 --- a/common/pb/serverinfo_replay.proto +++ b/common/pb/serverinfo_replay.proto @@ -1,5 +1,6 @@ +syntax = "proto2"; message ServerInfo_Replay { - optional sint32 replay_id = 1 [default = -1]; - optional string replay_name = 2; - optional uint32 duration = 3; + optional sint32 replay_id = 1 [default = -1]; + optional string replay_name = 2; + optional uint32 duration = 3; } diff --git a/common/pb/serverinfo_replay_match.proto b/common/pb/serverinfo_replay_match.proto index 64576ecc..05abeb94 100644 --- a/common/pb/serverinfo_replay_match.proto +++ b/common/pb/serverinfo_replay_match.proto @@ -1,13 +1,14 @@ +syntax = "proto2"; import "serverinfo_replay.proto"; message ServerInfo_ReplayMatch { - repeated ServerInfo_Replay replay_list = 1; - - optional sint32 game_id = 2 [default = -1]; - optional string room_name = 3; - optional uint32 time_started = 4; - optional uint32 length = 5; - optional string game_name = 6; - repeated string player_names = 7; - optional bool do_not_hide = 8; + repeated ServerInfo_Replay replay_list = 1; + + optional sint32 game_id = 2 [default = -1]; + optional string room_name = 3; + optional uint32 time_started = 4; + optional uint32 length = 5; + optional string game_name = 6; + repeated string player_names = 7; + optional bool do_not_hide = 8; } diff --git a/common/pb/serverinfo_room.proto b/common/pb/serverinfo_room.proto index e7a6b6ab..571bc6f7 100644 --- a/common/pb/serverinfo_room.proto +++ b/common/pb/serverinfo_room.proto @@ -1,16 +1,17 @@ +syntax = "proto2"; import "serverinfo_game.proto"; import "serverinfo_user.proto"; import "serverinfo_gametype.proto"; message ServerInfo_Room { - optional sint32 room_id = 1; - optional string name = 2; - optional string description = 3; - optional uint32 game_count = 4; - optional uint32 player_count = 5; - optional bool auto_join = 6; - repeated ServerInfo_Game game_list = 7; - repeated ServerInfo_User user_list = 8; - repeated ServerInfo_GameType gametype_list = 9; - optional string permissionlevel = 10; + optional sint32 room_id = 1; + optional string name = 2; + optional string description = 3; + optional uint32 game_count = 4; + optional uint32 player_count = 5; + optional bool auto_join = 6; + repeated ServerInfo_Game game_list = 7; + repeated ServerInfo_User user_list = 8; + repeated ServerInfo_GameType gametype_list = 9; + optional string permissionlevel = 10; } diff --git a/common/pb/serverinfo_user.proto b/common/pb/serverinfo_user.proto index 71e5849e..f935bbfc 100644 --- a/common/pb/serverinfo_user.proto +++ b/common/pb/serverinfo_user.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; message ServerInfo_User { enum UserLevelFlag { IsNothing = 0; diff --git a/common/pb/serverinfo_zone.proto b/common/pb/serverinfo_zone.proto index aee914ad..d359613c 100644 --- a/common/pb/serverinfo_zone.proto +++ b/common/pb/serverinfo_zone.proto @@ -1,24 +1,25 @@ +syntax = "proto2"; import "serverinfo_card.proto"; message ServerInfo_Zone { - enum ZoneType { - // PrivateZone: Contents of the zone are always visible to the owner, - // but not to anyone else. - // PublicZone: Contents of the zone are always visible to anyone. - // HiddenZone: Contents of the zone are never visible to anyone. - // However, the owner of the zone can issue a dump_zone command, - // setting beingLookedAt to true. - // Cards in a zone with the type HiddenZone are referenced by their - // list index, whereas cards in any other zone are referenced by their ids. - - PrivateZone = 0; - PublicZone = 1; - HiddenZone = 2; - } - optional string name = 1; - optional ZoneType type = 2; - optional bool with_coords = 3; - optional sint32 card_count = 4; - repeated ServerInfo_Card card_list = 5; - optional bool always_reveal_top_card = 10; + enum ZoneType { + // PrivateZone: Contents of the zone are always visible to the owner, + // but not to anyone else. + // PublicZone: Contents of the zone are always visible to anyone. + // HiddenZone: Contents of the zone are never visible to anyone. + // However, the owner of the zone can issue a dump_zone command, + // setting beingLookedAt to true. + // Cards in a zone with the type HiddenZone are referenced by their + // list index, whereas cards in any other zone are referenced by their ids. + + PrivateZone = 0; + PublicZone = 1; + HiddenZone = 2; + } + optional string name = 1; + optional ZoneType type = 2; + optional bool with_coords = 3; + optional sint32 card_count = 4; + repeated ServerInfo_Card card_list = 5; + optional bool always_reveal_top_card = 10; } diff --git a/common/pb/session_commands.proto b/common/pb/session_commands.proto index 22dad27d..0d5b12bd 100644 --- a/common/pb/session_commands.proto +++ b/common/pb/session_commands.proto @@ -1,3 +1,4 @@ +syntax = "proto2"; import "serverinfo_user.proto"; message SessionCommand { diff --git a/common/pb/session_event.proto b/common/pb/session_event.proto index 1bfcbf88..3cce332c 100644 --- a/common/pb/session_event.proto +++ b/common/pb/session_event.proto @@ -1,19 +1,20 @@ +syntax = "proto2"; message SessionEvent { - enum SessionEventType { - SERVER_IDENTIFICATION = 500; - SERVER_COMPLETE_LIST = 600; - SERVER_MESSAGE = 1000; - SERVER_SHUTDOWN = 1001; - CONNECTION_CLOSED = 1002; - USER_MESSAGE = 1003; - LIST_ROOMS = 1004; - ADD_TO_LIST = 1005; - REMOVE_FROM_LIST = 1006; - USER_JOINED = 1007; - USER_LEFT = 1008; - GAME_JOINED = 1009; - NOTIFY_USER = 1010; - REPLAY_ADDED = 1100; - } - extensions 100 to max; + enum SessionEventType { + SERVER_IDENTIFICATION = 500; + SERVER_COMPLETE_LIST = 600; + SERVER_MESSAGE = 1000; + SERVER_SHUTDOWN = 1001; + CONNECTION_CLOSED = 1002; + USER_MESSAGE = 1003; + LIST_ROOMS = 1004; + ADD_TO_LIST = 1005; + REMOVE_FROM_LIST = 1006; + USER_JOINED = 1007; + USER_LEFT = 1008; + GAME_JOINED = 1009; + NOTIFY_USER = 1010; + REPLAY_ADDED = 1100; + } + extensions 100 to max; }