From ebd9a84b39c9b5e7004e4ba96b5c900c949e24e5 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 12 Jun 2024 07:10:28 -0700 Subject: refactor: move commands to command module --- Tupfile | 1 + app_init_command.proto | 9 ------ appear_actor_command.proto | 11 ------- buddy_list_notify_command.proto | 8 ----- buddy_list_update_command.proto | 8 ----- build/test.py | 2 +- channel_command.proto | 7 ----- commands/app_init_command.proto | 9 ++++++ commands/appear_actor_command.proto | 11 +++++++ commands/buddy_list_notify_command.proto | 8 +++++ commands/buddy_list_update_command.proto | 8 +++++ commands/channel_command.proto | 7 +++++ commands/disappear_actor_command.proto | 5 +++ commands/finger_reply_command.proto | 10 ++++++ commands/finger_request_command.proto | 7 +++++ commands/long_location_command.proto | 10 ++++++ commands/prop_command.proto | 9 ++++++ commands/prop_request_command.proto | 7 +++++ commands/property_set_command.proto | 10 ++++++ commands/property_update_command.proto | 9 ++++++ commands/redirect_command.proto | 12 +++++++ commands/redirect_id_command.proto | 13 ++++++++ commands/room_id_command.proto | 8 +++++ commands/room_id_request_command.proto | 7 +++++ commands/session_exit_command.proto | 9 ++++++ commands/session_init_command.proto | 9 ++++++ commands/short_location_command.proto | 9 ++++++ commands/subscribe_distance_command.proto | 8 +++++ commands/subscribe_room_command.proto | 11 +++++++ commands/teleport_command.proto | 13 ++++++++ commands/text_command.proto | 10 ++++++ commands/unsubscribe_room_command.proto | 7 +++++ commands/whisper_command.proto | 11 +++++++ disappear_actor_command.proto | 5 --- finger_reply_command.proto | 10 ------ finger_request_command.proto | 7 ----- long_location_command.proto | 10 ------ network_packet.proto | 52 +++++++++++++++---------------- prop_command.proto | 9 ------ prop_request_command.proto | 7 ----- property_set_command.proto | 10 ------ property_update_command.proto | 9 ------ redirect_command.proto | 12 ------- redirect_id_command.proto | 13 -------- room_id_command.proto | 8 ----- room_id_request_command.proto | 7 ----- session_exit_command.proto | 9 ------ session_init_command.proto | 9 ------ short_location_command.proto | 9 ------ subscribe_distance_command.proto | 8 ----- subscribe_room_command.proto | 11 ------- teleport_command.proto | 13 -------- text_command.proto | 10 ------ unsubscribe_room_command.proto | 7 ----- whisper_command.proto | 11 ------- 55 files changed, 265 insertions(+), 264 deletions(-) delete mode 100644 app_init_command.proto delete mode 100644 appear_actor_command.proto delete mode 100644 buddy_list_notify_command.proto delete mode 100644 buddy_list_update_command.proto delete mode 100644 channel_command.proto create mode 100644 commands/app_init_command.proto create mode 100644 commands/appear_actor_command.proto create mode 100644 commands/buddy_list_notify_command.proto create mode 100644 commands/buddy_list_update_command.proto create mode 100644 commands/channel_command.proto create mode 100644 commands/disappear_actor_command.proto create mode 100644 commands/finger_reply_command.proto create mode 100644 commands/finger_request_command.proto create mode 100644 commands/long_location_command.proto create mode 100644 commands/prop_command.proto create mode 100644 commands/prop_request_command.proto create mode 100644 commands/property_set_command.proto create mode 100644 commands/property_update_command.proto create mode 100644 commands/redirect_command.proto create mode 100644 commands/redirect_id_command.proto create mode 100644 commands/room_id_command.proto create mode 100644 commands/room_id_request_command.proto create mode 100644 commands/session_exit_command.proto create mode 100644 commands/session_init_command.proto create mode 100644 commands/short_location_command.proto create mode 100644 commands/subscribe_distance_command.proto create mode 100644 commands/subscribe_room_command.proto create mode 100644 commands/teleport_command.proto create mode 100644 commands/text_command.proto create mode 100644 commands/unsubscribe_room_command.proto create mode 100644 commands/whisper_command.proto delete mode 100644 disappear_actor_command.proto delete mode 100644 finger_reply_command.proto delete mode 100644 finger_request_command.proto delete mode 100644 long_location_command.proto delete mode 100644 prop_command.proto delete mode 100644 prop_request_command.proto delete mode 100644 property_set_command.proto delete mode 100644 property_update_command.proto delete mode 100644 redirect_command.proto delete mode 100644 redirect_id_command.proto delete mode 100644 room_id_command.proto delete mode 100644 room_id_request_command.proto delete mode 100644 session_exit_command.proto delete mode 100644 session_init_command.proto delete mode 100644 short_location_command.proto delete mode 100644 subscribe_distance_command.proto delete mode 100644 subscribe_room_command.proto delete mode 100644 teleport_command.proto delete mode 100644 text_command.proto delete mode 100644 unsubscribe_room_command.proto delete mode 100644 whisper_command.proto diff --git a/Tupfile b/Tupfile index eb2d3e4..fa3adec 100644 --- a/Tupfile +++ b/Tupfile @@ -1,3 +1,4 @@ BUILD_DIRECTORY = build : foreach ./*.proto |> protoc --python_out=$(BUILD_DIRECTORY) --proto_path=. -I. %f |> $(BUILD_DIRECTORY)/%B_pb2.py +: foreach ./commands/*.proto |> protoc --python_out=$(BUILD_DIRECTORY) --proto_path=. -I. %f |> $(BUILD_DIRECTORY)/commands/%B_pb2.py diff --git a/app_init_command.proto b/app_init_command.proto deleted file mode 100644 index d7feed5..0000000 --- a/app_init_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "network_property.proto"; - -message AppInitCommand { - repeated NetworkProperty property_list = 2; -} \ No newline at end of file diff --git a/appear_actor_command.proto b/appear_actor_command.proto deleted file mode 100644 index 718af2d..0000000 --- a/appear_actor_command.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message AppearActorCommand { - int32 room_id = 1; - int32 x = 2; - int32 y = 3; - int32 z = 4; - int32 direction = 5; -} diff --git a/buddy_list_notify_command.proto b/buddy_list_notify_command.proto deleted file mode 100644 index 34259ea..0000000 --- a/buddy_list_notify_command.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message BuddyListNotifyCommand { - string buddy_name = 1; - int32 logged_on = 2; -} diff --git a/buddy_list_update_command.proto b/buddy_list_update_command.proto deleted file mode 100644 index d422f55..0000000 --- a/buddy_list_update_command.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message BuddyListUpdateCommand { - string buddy = 1; - int32 add = 2; -} diff --git a/build/test.py b/build/test.py index cf4b869..cf2d28c 100644 --- a/build/test.py +++ b/build/test.py @@ -1,5 +1,5 @@ import network_packet_pb2 as network_packet -import buddy_list_notify_command_pb2 as buddy_list_notify_command +from commands import buddy_list_notify_command_pb2 as buddy_list_notify_command request = network_packet.NetworkPacket() diff --git a/channel_command.proto b/channel_command.proto deleted file mode 100644 index b76f984..0000000 --- a/channel_command.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message ChannelCommand { - string channel = 1; -} diff --git a/commands/app_init_command.proto b/commands/app_init_command.proto new file mode 100644 index 0000000..d7feed5 --- /dev/null +++ b/commands/app_init_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +import "network_property.proto"; + +message AppInitCommand { + repeated NetworkProperty property_list = 2; +} \ No newline at end of file diff --git a/commands/appear_actor_command.proto b/commands/appear_actor_command.proto new file mode 100644 index 0000000..718af2d --- /dev/null +++ b/commands/appear_actor_command.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package whirl; + +message AppearActorCommand { + int32 room_id = 1; + int32 x = 2; + int32 y = 3; + int32 z = 4; + int32 direction = 5; +} diff --git a/commands/buddy_list_notify_command.proto b/commands/buddy_list_notify_command.proto new file mode 100644 index 0000000..34259ea --- /dev/null +++ b/commands/buddy_list_notify_command.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package whirl; + +message BuddyListNotifyCommand { + string buddy_name = 1; + int32 logged_on = 2; +} diff --git a/commands/buddy_list_update_command.proto b/commands/buddy_list_update_command.proto new file mode 100644 index 0000000..d422f55 --- /dev/null +++ b/commands/buddy_list_update_command.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package whirl; + +message BuddyListUpdateCommand { + string buddy = 1; + int32 add = 2; +} diff --git a/commands/channel_command.proto b/commands/channel_command.proto new file mode 100644 index 0000000..b76f984 --- /dev/null +++ b/commands/channel_command.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package whirl; + +message ChannelCommand { + string channel = 1; +} diff --git a/commands/disappear_actor_command.proto b/commands/disappear_actor_command.proto new file mode 100644 index 0000000..fe7770a --- /dev/null +++ b/commands/disappear_actor_command.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +package whirl; + +message DisappearActorCommand {}; diff --git a/commands/finger_reply_command.proto b/commands/finger_reply_command.proto new file mode 100644 index 0000000..0821c32 --- /dev/null +++ b/commands/finger_reply_command.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package whirl; + +import "property_list.proto"; + +message FingerReplyCommand { + string user = 1; + PropertyList property_list = 2; +} diff --git a/commands/finger_request_command.proto b/commands/finger_request_command.proto new file mode 100644 index 0000000..4727e9c --- /dev/null +++ b/commands/finger_request_command.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package whirl; + +message FingerRequestCommand { + string user = 1; +} diff --git a/commands/long_location_command.proto b/commands/long_location_command.proto new file mode 100644 index 0000000..913dbd2 --- /dev/null +++ b/commands/long_location_command.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package whirl; + +message LongLocationCommand { + int32 x = 1; + int32 y = 2; + int32 z = 3; + int32 direction = 4; +} diff --git a/commands/prop_command.proto b/commands/prop_command.proto new file mode 100644 index 0000000..c847c92 --- /dev/null +++ b/commands/prop_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +import "old_property_list.proto"; + +message PropCommand { + OldPropertyList property_list = 1; +} \ No newline at end of file diff --git a/commands/prop_request_command.proto b/commands/prop_request_command.proto new file mode 100644 index 0000000..040bf4d --- /dev/null +++ b/commands/prop_request_command.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package whirl; + +message PropRequestCommand { + repeated int32 variable_ids = 1; +} diff --git a/commands/property_set_command.proto b/commands/property_set_command.proto new file mode 100644 index 0000000..df6b7bc --- /dev/null +++ b/commands/property_set_command.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package whirl; + +import "property_list.proto"; + +message PropertySetCommand { + string from_user = 1; + PropertyList property_list = 2; +} diff --git a/commands/property_update_command.proto b/commands/property_update_command.proto new file mode 100644 index 0000000..5259978 --- /dev/null +++ b/commands/property_update_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +import "property_list.proto"; + +message PropertyUpdateCommand { + PropertyList property_list = 1; +} diff --git a/commands/redirect_command.proto b/commands/redirect_command.proto new file mode 100644 index 0000000..7c1ce16 --- /dev/null +++ b/commands/redirect_command.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +package whirl; + +message RedirectCommand { + int32 room_number = 1; + int32 ip_1 = 2; + int32 ip_2 = 3; + int32 ip_3 = 4; + int32 ip_4 = 5; + int32 port = 6; +} diff --git a/commands/redirect_id_command.proto b/commands/redirect_id_command.proto new file mode 100644 index 0000000..023377d --- /dev/null +++ b/commands/redirect_id_command.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package whirl; + +message RedirectIDCommand { + string room_name = 1; + int32 room_number = 2; + int32 ip_1 = 3; + int32 ip_2 = 4; + int32 ip_3 = 5; + int32 ip_4 = 6; + int32 port = 7; +} diff --git a/commands/room_id_command.proto b/commands/room_id_command.proto new file mode 100644 index 0000000..237a96f --- /dev/null +++ b/commands/room_id_command.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package whirl; + +message RoomIDCommand { + string room_name = 1; + int32 room_number = 2; +} diff --git a/commands/room_id_request_command.proto b/commands/room_id_request_command.proto new file mode 100644 index 0000000..75f5d54 --- /dev/null +++ b/commands/room_id_request_command.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package whirl; + +message RoomIDRequestCommand { + string room_name = 1; +} diff --git a/commands/session_exit_command.proto b/commands/session_exit_command.proto new file mode 100644 index 0000000..9a5fc4f --- /dev/null +++ b/commands/session_exit_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +import "old_property_list.proto"; + +message SessionExitCommand { + OldPropertyList property_list = 1; +} diff --git a/commands/session_init_command.proto b/commands/session_init_command.proto new file mode 100644 index 0000000..42a3bdb --- /dev/null +++ b/commands/session_init_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +import "old_property_list.proto"; + +message SessionInitCommand { + OldPropertyList property_list = 1; +} diff --git a/commands/short_location_command.proto b/commands/short_location_command.proto new file mode 100644 index 0000000..2be8ac1 --- /dev/null +++ b/commands/short_location_command.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package whirl; + +message ShortLocationCommand { + int32 dx = 1; + int32 dy = 2; + int32 ddirection = 3; +} diff --git a/commands/subscribe_distance_command.proto b/commands/subscribe_distance_command.proto new file mode 100644 index 0000000..5881a2e --- /dev/null +++ b/commands/subscribe_distance_command.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package whirl; + +message SubscribeDistanceCommand { + int32 room_number = 1; + int32 distance = 2; +} diff --git a/commands/subscribe_room_command.proto b/commands/subscribe_room_command.proto new file mode 100644 index 0000000..9866e43 --- /dev/null +++ b/commands/subscribe_room_command.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package whirl; + +message SubscribeRoomCommand { + int32 room_number = 1; + int32 x = 2; + int32 y = 3; + int32 z = 4; + int32 distance = 5; +} diff --git a/commands/teleport_command.proto b/commands/teleport_command.proto new file mode 100644 index 0000000..d0c92b9 --- /dev/null +++ b/commands/teleport_command.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package whirl; + +message TeleportCommand { + int32 room_id = 1; + int32 exit_type = 2; + int32 entry_type = 3; + int32 x = 4; + int32 y = 5; + int32 z = 6; + int32 direction = 7; +} diff --git a/commands/text_command.proto b/commands/text_command.proto new file mode 100644 index 0000000..31c93d0 --- /dev/null +++ b/commands/text_command.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package whirl; + +import "object_id.proto"; + +message TextCommand { + ObjectID sender_id = 1; + string text = 2; +} diff --git a/commands/unsubscribe_room_command.proto b/commands/unsubscribe_room_command.proto new file mode 100644 index 0000000..a0bab2b --- /dev/null +++ b/commands/unsubscribe_room_command.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +package whirl; + +message UnsubscribeRoomCommand { + int32 room_number = 1; +} diff --git a/commands/whisper_command.proto b/commands/whisper_command.proto new file mode 100644 index 0000000..24ad47c --- /dev/null +++ b/commands/whisper_command.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package whirl; + +import "object_id.proto"; + +message WhisperCommand { + ObjectID sender_id = 1; + string text = 2; + ObjectID receiver_id = 3; +} diff --git a/disappear_actor_command.proto b/disappear_actor_command.proto deleted file mode 100644 index fe7770a..0000000 --- a/disappear_actor_command.proto +++ /dev/null @@ -1,5 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message DisappearActorCommand {}; diff --git a/finger_reply_command.proto b/finger_reply_command.proto deleted file mode 100644 index 0821c32..0000000 --- a/finger_reply_command.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "property_list.proto"; - -message FingerReplyCommand { - string user = 1; - PropertyList property_list = 2; -} diff --git a/finger_request_command.proto b/finger_request_command.proto deleted file mode 100644 index 4727e9c..0000000 --- a/finger_request_command.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message FingerRequestCommand { - string user = 1; -} diff --git a/long_location_command.proto b/long_location_command.proto deleted file mode 100644 index 913dbd2..0000000 --- a/long_location_command.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message LongLocationCommand { - int32 x = 1; - int32 y = 2; - int32 z = 3; - int32 direction = 4; -} diff --git a/network_packet.proto b/network_packet.proto index d58d303..29aeec1 100644 --- a/network_packet.proto +++ b/network_packet.proto @@ -2,32 +2,32 @@ syntax = "proto3"; package whirl; -import "appear_actor_command.proto"; -import "app_init_command.proto"; -import "prop_command.proto"; -import "buddy_list_notify_command.proto"; -import "buddy_list_update_command.proto"; -import "channel_command.proto"; -import "disappear_actor_command.proto"; -import "finger_reply_command.proto"; -import "finger_request_command.proto"; -import "long_location_command.proto"; -import "property_set_command.proto"; -import "property_update_command.proto"; -import "prop_request_command.proto"; -import "redirect_command.proto"; -import "redirect_id_command.proto"; -import "room_id_command.proto"; -import "room_id_request_command.proto"; -import "session_exit_command.proto"; -import "session_init_command.proto"; -import "short_location_command.proto"; -import "subscribe_distance_command.proto"; -import "subscribe_room_command.proto"; -import "teleport_command.proto"; -import "text_command.proto"; -import "unsubscribe_room_command.proto"; -import "whisper_command.proto"; +import "commands/appear_actor_command.proto"; +import "commands/app_init_command.proto"; +import "commands/prop_command.proto"; +import "commands/buddy_list_notify_command.proto"; +import "commands/buddy_list_update_command.proto"; +import "commands/channel_command.proto"; +import "commands/disappear_actor_command.proto"; +import "commands/finger_reply_command.proto"; +import "commands/finger_request_command.proto"; +import "commands/long_location_command.proto"; +import "commands/property_set_command.proto"; +import "commands/property_update_command.proto"; +import "commands/prop_request_command.proto"; +import "commands/redirect_command.proto"; +import "commands/redirect_id_command.proto"; +import "commands/room_id_command.proto"; +import "commands/room_id_request_command.proto"; +import "commands/session_exit_command.proto"; +import "commands/session_init_command.proto"; +import "commands/short_location_command.proto"; +import "commands/subscribe_distance_command.proto"; +import "commands/subscribe_room_command.proto"; +import "commands/teleport_command.proto"; +import "commands/text_command.proto"; +import "commands/unsubscribe_room_command.proto"; +import "commands/whisper_command.proto"; message NetworkPacket { uint32 length = 1; diff --git a/prop_command.proto b/prop_command.proto deleted file mode 100644 index c847c92..0000000 --- a/prop_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "old_property_list.proto"; - -message PropCommand { - OldPropertyList property_list = 1; -} \ No newline at end of file diff --git a/prop_request_command.proto b/prop_request_command.proto deleted file mode 100644 index 040bf4d..0000000 --- a/prop_request_command.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message PropRequestCommand { - repeated int32 variable_ids = 1; -} diff --git a/property_set_command.proto b/property_set_command.proto deleted file mode 100644 index df6b7bc..0000000 --- a/property_set_command.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "property_list.proto"; - -message PropertySetCommand { - string from_user = 1; - PropertyList property_list = 2; -} diff --git a/property_update_command.proto b/property_update_command.proto deleted file mode 100644 index 5259978..0000000 --- a/property_update_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "property_list.proto"; - -message PropertyUpdateCommand { - PropertyList property_list = 1; -} diff --git a/redirect_command.proto b/redirect_command.proto deleted file mode 100644 index 7c1ce16..0000000 --- a/redirect_command.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message RedirectCommand { - int32 room_number = 1; - int32 ip_1 = 2; - int32 ip_2 = 3; - int32 ip_3 = 4; - int32 ip_4 = 5; - int32 port = 6; -} diff --git a/redirect_id_command.proto b/redirect_id_command.proto deleted file mode 100644 index 023377d..0000000 --- a/redirect_id_command.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message RedirectIDCommand { - string room_name = 1; - int32 room_number = 2; - int32 ip_1 = 3; - int32 ip_2 = 4; - int32 ip_3 = 5; - int32 ip_4 = 6; - int32 port = 7; -} diff --git a/room_id_command.proto b/room_id_command.proto deleted file mode 100644 index 237a96f..0000000 --- a/room_id_command.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message RoomIDCommand { - string room_name = 1; - int32 room_number = 2; -} diff --git a/room_id_request_command.proto b/room_id_request_command.proto deleted file mode 100644 index 75f5d54..0000000 --- a/room_id_request_command.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message RoomIDRequestCommand { - string room_name = 1; -} diff --git a/session_exit_command.proto b/session_exit_command.proto deleted file mode 100644 index 9a5fc4f..0000000 --- a/session_exit_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "old_property_list.proto"; - -message SessionExitCommand { - OldPropertyList property_list = 1; -} diff --git a/session_init_command.proto b/session_init_command.proto deleted file mode 100644 index 42a3bdb..0000000 --- a/session_init_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "old_property_list.proto"; - -message SessionInitCommand { - OldPropertyList property_list = 1; -} diff --git a/short_location_command.proto b/short_location_command.proto deleted file mode 100644 index 2be8ac1..0000000 --- a/short_location_command.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message ShortLocationCommand { - int32 dx = 1; - int32 dy = 2; - int32 ddirection = 3; -} diff --git a/subscribe_distance_command.proto b/subscribe_distance_command.proto deleted file mode 100644 index 5881a2e..0000000 --- a/subscribe_distance_command.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message SubscribeDistanceCommand { - int32 room_number = 1; - int32 distance = 2; -} diff --git a/subscribe_room_command.proto b/subscribe_room_command.proto deleted file mode 100644 index 9866e43..0000000 --- a/subscribe_room_command.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message SubscribeRoomCommand { - int32 room_number = 1; - int32 x = 2; - int32 y = 3; - int32 z = 4; - int32 distance = 5; -} diff --git a/teleport_command.proto b/teleport_command.proto deleted file mode 100644 index d0c92b9..0000000 --- a/teleport_command.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message TeleportCommand { - int32 room_id = 1; - int32 exit_type = 2; - int32 entry_type = 3; - int32 x = 4; - int32 y = 5; - int32 z = 6; - int32 direction = 7; -} diff --git a/text_command.proto b/text_command.proto deleted file mode 100644 index 31c93d0..0000000 --- a/text_command.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "object_id.proto"; - -message TextCommand { - ObjectID sender_id = 1; - string text = 2; -} diff --git a/unsubscribe_room_command.proto b/unsubscribe_room_command.proto deleted file mode 100644 index a0bab2b..0000000 --- a/unsubscribe_room_command.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto3"; - -package whirl; - -message UnsubscribeRoomCommand { - int32 room_number = 1; -} diff --git a/whisper_command.proto b/whisper_command.proto deleted file mode 100644 index 24ad47c..0000000 --- a/whisper_command.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -package whirl; - -import "object_id.proto"; - -message WhisperCommand { - ObjectID sender_id = 1; - string text = 2; - ObjectID receiver_id = 3; -} -- cgit v1.2.3