summaryrefslogtreecommitdiff
path: root/library/proto
diff options
context:
space:
mode:
authorWill Rogers2012-04-04 11:53:47 -0400
committerWill Rogers2012-04-04 11:53:47 -0400
commit1b6f5f3f343d572be72a58ce49a11818986c52a4 (patch)
tree729cc365f58c616a60935bc4228bf15af33a3c8f /library/proto
parent7e896277ec4076c0c441d9b3cda766493eb82d15 (diff)
downloaddfhack-1b6f5f3f343d572be72a58ce49a11818986c52a4.tar.gz
dfhack-1b6f5f3f343d572be72a58ce49a11818986c52a4.tar.bz2
dfhack-1b6f5f3f343d572be72a58ce49a11818986c52a4.tar.xz
Add additional related data to ListJobSkills.
Add the attributes for profession and unit_labor, and (re)name the protobuf messages JobSkillAttr, ProfessionAttr, and UnitLaborAttr to better reflect their content and distinguish them from e.g. the SkillInfo message included in BasicUnitInfo.
Diffstat (limited to 'library/proto')
-rwxr-xr-xlibrary/proto/Basic.proto31
-rwxr-xr-x[-rw-r--r--]library/proto/BasicApi.proto4
2 files changed, 28 insertions, 7 deletions
diff --git a/library/proto/Basic.proto b/library/proto/Basic.proto
index 1d22ea11..246fba22 100755
--- a/library/proto/Basic.proto
+++ b/library/proto/Basic.proto
@@ -69,15 +69,34 @@ message BasicMaterialInfoMask {
optional bool reaction = 3 [default = false];
};
-message JobSkillInfo {
+message JobSkillAttr {
required int32 id = 1;
+ required string key = 2;
- optional string caption = 2;
- optional string caption_noun = 3;
+ optional string caption = 3;
+ optional string caption_noun = 4;
- optional int32 profession = 4;
- optional int32 labor = 5;
- optional int32 type = 6;
+ optional int32 profession = 5;
+ optional int32 labor = 6;
+ optional string type = 7;
+};
+
+message ProfessionAttr {
+ required int32 id = 1;
+ required string key = 2;
+
+ optional string caption = 3;
+ optional bool military = 4;
+ optional bool can_assign_labor = 5;
+
+ optional int32 parent = 6;
+};
+
+message UnitLaborAttr {
+ required int32 id = 1;
+ required string key = 2;
+
+ optional string caption = 3;
};
message NameInfo {
diff --git a/library/proto/BasicApi.proto b/library/proto/BasicApi.proto
index bfbb076f..3072f9ca 100644..100755
--- a/library/proto/BasicApi.proto
+++ b/library/proto/BasicApi.proto
@@ -53,7 +53,9 @@ message ListEnumsOut {
// RPC ListJobSkills : EmptyMessage -> ListJobSkillsOut
message ListJobSkillsOut {
- repeated JobSkillInfo value = 1;
+ repeated JobSkillAttr skill = 1;
+ repeated ProfessionAttr profession = 2;
+ repeated UnitLaborAttr labor = 3;
};
// RPC ListMaterials : ListMaterialsIn -> ListMaterialsOut