Bring in changes from the remoteServerUnsafe branch.

develop
Japa 2017-12-17 18:05:38 +05:30
parent bbd823f5b0
commit 29282a238b
3 changed files with 2359 additions and 2259 deletions

@ -397,6 +397,9 @@ message UnitDefinition
repeated string noble_positions = 18;
optional int32 rider_id = 19;
repeated InventoryItem inventory = 20;
optional float subpos_x = 21;
optional float subpos_y = 22;
optional float subpos_z = 23;
}
message UnitList
@ -842,4 +845,25 @@ message ListRequest
{
optional int32 list_start = 1;
optional int32 list_end = 2;
}
}
message Report
{
optional int32 type = 1;
optional string text = 2;
optional ColorDefinition color = 3;
optional int32 duration = 4;
optional bool continuation = 5;
optional bool unconscious = 6;
optional bool announcement = 7;
optional int32 repeat_count = 8;
optional Coord pos = 9;
optional int32 id = 10;
optional int32 year = 11;
optional int32 time = 12;
}
message Status
{
repeated Report reports = 1;
}

@ -1,2 +1,2 @@
#pragma once
#define DF_VERSION_INT 43005
#define DF_VERSION_INT 44002

File diff suppressed because it is too large Load Diff