[proto] update message names

src/common/proto/core.proto

@@ -3,21 +3,35 @@ syntax = "proto3";
 package ru.m.tankz.proto.core;
 
 
-message User {
+message UserProto {
     string uuid = 1;
     string name = 2;
 }
 
-enum GameState {
+enum GameStateProto {
     READY = 0;
     STARTED = 1;
     ENDED = 2;
 }
 
-message Game {
+message BrickProto {
+    string type = 1;
+}
+
+message EntityProto {
+    string type = 1;
+}
+
+message GameInfoProto {
     int32 id = 1;
     string type = 2;
-    User creator = 3;
-    repeated User players = 4;
-    GameState state = 5;
+    UserProto creator = 3;
+    repeated UserProto players = 4;
+    GameStateProto state = 5;
+}
+
+message GameProto {
+    GameInfoProto info = 1;
+    repeated BrickProto map = 2;
+    repeated EntityProto entities = 3;
 }

src/common/proto/game.proto

@@ -3,18 +3,13 @@ syntax = "proto3";
 package ru.m.tankz.proto.game;
 
 
-enum GameActionType {
+enum GameActionTypeProto {
     MOVE = 0;
     SHOT = 1;
     STOP = 2;
 }
 
-enum GameObjectType {
-    TANK = 0;
-    BULLET = 1;
-}
-
-enum GameChangeType {
+enum GameChangeTypeProto {
     MOVED = 0;
     DESTROED = 1;
     MODIFIED = 2;
@@ -22,12 +17,12 @@ enum GameChangeType {
     DIRECTION = 4;
 }
 
-message GameChange {
-    GameChangeType type = 1;
-    GameObjectType objectType = 2;
-    int32 objectId = 3;
+message GameChangeProto {
+    GameChangeTypeProto type = 1;
+    string entityType = 2;
+    int32 entityId = 3;
     float x = 4;
     float y = 5;
     int32 directionX = 6;
     int32 directionY = 7;
-}
+}

src/common/proto/pack.proto

@@ -18,7 +18,7 @@ message LoginRequest {
 }
 
 message LoginResponse {
-    ru.m.tankz.proto.core.User user = 1;
+    ru.m.tankz.proto.core.UserProto user = 1;
 }
 
 // Logout
@@ -30,7 +30,7 @@ message LogoutResponse {}
 message ListGameRequest {}
 
 message ListGameResponse {
-    repeated ru.m.tankz.proto.core.Game games = 1;
+    repeated ru.m.tankz.proto.core.GameInfoProto games = 1;
 }
 
 // Create Game
@@ -39,7 +39,7 @@ message CreateGameRequest {
 }
 
 message CreateGameResponse {
-    ru.m.tankz.proto.core.Game game = 1;
+    ru.m.tankz.proto.core.GameInfoProto game = 1;
 }
 
 // Join Game
@@ -48,32 +48,32 @@ message JoinGameRequest {
 }
 
 message JoinGameResponse {
-    ru.m.tankz.proto.core.Game game = 1;
+    ru.m.tankz.proto.core.GameInfoProto game = 1;
 }
 
 // Leave Game
 message LeaveGameRequest {}
 
 message LeaveGameResponse {
-    ru.m.tankz.proto.core.Game game = 1;
+    ru.m.tankz.proto.core.GameInfoProto game = 1;
 }
 
 // Start Game
 message StartGameRequest {}
 
 message StartGameResponse {
-    ru.m.tankz.proto.core.Game game = 1;
+    ru.m.tankz.proto.core.GameInfoProto game = 1;
 }
 
 // Game Update
 message GameUpdateRequest {
-    ru.m.tankz.proto.game.GameActionType type = 1;
+    ru.m.tankz.proto.game.GameActionTypeProto type = 1;
     int32 directionX = 2;
     int32 directionY = 3;
 }
 
 message GameUpdateResponse {
-    repeated ru.m.tankz.proto.game.GameChange changes = 1;
+    repeated ru.m.tankz.proto.game.GameChangeProto changes = 1;
 }
 
 // Request