summaryrefslogtreecommitdiff
path: root/library/proto
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-03-17 20:04:15 +0400
committerAlexander Gavrilov2012-03-17 20:04:15 +0400
commitaa63493bb81160e924382e617ac48431f1fba0c7 (patch)
tree7ab8e11aacb27e64466b6991adead9f6a1a62e24 /library/proto
parent3d80a1ee35be9dcff1e53f74e5be3581c0d42743 (diff)
downloaddfhack-aa63493bb81160e924382e617ac48431f1fba0c7.tar.gz
dfhack-aa63493bb81160e924382e617ac48431f1fba0c7.tar.bz2
dfhack-aa63493bb81160e924382e617ac48431f1fba0c7.tar.xz
Add a ListSquads request.
Diffstat (limited to 'library/proto')
-rw-r--r--library/proto/Basic.proto24
-rw-r--r--library/proto/BasicApi.proto17
2 files changed, 28 insertions, 13 deletions
diff --git a/library/proto/Basic.proto b/library/proto/Basic.proto
index 1a9a8f1b..6e58345f 100644
--- a/library/proto/Basic.proto
+++ b/library/proto/Basic.proto
@@ -52,10 +52,10 @@ message BasicMaterialInfoMask {
Pressed = 5;
};
repeated StateType states = 1;
+ optional int32 temperature = 4 [default = 10015];
optional bool flags = 2 [default = false];
optional bool reaction = 3 [default = false];
- optional int32 temperature = 4 [default = 10015];
};
message NameInfo {
@@ -68,6 +68,12 @@ message NameInfo {
optional string english_name = 5;
};
+message SkillInfo {
+ required int32 id = 1;
+ required int32 level = 2;
+ required int32 experience = 3;
+};
+
message BasicUnitInfo {
required int32 unit_id = 1;
@@ -86,12 +92,7 @@ message BasicUnitInfo {
repeated int32 labors = 11;
- message Skill {
- required int32 id = 1;
- required int32 level = 2;
- required int32 experience = 3;
- };
- repeated Skill skills = 12;
+ repeated SkillInfo skills = 12;
required int32 pos_x = 13;
required int32 pos_y = 14;
@@ -102,3 +103,12 @@ message BasicUnitInfoMask {
optional bool labors = 1 [default = false];
optional bool skills = 2 [default = false];
};
+
+message BasicSquadInfo {
+ required int32 squad_id = 1;
+
+ optional NameInfo name = 2;
+ optional string alias = 3;
+
+ repeated sint32 members = 4;
+};
diff --git a/library/proto/BasicApi.proto b/library/proto/BasicApi.proto
index ed1276fe..33f2a576 100644
--- a/library/proto/BasicApi.proto
+++ b/library/proto/BasicApi.proto
@@ -4,7 +4,7 @@ option optimize_for = LITE_RUNTIME;
import "Basic.proto";
-message ListEnumsRes {
+message ListEnumsOut {
repeated EnumItemName material_flags = 1;
repeated EnumItemName inorganic_flags = 2;
@@ -16,7 +16,7 @@ message ListEnumsRes {
repeated EnumItemName job_skill = 7;
};
-message ListMaterialsRq {
+message ListMaterialsIn {
optional BasicMaterialInfoMask mask = 1;
repeated BasicMaterialId id_list = 2;
optional bool builtin = 3;
@@ -24,17 +24,22 @@ message ListMaterialsRq {
optional bool creatures = 5;
optional bool plants = 6;
};
-message ListMaterialsRes {
+message ListMaterialsOut {
repeated BasicMaterialInfo value = 1;
};
-message ListUnitsRq {
+message ListUnitsIn {
optional BasicUnitInfoMask mask = 1;
repeated int32 id_list = 2;
optional int32 race = 3;
optional int32 civ_id = 4;
};
-message ListUnitsRes {
+message ListUnitsOut {
repeated BasicUnitInfo value = 1;
-}; \ No newline at end of file
+};
+
+message ListSquadsIn {}
+message ListSquadsOut {
+ repeated BasicSquadInfo value = 1;
+}