Skip to content
GitLab
Commit fdea69cf authored by woogerboy21's avatar woogerboy21
Browse files

Merge pull request #1421 from woogerboy21/fix_proto_warnings 

Corrected proto warnings & spacing
parents 74533859 cfebd53d
Hide whitespace changes
Inline Side-by-side
common/pb/admin_commands.proto
View file @ fdea69cf
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;
}
common/pb/card_attributes.proto
View file @ fdea69cf
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;
}
common/pb/color.proto
View file @ fdea69cf
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
common/pb/command_attach_card.proto
View file @ fdea69cf
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];
}
common/pb/command_change_zone_properties.proto
View file @ fdea69cf
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;
}
common/pb/command_concede.proto
View file @ fdea69cf
syntax = "proto2";
import "game_commands.proto";
message Command_Concede {
extend GameCommand {
optional Command_Concede ext = 1017;
}
extend GameCommand {
optional Command_Concede ext = 1017;
}
}
common/pb/command_create_arrow.proto
View file @ fdea69cf
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;
}
common/pb/command_create_counter.proto
View file @ fdea69cf
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;
}
common/pb/command_create_token.proto
View file @ fdea69cf
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];
}
common/pb/command_deck_del.proto
View file @ fdea69cf
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];
}
common/pb/command_deck_del_dir.proto
View file @ fdea69cf
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;
}
common/pb/command_deck_download.proto
View file @ fdea69cf
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];
}
common/pb/command_deck_list.proto
View file @ fdea69cf
syntax = "proto2";
import "session_commands.proto";
message Command_DeckList {
extend SessionCommand {
optional Command_DeckList ext = 1008;
}
extend SessionCommand {
optional Command_DeckList ext = 1008;
}
}
common/pb/command_deck_new_dir.proto
View file @ fdea69cf
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
common/pb/command_deck_select.proto
View file @ fdea69cf
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];
}
common/pb/command_deck_upload.proto
View file @ fdea69cf
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;
}
common/pb/command_del_counter.proto
View file @ fdea69cf
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];
}
common/pb/command_delete_arrow.proto
View file @ fdea69cf
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];
}
common/pb/command_draw_cards.proto
View file @ fdea69cf
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;
}
common/pb/command_dump_zone.proto
View file @ fdea69cf
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;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment