Update for dfhack 53.10-r1

dfhack-proto-srcs/build.rs

@@ -32,7 +32,7 @@ fn main() {
     let mut dfhack_archive = File::create(&dfhack_archive_path).unwrap();
     let dfhack_url = match std::env::var("DFHACK_ZIP_URL") {
         Ok(val) => val,
-        Err(_) => "https://codeload.github.com/DFHack/dfhack/zip/refs/tags/0.47.05-r4".to_string(),
+        Err(_) => "https://github.com/DFHack/dfhack/archive/refs/tags/53.10-r1.zip".to_string(),
     };
     let mut dfhack_download_request = reqwest::blocking::get(dfhack_url).unwrap();
     std::io::copy(&mut dfhack_download_request, &mut dfhack_archive).unwrap();

dfhack-proto-srcs/src/protos/AdventureControl.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package AdventureControl;
 

dfhack-proto-srcs/src/protos/Basic.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;

dfhack-proto-srcs/src/protos/BasicApi.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;

dfhack-proto-srcs/src/protos/CoreProtocol.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;

dfhack-proto-srcs/src/protos/DwarfControl.proto

@@ -1,5 +1,6 @@
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 syntax = "proto2";
+
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package DwarfControl;
 
 option optimize_for = LITE_RUNTIME;

dfhack-proto-srcs/src/protos/ItemdefInstrument.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package ItemdefInstrument;
 

dfhack-proto-srcs/src/protos/RemoteFortressReader.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package RemoteFortressReader;
 
@@ -139,7 +141,11 @@ enum BuildingDirection
     EAST = 1;
     SOUTH = 2;
     WEST = 3;
-    NONE = 4;
+    NORTHEAST = 4;
+    SOUTHEAST = 5;
+    SOUTHWEST = 6;
+    NORTHWEST = 7;
+    NONE = 8;
 }
 
 enum TileDigDesignation
@@ -524,6 +530,7 @@ message BlockRequest
     optional int32 max_y = 5;
     optional int32 min_z = 6;
     optional int32 max_z = 7;
+    optional bool force_reload = 8;
 }
 
 message BlockList
@@ -1108,10 +1115,13 @@ message FlowInfo
     optional Coord pos = 4;
     optional Coord dest = 5;
     optional bool expanding = 6;
-    optional bool reuse = 7;
+    optional bool reuse = 7 [deprecated=true];
     optional int32 guide_id = 8;
     optional MatPair material = 9;
     optional MatPair item = 10;
+    optional bool dead = 11;
+    optional bool fast = 12;
+    optional bool creeping = 13;
 }
 
 message Wave

dfhack-proto-srcs/src/protos/rename.proto → dfhack-proto-srcs/src/protos/example.proto

@@ -1,28 +1,27 @@
+syntax = "proto2";
+
 package dfproto;
 
 option optimize_for = LITE_RUNTIME;
 
-// Plugin: rename
+// Plugin: mypluginname
 
 // RPC RenameSquad : RenameSquadIn -> EmptyMessage
 message RenameSquadIn {
     required int32 squad_id = 1;
-
     optional string nickname = 2;
     optional string alias = 3;
 }
 
 // RPC RenameUnit : RenameUnitIn -> EmptyMessage
 message RenameUnitIn {
     required int32 unit_id = 1;
-
     optional string nickname = 2;
     optional string profession = 3;
 }
 
 // RPC RenameBuilding : RenameBuildingIn -> EmptyMessage
 message RenameBuildingIn {
     required int32 building_id = 1;
-
     optional string name = 2;
 }

dfhack-proto-srcs/src/protos/stockpiles.proto

@@ -1,16 +1,20 @@
+syntax = "proto2";
+
 package dfstockpiles;
 
 option optimize_for = LITE_RUNTIME;
 
 message StockpileSettings {
 
   message AnimalsSet {
+    optional bool all = 4;
     optional bool empty_cages = 1;
     optional bool empty_traps = 2;
     repeated string enabled = 3;
   }
 
   message FoodSet {
+    optional bool all = 21;
     repeated string meat = 1;
     repeated string fish = 2;
     repeated string unprepared_fish = 20;
@@ -34,6 +38,7 @@ message StockpileSettings {
   }
 
   message FurnitureSet {
+      optional bool all = 7;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
@@ -42,6 +47,7 @@ message StockpileSettings {
       // UNUSED: optional bool sand_bags = 6;
   }
   message RefuseSet {
+      optional bool all = 12;
       repeated string type = 1;
       repeated string corpses = 2;
       repeated string body_parts = 3;
@@ -55,44 +61,58 @@ message StockpileSettings {
       optional bool rotten_raw_hide = 11;
   }
   message StoneSet {
-    repeated string mats = 1;
+      optional bool all = 2;
+      repeated string mats = 1;
   }
   message OreSet {
-    repeated string mats = 1;
+      repeated string mats = 1;
   }
   message AmmoSet {
+      optional bool all = 6;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
       repeated string quality_core = 4;
       repeated string quality_total = 5;
   }
   message CoinSet {
+      optional bool all = 2;
       repeated string mats = 1;
   }
   message BarsBlocksSet {
+      optional bool all = 5;
       repeated string bars_other_mats = 1;
       repeated string blocks_other_mats = 2;
       repeated string bars_mats = 3;
       repeated string blocks_mats = 4;
   }
   message GemsSet {
+      optional bool all = 5;
       repeated string rough_other_mats = 1;
       repeated string cut_other_mats = 2;
       repeated string rough_mats = 3;
       repeated string cut_mats = 4;
   }
   message FinishedGoodsSet {
+      optional bool all = 6;
       repeated string type = 1;
       repeated string other_mats = 2;
       repeated string mats = 3;
       repeated string quality_core = 4;
       repeated string quality_total = 5;
+      optional bool dyed = 7;
+      optional bool undyed = 8;
+      repeated string color = 9;
   }
   message LeatherSet {
+      optional bool all = 2;
       repeated string mats = 1;
+      optional bool dyed = 3;
+      optional bool undyed = 4;
+      repeated string color = 5;
   }
   message ClothSet {
+      optional bool all = 9;
       repeated string thread_silk = 1;
       repeated string thread_plant = 2;
       repeated string thread_yarn = 3;
@@ -101,11 +121,16 @@ message StockpileSettings {
       repeated string cloth_plant = 6;
       repeated string cloth_yarn = 7;
       repeated string cloth_metal = 8;
+      optional bool dyed = 10;
+      optional bool undyed = 11;
+      repeated string color = 12;
   }
   message WoodSet {
+      optional bool all = 2;
       repeated string mats = 1;
   }
   message WeaponsSet {
+      optional bool all = 9;
       repeated string weapon_type = 1;
       repeated string trapcomp_type = 2;
       repeated string other_mats = 3;
@@ -115,8 +140,8 @@ message StockpileSettings {
       optional bool usable = 7;
       optional bool unusable = 8;
   }
-
   message ArmorSet {
+      optional bool all = 13;
       repeated string body = 1;
       repeated string head = 2;
       repeated string feet = 3;
@@ -127,33 +152,51 @@ message StockpileSettings {
       repeated string mats = 8;
       repeated string quality_core = 9;
       repeated string quality_total = 10;
-      optional bool usable =11;
+      optional bool usable = 11;
       optional bool unusable = 12;
+      optional bool dyed = 14;
+      optional bool undyed = 15;
+      repeated string color = 16;
+  }
+  message CorpsesSet {
+      optional bool all = 1;
+      repeated string corpses = 2;
+  }
+  message SheetSet {
+      optional bool all = 1;
+      repeated string paper = 2;
+      repeated string parchment = 3;
   }
 
+  // general settings
+  optional int32 max_barrels = 20;
+  optional int32 max_bins = 21;
+  optional int32 max_wheelbarrows = 22;
+  optional bool use_links_only = 23;
+  optional bool allow_organic = 18;
+  optional bool allow_inorganic = 19;
+
+  // categories
+  optional AmmoSet ammo = 8;
   optional AnimalsSet animals = 1;
+  optional ArmorSet  armor = 17;
+  optional BarsBlocksSet barsblocks = 10;
+  optional ClothSet cloth = 14;
+  optional CoinSet coin = 9;
+  optional FinishedGoodsSet finished_goods = 12;
   optional FoodSet food = 2;
   optional FurnitureSet furniture = 3;
-  optional int32 unknown1 = 4;
-  optional RefuseSet refuse = 5;
-  optional StoneSet stone = 6;
-  optional OreSet ore = 7;
-  optional AmmoSet ammo = 8;
-  optional CoinSet coin = 9;
-  optional BarsBlocksSet barsblocks = 10;
   optional GemsSet gems = 11;
-  optional FinishedGoodsSet finished_goods = 12;
   optional LeatherSet leather = 13;
-  optional ClothSet cloth = 14;
-  optional WoodSet wood = 15;
+  optional CorpsesSet corpses_v50 = 25;
+  optional RefuseSet refuse = 5;
+  optional SheetSet sheet = 26;
+  optional StoneSet stone = 6;
   optional WeaponsSet weapons = 16;
-  optional ArmorSet  armor = 17;
-  optional bool allow_organic = 18;
-  optional bool allow_inorganic = 19;
-  optional bool corpses = 24;
-  // extras
-  optional int32 max_barrels = 20;
-  optional int32 max_bins = 21;
-  optional int32 max_wheelbarrows = 22;
-  optional bool use_links_only = 23;
+  optional WoodSet wood = 15;
+
+  // deprecated
+  optional bool corpses = 24; // not marked as deprecated since we still read it
+  optional OreSet ore = 7 [deprecated=true];
+  optional int32 unknown1 = 4 [deprecated=true];
 }