summaryrefslogtreecommitdiff
path: root/library/proto
diff options
context:
space:
mode:
authorRobert Heinrich2012-04-15 12:32:25 +0200
committerRobert Heinrich2012-04-15 12:32:25 +0200
commitcf0d45be785fad65457ae2ebaa8d890afad79953 (patch)
treeaa9d3e1e229dbdb8d88c28af7dcefead1fb9e333 /library/proto
parent9f95e67c7575cca9495062eb275ee99a590e41cb (diff)
downloaddfhack-cf0d45be785fad65457ae2ebaa8d890afad79953.tar.gz
dfhack-cf0d45be785fad65457ae2ebaa8d890afad79953.tar.bz2
dfhack-cf0d45be785fad65457ae2ebaa8d890afad79953.tar.xz
merged stuff from peterix
Diffstat (limited to 'library/proto')
-rwxr-xr-xlibrary/proto/Basic.proto15
-rwxr-xr-xlibrary/proto/BasicApi.proto7
2 files changed, 21 insertions, 1 deletions
diff --git a/library/proto/Basic.proto b/library/proto/Basic.proto
index 246fba22..c387bef0 100755
--- a/library/proto/Basic.proto
+++ b/library/proto/Basic.proto
@@ -130,6 +130,11 @@ message SkillInfo {
required int32 experience = 3;
};
+message UnitMiscTrait {
+ required int32 id = 1;
+ required int32 value = 2;
+};
+
message BasicUnitInfo {
required int32 unit_id = 1;
@@ -166,6 +171,9 @@ message BasicUnitInfo {
// IF mask.skills:
repeated SkillInfo skills = 12;
+ // IF mask.misc_traits:
+ repeated UnitMiscTrait misc_traits = 24;
+
optional UnitCurseInfo curse = 16;
repeated int32 burrows = 21;
@@ -175,6 +183,7 @@ message BasicUnitInfoMask {
optional bool labors = 1 [default = false];
optional bool skills = 2 [default = false];
optional bool profession = 3 [default = false];
+ optional bool misc_traits = 4 [default = false];
};
message BasicSquadInfo {
@@ -188,3 +197,9 @@ message BasicSquadInfo {
// Member histfig ids:
repeated sint32 members = 4;
};
+
+message UnitLaborState {
+ required int32 unit_id = 1;
+ required int32 labor = 2;
+ required bool value = 3;
+};
diff --git a/library/proto/BasicApi.proto b/library/proto/BasicApi.proto
index 3072f9ca..a5a07aa1 100755
--- a/library/proto/BasicApi.proto
+++ b/library/proto/BasicApi.proto
@@ -99,4 +99,9 @@ message ListUnitsOut {
message ListSquadsIn {}
message ListSquadsOut {
repeated BasicSquadInfo value = 1;
-}
+};
+
+// RPC SetUnitLabors : SetUnitLaborsIn -> EmptyMessage
+message SetUnitLaborsIn {
+ repeated UnitLaborState change = 1;
+};