From 108702b0195eeff1e353a8c457eef1d2629475e7 Mon Sep 17 00:00:00 2001 From: plule <630159+plule@users.noreply.github.com> Date: Mon, 16 Feb 2026 08:56:12 +0100 Subject: [PATCH] Update for dfhack 53.10-r1 --- dfhack-proto-srcs/build.rs | 2 +- .../src/protos/AdventureControl.proto | 2 + dfhack-proto-srcs/src/protos/Basic.proto | 2 + dfhack-proto-srcs/src/protos/BasicApi.proto | 2 + .../src/protos/CoreProtocol.proto | 2 + .../src/protos/DwarfControl.proto | 3 +- .../src/protos/ItemdefInstrument.proto | 2 + .../src/protos/RemoteFortressReader.proto | 14 +- .../protos/{rename.proto => example.proto} | 7 +- .../src/protos/isoworldremote.proto | 81 - dfhack-proto-srcs/src/protos/stockpiles.proto | 89 +- .../src/protos/ui_sidebar_mode.proto | 2 + .../messages/RemoteFortressReader.rs | 527 ++-- .../messages/{rename.rs => example.rs} | 6 +- .../src/generated/messages/isoworldremote.rs | 1982 --------------- dfhack-proto/src/generated/messages/mod.rs | 6 +- .../src/generated/messages/stockpiles.rs | 2226 +++++++++++++---- dfhack-proto/src/generated/stubs/mod.rs | 115 +- 18 files changed, 2247 insertions(+), 2823 deletions(-) rename dfhack-proto-srcs/src/protos/{rename.proto => example.proto} (92%) delete mode 100644 dfhack-proto-srcs/src/protos/isoworldremote.proto rename dfhack-proto/src/generated/messages/{rename.rs => example.rs} (99%) delete mode 100644 dfhack-proto/src/generated/messages/isoworldremote.rs diff --git a/dfhack-proto-srcs/build.rs b/dfhack-proto-srcs/build.rs index 210ead0..3763349 100644 --- a/dfhack-proto-srcs/build.rs +++ b/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(); diff --git a/dfhack-proto-srcs/src/protos/AdventureControl.proto b/dfhack-proto-srcs/src/protos/AdventureControl.proto index 840576c..6fc6020 100644 --- a/dfhack-proto-srcs/src/protos/AdventureControl.proto +++ b/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; diff --git a/dfhack-proto-srcs/src/protos/Basic.proto b/dfhack-proto-srcs/src/protos/Basic.proto index c387bef..f4ca826 100644 --- a/dfhack-proto-srcs/src/protos/Basic.proto +++ b/dfhack-proto-srcs/src/protos/Basic.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + package dfproto; option optimize_for = LITE_RUNTIME; diff --git a/dfhack-proto-srcs/src/protos/BasicApi.proto b/dfhack-proto-srcs/src/protos/BasicApi.proto index a5a07aa..3c0fb1a 100644 --- a/dfhack-proto-srcs/src/protos/BasicApi.proto +++ b/dfhack-proto-srcs/src/protos/BasicApi.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + package dfproto; option optimize_for = LITE_RUNTIME; diff --git a/dfhack-proto-srcs/src/protos/CoreProtocol.proto b/dfhack-proto-srcs/src/protos/CoreProtocol.proto index e530788..b2f7d2b 100644 --- a/dfhack-proto-srcs/src/protos/CoreProtocol.proto +++ b/dfhack-proto-srcs/src/protos/CoreProtocol.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + package dfproto; option optimize_for = LITE_RUNTIME; diff --git a/dfhack-proto-srcs/src/protos/DwarfControl.proto b/dfhack-proto-srcs/src/protos/DwarfControl.proto index ee750f8..2babc99 100644 --- a/dfhack-proto-srcs/src/protos/DwarfControl.proto +++ b/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; diff --git a/dfhack-proto-srcs/src/protos/ItemdefInstrument.proto b/dfhack-proto-srcs/src/protos/ItemdefInstrument.proto index 0b64eb6..45c35f6 100644 --- a/dfhack-proto-srcs/src/protos/ItemdefInstrument.proto +++ b/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; diff --git a/dfhack-proto-srcs/src/protos/RemoteFortressReader.proto b/dfhack-proto-srcs/src/protos/RemoteFortressReader.proto index dd98015..43f5f58 100644 --- a/dfhack-proto-srcs/src/protos/RemoteFortressReader.proto +++ b/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 diff --git a/dfhack-proto-srcs/src/protos/rename.proto b/dfhack-proto-srcs/src/protos/example.proto similarity index 92% rename from dfhack-proto-srcs/src/protos/rename.proto rename to dfhack-proto-srcs/src/protos/example.proto index d6059a6..d3f8318 100644 --- a/dfhack-proto-srcs/src/protos/rename.proto +++ b/dfhack-proto-srcs/src/protos/example.proto @@ -1,13 +1,14 @@ +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; } @@ -15,7 +16,6 @@ message RenameSquadIn { // RPC RenameUnit : RenameUnitIn -> EmptyMessage message RenameUnitIn { required int32 unit_id = 1; - optional string nickname = 2; optional string profession = 3; } @@ -23,6 +23,5 @@ message RenameUnitIn { // RPC RenameBuilding : RenameBuildingIn -> EmptyMessage message RenameBuildingIn { required int32 building_id = 1; - optional string name = 2; } diff --git a/dfhack-proto-srcs/src/protos/isoworldremote.proto b/dfhack-proto-srcs/src/protos/isoworldremote.proto deleted file mode 100644 index c972e98..0000000 --- a/dfhack-proto-srcs/src/protos/isoworldremote.proto +++ /dev/null @@ -1,81 +0,0 @@ -//Describes a very basic material structure for the map embark -package isoworldremote; - -option optimize_for = LITE_RUNTIME; - -// Plugin: isoworldremote - -enum BasicMaterial { - AIR = 0; - OTHER = 1; - INORGANIC = 2; - LIQUID = 3; - PLANT = 4; - WOOD = 5; -}; - -enum LiquidType { - ICE = 0; - WATER = 1; - MAGMA = 2; -} - -enum BasicShape { - NONE = 0; - OPEN = 1; - WALL = 3; - FLOOR = 4; - RAMP_UP = 5; - RAMP_DOWN = 6; -} - -message ColorDefinition { - required int32 red = 1; - required int32 green = 2; - required int32 blue = 3; -} - -message EmbarkTileLayer { - repeated BasicMaterial mat_type_table = 4 [packed=true]; - repeated int32 mat_subtype_table = 5 [packed=true]; - repeated BasicShape tile_shape_table = 6 [packed=true]; - repeated ColorDefinition tile_color_table = 7; -} - -message EmbarkTile { - required int32 world_x = 1; - required int32 world_y = 2; - required sint32 world_z = 3; - repeated EmbarkTileLayer tile_layer = 4; - optional int32 current_year = 5; - optional int32 current_season = 6; - optional bool is_valid = 7; -} - -// RPC GetEmbarkTile : TileRequest -> EmbarkTile -message TileRequest { - optional int32 want_x = 1; - optional int32 want_y = 2; -} - -message MapRequest { - optional string save_folder = 1; -} - -// RPC GetEmbarkInfo : MapRequest -> MapReply -message MapReply { - required bool available = 1; - optional int32 region_x = 2; - optional int32 region_y = 3; - optional int32 region_size_x = 4; - optional int32 region_size_y = 5; - optional int32 current_year = 6; - optional int32 current_season = 7; -} - -// RPC GetRawNames : MapRequest -> RawNames -message RawNames { - required bool available = 1; - repeated string inorganic = 2; - repeated string organic = 3; -} diff --git a/dfhack-proto-srcs/src/protos/stockpiles.proto b/dfhack-proto-srcs/src/protos/stockpiles.proto index 5868586..49a6d1c 100644 --- a/dfhack-proto-srcs/src/protos/stockpiles.proto +++ b/dfhack-proto-srcs/src/protos/stockpiles.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + package dfstockpiles; option optimize_for = LITE_RUNTIME; @@ -5,12 +7,14 @@ 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,12 +61,14 @@ 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; @@ -68,31 +76,43 @@ message StockpileSettings { 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]; } diff --git a/dfhack-proto-srcs/src/protos/ui_sidebar_mode.proto b/dfhack-proto-srcs/src/protos/ui_sidebar_mode.proto index af9dbab..df81d6b 100644 --- a/dfhack-proto-srcs/src/protos/ui_sidebar_mode.proto +++ b/dfhack-proto-srcs/src/protos/ui_sidebar_mode.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + //Attempts to provide a complete framework for reading everything from a fortress needed for vizualization package proto.enums.ui_sidebar_mode; diff --git a/dfhack-proto/src/generated/messages/RemoteFortressReader.rs b/dfhack-proto/src/generated/messages/RemoteFortressReader.rs index 441fca0..5622b08 100644 --- a/dfhack-proto/src/generated/messages/RemoteFortressReader.rs +++ b/dfhack-proto/src/generated/messages/RemoteFortressReader.rs @@ -5320,7 +5320,7 @@ pub struct MaterialDefinition { // @@protoc_insertion_point(field:RemoteFortressReader.MaterialDefinition.id) pub id: ::std::option::Option<::std::string::String>, // @@protoc_insertion_point(field:RemoteFortressReader.MaterialDefinition.name) - pub name: ::std::option::Option<::std::vec::Vec>, + pub name: ::std::option::Option<::std::string::String>, // @@protoc_insertion_point(field:RemoteFortressReader.MaterialDefinition.state_color) pub state_color: ::protobuf::MessageField, // @@protoc_insertion_point(field:RemoteFortressReader.MaterialDefinition.instrument) @@ -5383,12 +5383,12 @@ impl MaterialDefinition { self.id.take().unwrap_or_else(|| ::std::string::String::new()) } - // optional bytes name = 3; + // optional string name = 3; - pub fn name(&self) -> &[u8] { + pub fn name(&self) -> &str { match self.name.as_ref() { Some(v) => v, - None => &[], + None => "", } } @@ -5401,22 +5401,22 @@ impl MaterialDefinition { } // Param is passed by value, moved - pub fn set_name(&mut self, v: ::std::vec::Vec) { + pub fn set_name(&mut self, v: ::std::string::String) { self.name = ::std::option::Option::Some(v); } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_name(&mut self) -> &mut ::std::vec::Vec { + pub fn mut_name(&mut self) -> &mut ::std::string::String { if self.name.is_none() { - self.name = ::std::option::Option::Some(::std::vec::Vec::new()); + self.name = ::std::option::Option::Some(::std::string::String::new()); } self.name.as_mut().unwrap() } // Take field - pub fn take_name(&mut self) -> ::std::vec::Vec { - self.name.take().unwrap_or_else(|| ::std::vec::Vec::new()) + pub fn take_name(&mut self) -> ::std::string::String { + self.name.take().unwrap_or_else(|| ::std::string::String::new()) } // optional int32 up_step = 6; @@ -5565,7 +5565,7 @@ impl ::protobuf::Message for MaterialDefinition { self.id = ::std::option::Option::Some(is.read_string()?); }, 26 => { - self.name = ::std::option::Option::Some(is.read_bytes()?); + self.name = ::std::option::Option::Some(is.read_string()?); }, 34 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.state_color)?; @@ -5602,7 +5602,7 @@ impl ::protobuf::Message for MaterialDefinition { my_size += ::protobuf::rt::string_size(2, &v); } if let Some(v) = self.name.as_ref() { - my_size += ::protobuf::rt::bytes_size(3, &v); + my_size += ::protobuf::rt::string_size(3, &v); } if let Some(v) = self.state_color.as_ref() { let len = v.compute_size(); @@ -5634,7 +5634,7 @@ impl ::protobuf::Message for MaterialDefinition { os.write_string(2, v)?; } if let Some(v) = self.name.as_ref() { - os.write_bytes(3, v)?; + os.write_string(3, v)?; } if let Some(v) = self.state_color.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(4, v, os)?; @@ -8974,6 +8974,8 @@ pub struct BlockRequest { pub min_z: ::std::option::Option, // @@protoc_insertion_point(field:RemoteFortressReader.BlockRequest.max_z) pub max_z: ::std::option::Option, + // @@protoc_insertion_point(field:RemoteFortressReader.BlockRequest.force_reload) + pub force_reload: ::std::option::Option, // special fields // @@protoc_insertion_point(special_field:RemoteFortressReader.BlockRequest.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -9123,8 +9125,27 @@ impl BlockRequest { self.max_z = ::std::option::Option::Some(v); } + // optional bool force_reload = 8; + + pub fn force_reload(&self) -> bool { + self.force_reload.unwrap_or(false) + } + + pub fn clear_force_reload(&mut self) { + self.force_reload = ::std::option::Option::None; + } + + pub fn has_force_reload(&self) -> bool { + self.force_reload.is_some() + } + + // Param is passed by value, moved + pub fn set_force_reload(&mut self, v: bool) { + self.force_reload = ::std::option::Option::Some(v); + } + fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(7); + let mut fields = ::std::vec::Vec::with_capacity(8); let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "blocks_needed", @@ -9161,6 +9182,11 @@ impl BlockRequest { |m: &BlockRequest| { &m.max_z }, |m: &mut BlockRequest| { &mut m.max_z }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "force_reload", + |m: &BlockRequest| { &m.force_reload }, + |m: &mut BlockRequest| { &mut m.force_reload }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "BlockRequest", fields, @@ -9200,6 +9226,9 @@ impl ::protobuf::Message for BlockRequest { 56 => { self.max_z = ::std::option::Option::Some(is.read_int32()?); }, + 64 => { + self.force_reload = ::std::option::Option::Some(is.read_bool()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -9233,6 +9262,9 @@ impl ::protobuf::Message for BlockRequest { if let Some(v) = self.max_z { my_size += ::protobuf::rt::int32_size(7, v); } + if let Some(v) = self.force_reload { + my_size += 1 + 1; + } my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size @@ -9260,6 +9292,9 @@ impl ::protobuf::Message for BlockRequest { if let Some(v) = self.max_z { os.write_int32(7, v)?; } + if let Some(v) = self.force_reload { + os.write_bool(8, v)?; + } os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -9284,6 +9319,7 @@ impl ::protobuf::Message for BlockRequest { self.max_y = ::std::option::Option::None; self.min_z = ::std::option::Option::None; self.max_z = ::std::option::Option::None; + self.force_reload = ::std::option::Option::None; self.special_fields.clear(); } @@ -9296,6 +9332,7 @@ impl ::protobuf::Message for BlockRequest { max_y: ::std::option::Option::None, min_z: ::std::option::Option::None, max_z: ::std::option::Option::None, + force_reload: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -11233,7 +11270,7 @@ pub struct WorldMap { // @@protoc_insertion_point(field:RemoteFortressReader.WorldMap.world_height) pub world_height: ::std::option::Option, // @@protoc_insertion_point(field:RemoteFortressReader.WorldMap.name) - pub name: ::std::option::Option<::std::vec::Vec>, + pub name: ::std::option::Option<::std::string::String>, // @@protoc_insertion_point(field:RemoteFortressReader.WorldMap.name_english) pub name_english: ::std::option::Option<::std::string::String>, // @@protoc_insertion_point(field:RemoteFortressReader.WorldMap.elevation) @@ -11332,12 +11369,12 @@ impl WorldMap { self.world_height = ::std::option::Option::Some(v); } - // optional bytes name = 3; + // optional string name = 3; - pub fn name(&self) -> &[u8] { + pub fn name(&self) -> &str { match self.name.as_ref() { Some(v) => v, - None => &[], + None => "", } } @@ -11350,22 +11387,22 @@ impl WorldMap { } // Param is passed by value, moved - pub fn set_name(&mut self, v: ::std::vec::Vec) { + pub fn set_name(&mut self, v: ::std::string::String) { self.name = ::std::option::Option::Some(v); } // Mutable pointer to the field. // If field is not initialized, it is initialized with default value first. - pub fn mut_name(&mut self) -> &mut ::std::vec::Vec { + pub fn mut_name(&mut self) -> &mut ::std::string::String { if self.name.is_none() { - self.name = ::std::option::Option::Some(::std::vec::Vec::new()); + self.name = ::std::option::Option::Some(::std::string::String::new()); } self.name.as_mut().unwrap() } // Take field - pub fn take_name(&mut self) -> ::std::vec::Vec { - self.name.take().unwrap_or_else(|| ::std::vec::Vec::new()) + pub fn take_name(&mut self) -> ::std::string::String { + self.name.take().unwrap_or_else(|| ::std::string::String::new()) } // optional string name_english = 4; @@ -11733,7 +11770,7 @@ impl ::protobuf::Message for WorldMap { self.world_height = ::std::option::Option::Some(is.read_int32()?); }, 26 => { - self.name = ::std::option::Option::Some(is.read_bytes()?); + self.name = ::std::option::Option::Some(is.read_string()?); }, 34 => { self.name_english = ::std::option::Option::Some(is.read_string()?); @@ -11850,7 +11887,7 @@ impl ::protobuf::Message for WorldMap { my_size += ::protobuf::rt::int32_size(2, v); } if let Some(v) = self.name.as_ref() { - my_size += ::protobuf::rt::bytes_size(3, &v); + my_size += ::protobuf::rt::string_size(3, &v); } if let Some(v) = self.name_english.as_ref() { my_size += ::protobuf::rt::string_size(4, &v); @@ -11934,7 +11971,7 @@ impl ::protobuf::Message for WorldMap { os.write_int32(2, v)?; } if let Some(v) = self.name.as_ref() { - os.write_bytes(3, v)?; + os.write_string(3, v)?; } if let Some(v) = self.name_english.as_ref() { os.write_string(4, v)?; @@ -23310,6 +23347,12 @@ pub struct FlowInfo { pub material: ::protobuf::MessageField, // @@protoc_insertion_point(field:RemoteFortressReader.FlowInfo.item) pub item: ::protobuf::MessageField, + // @@protoc_insertion_point(field:RemoteFortressReader.FlowInfo.dead) + pub dead: ::std::option::Option, + // @@protoc_insertion_point(field:RemoteFortressReader.FlowInfo.fast) + pub fast: ::std::option::Option, + // @@protoc_insertion_point(field:RemoteFortressReader.FlowInfo.creeping) + pub creeping: ::std::option::Option, // special fields // @@protoc_insertion_point(special_field:RemoteFortressReader.FlowInfo.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -23443,8 +23486,65 @@ impl FlowInfo { self.guide_id = ::std::option::Option::Some(v); } + // optional bool dead = 11; + + pub fn dead(&self) -> bool { + self.dead.unwrap_or(false) + } + + pub fn clear_dead(&mut self) { + self.dead = ::std::option::Option::None; + } + + pub fn has_dead(&self) -> bool { + self.dead.is_some() + } + + // Param is passed by value, moved + pub fn set_dead(&mut self, v: bool) { + self.dead = ::std::option::Option::Some(v); + } + + // optional bool fast = 12; + + pub fn fast(&self) -> bool { + self.fast.unwrap_or(false) + } + + pub fn clear_fast(&mut self) { + self.fast = ::std::option::Option::None; + } + + pub fn has_fast(&self) -> bool { + self.fast.is_some() + } + + // Param is passed by value, moved + pub fn set_fast(&mut self, v: bool) { + self.fast = ::std::option::Option::Some(v); + } + + // optional bool creeping = 13; + + pub fn creeping(&self) -> bool { + self.creeping.unwrap_or(false) + } + + pub fn clear_creeping(&mut self) { + self.creeping = ::std::option::Option::None; + } + + pub fn has_creeping(&self) -> bool { + self.creeping.is_some() + } + + // Param is passed by value, moved + pub fn set_creeping(&mut self, v: bool) { + self.creeping = ::std::option::Option::Some(v); + } + fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(10); + let mut fields = ::std::vec::Vec::with_capacity(13); let mut oneofs = ::std::vec::Vec::with_capacity(0); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "index", @@ -23496,6 +23596,21 @@ impl FlowInfo { |m: &FlowInfo| { &m.item }, |m: &mut FlowInfo| { &mut m.item }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "dead", + |m: &FlowInfo| { &m.dead }, + |m: &mut FlowInfo| { &mut m.dead }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "fast", + |m: &FlowInfo| { &m.fast }, + |m: &mut FlowInfo| { &mut m.fast }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "creeping", + |m: &FlowInfo| { &m.creeping }, + |m: &mut FlowInfo| { &mut m.creeping }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "FlowInfo", fields, @@ -23564,6 +23679,15 @@ impl ::protobuf::Message for FlowInfo { 82 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.item)?; }, + 88 => { + self.dead = ::std::option::Option::Some(is.read_bool()?); + }, + 96 => { + self.fast = ::std::option::Option::Some(is.read_bool()?); + }, + 104 => { + self.creeping = ::std::option::Option::Some(is.read_bool()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -23610,6 +23734,15 @@ impl ::protobuf::Message for FlowInfo { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } + if let Some(v) = self.dead { + my_size += 1 + 1; + } + if let Some(v) = self.fast { + my_size += 1 + 1; + } + if let Some(v) = self.creeping { + my_size += 1 + 1; + } my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size @@ -23646,6 +23779,15 @@ impl ::protobuf::Message for FlowInfo { if let Some(v) = self.item.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(10, v, os)?; } + if let Some(v) = self.dead { + os.write_bool(11, v)?; + } + if let Some(v) = self.fast { + os.write_bool(12, v)?; + } + if let Some(v) = self.creeping { + os.write_bool(13, v)?; + } os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -23673,6 +23815,9 @@ impl ::protobuf::Message for FlowInfo { self.guide_id = ::std::option::Option::None; self.material.clear(); self.item.clear(); + self.dead = ::std::option::Option::None; + self.fast = ::std::option::Option::None; + self.creeping = ::std::option::Option::None; self.special_fields.clear(); } @@ -23688,6 +23833,9 @@ impl ::protobuf::Message for FlowInfo { guide_id: ::std::option::Option::None, material: ::protobuf::MessageField::none(), item: ::protobuf::MessageField::none(), + dead: ::std::option::Option::None, + fast: ::std::option::Option::None, + creeping: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -24548,8 +24696,16 @@ pub enum BuildingDirection { SOUTH = 2, // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.WEST) WEST = 3, + // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.NORTHEAST) + NORTHEAST = 4, + // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.SOUTHEAST) + SOUTHEAST = 5, + // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.SOUTHWEST) + SOUTHWEST = 6, + // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.NORTHWEST) + NORTHWEST = 7, // @@protoc_insertion_point(enum_value:RemoteFortressReader.BuildingDirection.NONE) - NONE = 4, + NONE = 8, } impl ::protobuf::Enum for BuildingDirection { @@ -24565,7 +24721,11 @@ impl ::protobuf::Enum for BuildingDirection { 1 => ::std::option::Option::Some(BuildingDirection::EAST), 2 => ::std::option::Option::Some(BuildingDirection::SOUTH), 3 => ::std::option::Option::Some(BuildingDirection::WEST), - 4 => ::std::option::Option::Some(BuildingDirection::NONE), + 4 => ::std::option::Option::Some(BuildingDirection::NORTHEAST), + 5 => ::std::option::Option::Some(BuildingDirection::SOUTHEAST), + 6 => ::std::option::Option::Some(BuildingDirection::SOUTHWEST), + 7 => ::std::option::Option::Some(BuildingDirection::NORTHWEST), + 8 => ::std::option::Option::Some(BuildingDirection::NONE), _ => ::std::option::Option::None } } @@ -24576,6 +24736,10 @@ impl ::protobuf::Enum for BuildingDirection { "EAST" => ::std::option::Option::Some(BuildingDirection::EAST), "SOUTH" => ::std::option::Option::Some(BuildingDirection::SOUTH), "WEST" => ::std::option::Option::Some(BuildingDirection::WEST), + "NORTHEAST" => ::std::option::Option::Some(BuildingDirection::NORTHEAST), + "SOUTHEAST" => ::std::option::Option::Some(BuildingDirection::SOUTHEAST), + "SOUTHWEST" => ::std::option::Option::Some(BuildingDirection::SOUTHWEST), + "NORTHWEST" => ::std::option::Option::Some(BuildingDirection::NORTHWEST), "NONE" => ::std::option::Option::Some(BuildingDirection::NONE), _ => ::std::option::Option::None } @@ -24586,6 +24750,10 @@ impl ::protobuf::Enum for BuildingDirection { BuildingDirection::EAST, BuildingDirection::SOUTH, BuildingDirection::WEST, + BuildingDirection::NORTHEAST, + BuildingDirection::SOUTHEAST, + BuildingDirection::SOUTHWEST, + BuildingDirection::NORTHWEST, BuildingDirection::NONE, ]; } @@ -26110,11 +26278,11 @@ static file_descriptor_proto_data: &'static [u8] = b"\ lue\x18\x03\x20\x02(\x05R\x04blue\"\xea\x02\n\x12MaterialDefinition\x128\ \n\x08mat_pair\x18\x01\x20\x02(\x0b2\x1d.RemoteFortressReader.MatPairR\ \x07matPair\x12\x0e\n\x02id\x18\x02\x20\x01(\tR\x02id\x12\x12\n\x04name\ - \x18\x03\x20\x01(\x0cR\x04name\x12F\n\x0bstate_color\x18\x04\x20\x01(\ - \x0b2%.RemoteFortressReader.ColorDefinitionR\nstateColor\x12@\n\ninstrum\ - ent\x18\x05\x20\x01(\x0b2\x20.ItemdefInstrument.InstrumentDefR\ninstrume\ - nt\x12\x17\n\x07up_step\x18\x06\x20\x01(\x05R\x06upStep\x12\x1b\n\tdown_\ - step\x18\x07\x20\x01(\x05R\x08downStep\x126\n\x05layer\x18\x08\x20\x01(\ + \x18\x03\x20\x01(\tR\x04name\x12F\n\x0bstate_color\x18\x04\x20\x01(\x0b2\ + %.RemoteFortressReader.ColorDefinitionR\nstateColor\x12@\n\ninstrument\ + \x18\x05\x20\x01(\x0b2\x20.ItemdefInstrument.InstrumentDefR\ninstrument\ + \x12\x17\n\x07up_step\x18\x06\x20\x01(\x05R\x06upStep\x12\x1b\n\tdown_st\ + ep\x18\x07\x20\x01(\x05R\x08downStep\x126\n\x05layer\x18\x08\x20\x01(\ \x0e2\x20.RemoteFortressReader.ArmorLayerR\x05layer\"\x87\x01\n\x0cBuild\ ingType\x12#\n\rbuilding_type\x18\x01\x20\x02(\x05R\x0cbuildingType\x12)\ \n\x10building_subtype\x18\x02\x20\x02(\x05R\x0fbuildingSubtype\x12'\n\ @@ -26174,105 +26342,106 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ortressReader.CoordR\x06facing\x12\x10\n\x03age\x18\x19\x20\x01(\x05R\ \x03age\x127\n\x06wounds\x18\x1a\x20\x03(\x0b2\x1f.RemoteFortressReader.\ UnitWoundR\x06wounds\"U\n\x08UnitList\x12I\n\rcreature_list\x18\x01\x20\ - \x03(\x0b2$.RemoteFortressReader.UnitDefinitionR\x0ccreatureList\"\xb1\ + \x03(\x0b2$.RemoteFortressReader.UnitDefinitionR\x0ccreatureList\"\xd4\ \x01\n\x0cBlockRequest\x12#\n\rblocks_needed\x18\x01\x20\x01(\x05R\x0cbl\ ocksNeeded\x12\x13\n\x05min_x\x18\x02\x20\x01(\x05R\x04minX\x12\x13\n\ \x05max_x\x18\x03\x20\x01(\x05R\x04maxX\x12\x13\n\x05min_y\x18\x04\x20\ \x01(\x05R\x04minY\x12\x13\n\x05max_y\x18\x05\x20\x01(\x05R\x04maxY\x12\ \x13\n\x05min_z\x18\x06\x20\x01(\x05R\x04minZ\x12\x13\n\x05max_z\x18\x07\ - \x20\x01(\x05R\x04maxZ\"\xf2\x01\n\tBlockList\x12=\n\nmap_blocks\x18\x01\ - \x20\x03(\x0b2\x1e.RemoteFortressReader.MapBlockR\tmapBlocks\x12\x13\n\ - \x05map_x\x18\x02\x20\x01(\x05R\x04mapX\x12\x13\n\x05map_y\x18\x03\x20\ - \x01(\x05R\x04mapY\x12?\n\nengravings\x18\x04\x20\x03(\x0b2\x1f.RemoteFo\ - rtressReader.EngravingR\nengravings\x12;\n\x0bocean_waves\x18\x05\x20\ - \x03(\x0b2\x1a.RemoteFortressReader.WaveR\noceanWaves\"_\n\x08PlantDef\ - \x12\x13\n\x05pos_x\x18\x01\x20\x02(\x05R\x04posX\x12\x13\n\x05pos_y\x18\ - \x02\x20\x02(\x05R\x04posY\x12\x13\n\x05pos_z\x18\x03\x20\x02(\x05R\x04p\ - osZ\x12\x14\n\x05index\x18\x04\x20\x02(\x05R\x05index\"J\n\tPlantList\ - \x12=\n\nplant_list\x18\x01\x20\x03(\x0b2\x1e.RemoteFortressReader.Plant\ - DefR\tplantList\"\xe2\x02\n\x08ViewInfo\x12\x1c\n\nview_pos_x\x18\x01\ - \x20\x01(\x05R\x08viewPosX\x12\x1c\n\nview_pos_y\x18\x02\x20\x01(\x05R\ - \x08viewPosY\x12\x1c\n\nview_pos_z\x18\x03\x20\x01(\x05R\x08viewPosZ\x12\ - \x1e\n\x0bview_size_x\x18\x04\x20\x01(\x05R\tviewSizeX\x12\x1e\n\x0bview\ - _size_y\x18\x05\x20\x01(\x05R\tviewSizeY\x12\x20\n\x0ccursor_pos_x\x18\ - \x06\x20\x01(\x05R\ncursorPosX\x12\x20\n\x0ccursor_pos_y\x18\x07\x20\x01\ - (\x05R\ncursorPosY\x12\x20\n\x0ccursor_pos_z\x18\x08\x20\x01(\x05R\ncurs\ - orPosZ\x12*\n\x0efollow_unit_id\x18\t\x20\x01(\x05:\x02-1R\x0cfollowUnit\ - IdB\0\x12*\n\x0efollow_item_id\x18\n\x20\x01(\x05:\x02-1R\x0cfollowItemI\ - dB\0\"\xb9\x02\n\x07MapInfo\x12\x20\n\x0cblock_size_x\x18\x01\x20\x01(\ - \x05R\nblockSizeX\x12\x20\n\x0cblock_size_y\x18\x02\x20\x01(\x05R\nblock\ - SizeY\x12\x20\n\x0cblock_size_z\x18\x03\x20\x01(\x05R\nblockSizeZ\x12\ - \x1e\n\x0bblock_pos_x\x18\x04\x20\x01(\x05R\tblockPosX\x12\x1e\n\x0bbloc\ - k_pos_y\x18\x05\x20\x01(\x05R\tblockPosY\x12\x1e\n\x0bblock_pos_z\x18\ - \x06\x20\x01(\x05R\tblockPosZ\x12\x1d\n\nworld_name\x18\x07\x20\x01(\tR\ - \tworldName\x12,\n\x12world_name_english\x18\x08\x20\x01(\tR\x10worldNam\ - eEnglish\x12\x1b\n\tsave_name\x18\t\x20\x01(\tR\x08saveName\"\x81\x02\n\ - \x05Cloud\x125\n\x05front\x18\x01\x20\x01(\x0e2\x1f.RemoteFortressReader\ - .FrontTypeR\x05front\x12;\n\x07cumulus\x18\x02\x20\x01(\x0e2!.RemoteFort\ - ressReader.CumulusTypeR\x07cumulus\x12\x16\n\x06cirrus\x18\x03\x20\x01(\ - \x08R\x06cirrus\x12;\n\x07stratus\x18\x04\x20\x01(\x0e2!.RemoteFortressR\ - eader.StratusTypeR\x07stratus\x12/\n\x03fog\x18\x05\x20\x01(\x0e2\x1d.Re\ - moteFortressReader.FogTypeR\x03fog\"\xf1\x06\n\x08WorldMap\x12\x1f\n\x0b\ - world_width\x18\x01\x20\x02(\x05R\nworldWidth\x12!\n\x0cworld_height\x18\ - \x02\x20\x02(\x05R\x0bworldHeight\x12\x12\n\x04name\x18\x03\x20\x01(\x0c\ - R\x04name\x12!\n\x0cname_english\x18\x04\x20\x01(\tR\x0bnameEnglish\x12\ - \x1c\n\televation\x18\x05\x20\x03(\x05R\televation\x12\x1a\n\x08rainfall\ - \x18\x06\x20\x03(\x05R\x08rainfall\x12\x1e\n\nvegetation\x18\x07\x20\x03\ - (\x05R\nvegetation\x12\x20\n\x0btemperature\x18\x08\x20\x03(\x05R\x0btem\ - perature\x12\x1a\n\x08evilness\x18\t\x20\x03(\x05R\x08evilness\x12\x1a\n\ - \x08drainage\x18\n\x20\x03(\x05R\x08drainage\x12\x1c\n\tvolcanism\x18\ - \x0b\x20\x03(\x05R\tvolcanism\x12\x1a\n\x08savagery\x18\x0c\x20\x03(\x05\ - R\x08savagery\x123\n\x06clouds\x18\r\x20\x03(\x0b2\x1b.RemoteFortressRea\ - der.CloudR\x06clouds\x12\x1a\n\x08salinity\x18\x0e\x20\x03(\x05R\x08sali\ - nity\x12\x13\n\x05map_x\x18\x0f\x20\x01(\x05R\x04mapX\x12\x13\n\x05map_y\ - \x18\x10\x20\x01(\x05R\x04mapY\x12\x19\n\x08center_x\x18\x11\x20\x01(\ - \x05R\x07centerX\x12\x19\n\x08center_y\x18\x12\x20\x01(\x05R\x07centerY\ - \x12\x19\n\x08center_z\x18\x13\x20\x01(\x05R\x07centerZ\x12\x19\n\x08cur\ - _year\x18\x14\x20\x01(\x05R\x07curYear\x12\"\n\rcur_year_tick\x18\x15\ - \x20\x01(\x05R\x0bcurYearTick\x12A\n\x0bworld_poles\x18\x16\x20\x01(\x0e\ - 2\x20.RemoteFortressReader.WorldPolesR\nworldPoles\x12@\n\x0briver_tiles\ - \x18\x17\x20\x03(\x0b2\x1f.RemoteFortressReader.RiverTileR\nriverTiles\ - \x12'\n\x0fwater_elevation\x18\x18\x20\x03(\x05R\x0ewaterElevation\x12C\ - \n\x0cregion_tiles\x18\x19\x20\x03(\x0b2\x20.RemoteFortressReader.Region\ - TileR\x0bregionTiles\"\xa7\x01\n\x1bSiteRealizationBuildingWall\x12\x17\ - \n\x07start_x\x18\x01\x20\x01(\x05R\x06startX\x12\x17\n\x07start_y\x18\ - \x02\x20\x01(\x05R\x06startY\x12\x17\n\x07start_z\x18\x03\x20\x01(\x05R\ - \x06startZ\x12\x13\n\x05end_x\x18\x04\x20\x01(\x05R\x04endX\x12\x13\n\ - \x05end_y\x18\x05\x20\x01(\x05R\x04endY\x12\x13\n\x05end_z\x18\x06\x20\ - \x01(\x05R\x04endZ\"c\n\x1cSiteRealizationBuildingTower\x12\x15\n\x06roo\ - f_z\x18\x01\x20\x01(\x05R\x05roofZ\x12\x14\n\x05round\x18\x02\x20\x01(\ - \x08R\x05round\x12\x16\n\x06goblin\x18\x03\x20\x01(\x08R\x06goblin\"\x8d\ - \x01\n\x0bTrenchSpoke\x12\x1f\n\x0bmound_start\x18\x01\x20\x01(\x05R\nmo\ - undStart\x12!\n\x0ctrench_start\x18\x02\x20\x01(\x05R\x0btrenchStart\x12\ - \x1d\n\ntrench_end\x18\x03\x20\x01(\x05R\ttrenchEnd\x12\x1b\n\tmound_end\ - \x18\x04\x20\x01(\x05R\x08moundEnd\"\\\n\x1fSiteRealizationBuildingTrenc\ - hes\x129\n\x06spokes\x18\x01\x20\x03(\x0b2!.RemoteFortressReader.TrenchS\ - pokeR\x06spokes\"\xc7\x03\n\x17SiteRealizationBuilding\x12\x0e\n\x02id\ - \x18\x01\x20\x01(\x05R\x02id\x12\x13\n\x05min_x\x18\x03\x20\x01(\x05R\ - \x04minX\x12\x13\n\x05min_y\x18\x04\x20\x01(\x05R\x04minY\x12\x13\n\x05m\ - ax_x\x18\x05\x20\x01(\x05R\x04maxX\x12\x13\n\x05max_y\x18\x06\x20\x01(\ - \x05R\x04maxY\x129\n\x08material\x18\x07\x20\x01(\x0b2\x1d.RemoteFortres\ - sReader.MatPairR\x08material\x12N\n\twall_info\x18\x08\x20\x01(\x0b21.Re\ - moteFortressReader.SiteRealizationBuildingWallR\x08wallInfo\x12Q\n\ntowe\ - r_info\x18\t\x20\x01(\x0b22.RemoteFortressReader.SiteRealizationBuilding\ - TowerR\ttowerInfo\x12V\n\x0btrench_info\x18\n\x20\x01(\x0b25.RemoteFortr\ - essReader.SiteRealizationBuildingTrenchesR\ntrenchInfo\x12\x12\n\x04type\ - \x18\x0b\x20\x01(\x05R\x04type\"\x82\x06\n\nRegionTile\x12\x1c\n\televat\ - ion\x18\x01\x20\x01(\x05R\televation\x12\x1a\n\x08rainfall\x18\x02\x20\ - \x01(\x05R\x08rainfall\x12\x1e\n\nvegetation\x18\x03\x20\x01(\x05R\nvege\ - tation\x12\x20\n\x0btemperature\x18\x04\x20\x01(\x05R\x0btemperature\x12\ - \x1a\n\x08evilness\x18\x05\x20\x01(\x05R\x08evilness\x12\x1a\n\x08draina\ - ge\x18\x06\x20\x01(\x05R\x08drainage\x12\x1c\n\tvolcanism\x18\x07\x20\ - \x01(\x05R\tvolcanism\x12\x1a\n\x08savagery\x18\x08\x20\x01(\x05R\x08sav\ - agery\x12\x1a\n\x08salinity\x18\t\x20\x01(\x05R\x08salinity\x12@\n\x0bri\ - ver_tiles\x18\n\x20\x01(\x0b2\x1f.RemoteFortressReader.RiverTileR\nriver\ - Tiles\x12'\n\x0fwater_elevation\x18\x0b\x20\x01(\x05R\x0ewaterElevation\ - \x12H\n\x10surface_material\x18\x0c\x20\x01(\x0b2\x1d.RemoteFortressRead\ - er.MatPairR\x0fsurfaceMaterial\x12F\n\x0fplant_materials\x18\r\x20\x03(\ - \x0b2\x1d.RemoteFortressReader.MatPairR\x0eplantMaterials\x12K\n\tbuildi\ - ngs\x18\x0e\x20\x03(\x0b2-.RemoteFortressReader.SiteRealizationBuildingR\ - \tbuildings\x12F\n\x0fstone_materials\x18\x0f\x20\x03(\x0b2\x1d.RemoteFo\ - rtressReader.MatPairR\x0estoneMaterials\x12D\n\x0etree_materials\x18\x10\ + \x20\x01(\x05R\x04maxZ\x12!\n\x0cforce_reload\x18\x08\x20\x01(\x08R\x0bf\ + orceReload\"\xf2\x01\n\tBlockList\x12=\n\nmap_blocks\x18\x01\x20\x03(\ + \x0b2\x1e.RemoteFortressReader.MapBlockR\tmapBlocks\x12\x13\n\x05map_x\ + \x18\x02\x20\x01(\x05R\x04mapX\x12\x13\n\x05map_y\x18\x03\x20\x01(\x05R\ + \x04mapY\x12?\n\nengravings\x18\x04\x20\x03(\x0b2\x1f.RemoteFortressRead\ + er.EngravingR\nengravings\x12;\n\x0bocean_waves\x18\x05\x20\x03(\x0b2\ + \x1a.RemoteFortressReader.WaveR\noceanWaves\"_\n\x08PlantDef\x12\x13\n\ + \x05pos_x\x18\x01\x20\x02(\x05R\x04posX\x12\x13\n\x05pos_y\x18\x02\x20\ + \x02(\x05R\x04posY\x12\x13\n\x05pos_z\x18\x03\x20\x02(\x05R\x04posZ\x12\ + \x14\n\x05index\x18\x04\x20\x02(\x05R\x05index\"J\n\tPlantList\x12=\n\np\ + lant_list\x18\x01\x20\x03(\x0b2\x1e.RemoteFortressReader.PlantDefR\tplan\ + tList\"\xe2\x02\n\x08ViewInfo\x12\x1c\n\nview_pos_x\x18\x01\x20\x01(\x05\ + R\x08viewPosX\x12\x1c\n\nview_pos_y\x18\x02\x20\x01(\x05R\x08viewPosY\ + \x12\x1c\n\nview_pos_z\x18\x03\x20\x01(\x05R\x08viewPosZ\x12\x1e\n\x0bvi\ + ew_size_x\x18\x04\x20\x01(\x05R\tviewSizeX\x12\x1e\n\x0bview_size_y\x18\ + \x05\x20\x01(\x05R\tviewSizeY\x12\x20\n\x0ccursor_pos_x\x18\x06\x20\x01(\ + \x05R\ncursorPosX\x12\x20\n\x0ccursor_pos_y\x18\x07\x20\x01(\x05R\ncurso\ + rPosY\x12\x20\n\x0ccursor_pos_z\x18\x08\x20\x01(\x05R\ncursorPosZ\x12*\n\ + \x0efollow_unit_id\x18\t\x20\x01(\x05:\x02-1R\x0cfollowUnitIdB\0\x12*\n\ + \x0efollow_item_id\x18\n\x20\x01(\x05:\x02-1R\x0cfollowItemIdB\0\"\xb9\ + \x02\n\x07MapInfo\x12\x20\n\x0cblock_size_x\x18\x01\x20\x01(\x05R\nblock\ + SizeX\x12\x20\n\x0cblock_size_y\x18\x02\x20\x01(\x05R\nblockSizeY\x12\ + \x20\n\x0cblock_size_z\x18\x03\x20\x01(\x05R\nblockSizeZ\x12\x1e\n\x0bbl\ + ock_pos_x\x18\x04\x20\x01(\x05R\tblockPosX\x12\x1e\n\x0bblock_pos_y\x18\ + \x05\x20\x01(\x05R\tblockPosY\x12\x1e\n\x0bblock_pos_z\x18\x06\x20\x01(\ + \x05R\tblockPosZ\x12\x1d\n\nworld_name\x18\x07\x20\x01(\tR\tworldName\ + \x12,\n\x12world_name_english\x18\x08\x20\x01(\tR\x10worldNameEnglish\ + \x12\x1b\n\tsave_name\x18\t\x20\x01(\tR\x08saveName\"\x81\x02\n\x05Cloud\ + \x125\n\x05front\x18\x01\x20\x01(\x0e2\x1f.RemoteFortressReader.FrontTyp\ + eR\x05front\x12;\n\x07cumulus\x18\x02\x20\x01(\x0e2!.RemoteFortressReade\ + r.CumulusTypeR\x07cumulus\x12\x16\n\x06cirrus\x18\x03\x20\x01(\x08R\x06c\ + irrus\x12;\n\x07stratus\x18\x04\x20\x01(\x0e2!.RemoteFortressReader.Stra\ + tusTypeR\x07stratus\x12/\n\x03fog\x18\x05\x20\x01(\x0e2\x1d.RemoteFortre\ + ssReader.FogTypeR\x03fog\"\xf1\x06\n\x08WorldMap\x12\x1f\n\x0bworld_widt\ + h\x18\x01\x20\x02(\x05R\nworldWidth\x12!\n\x0cworld_height\x18\x02\x20\ + \x02(\x05R\x0bworldHeight\x12\x12\n\x04name\x18\x03\x20\x01(\tR\x04name\ + \x12!\n\x0cname_english\x18\x04\x20\x01(\tR\x0bnameEnglish\x12\x1c\n\tel\ + evation\x18\x05\x20\x03(\x05R\televation\x12\x1a\n\x08rainfall\x18\x06\ + \x20\x03(\x05R\x08rainfall\x12\x1e\n\nvegetation\x18\x07\x20\x03(\x05R\n\ + vegetation\x12\x20\n\x0btemperature\x18\x08\x20\x03(\x05R\x0btemperature\ + \x12\x1a\n\x08evilness\x18\t\x20\x03(\x05R\x08evilness\x12\x1a\n\x08drai\ + nage\x18\n\x20\x03(\x05R\x08drainage\x12\x1c\n\tvolcanism\x18\x0b\x20\ + \x03(\x05R\tvolcanism\x12\x1a\n\x08savagery\x18\x0c\x20\x03(\x05R\x08sav\ + agery\x123\n\x06clouds\x18\r\x20\x03(\x0b2\x1b.RemoteFortressReader.Clou\ + dR\x06clouds\x12\x1a\n\x08salinity\x18\x0e\x20\x03(\x05R\x08salinity\x12\ + \x13\n\x05map_x\x18\x0f\x20\x01(\x05R\x04mapX\x12\x13\n\x05map_y\x18\x10\ + \x20\x01(\x05R\x04mapY\x12\x19\n\x08center_x\x18\x11\x20\x01(\x05R\x07ce\ + nterX\x12\x19\n\x08center_y\x18\x12\x20\x01(\x05R\x07centerY\x12\x19\n\ + \x08center_z\x18\x13\x20\x01(\x05R\x07centerZ\x12\x19\n\x08cur_year\x18\ + \x14\x20\x01(\x05R\x07curYear\x12\"\n\rcur_year_tick\x18\x15\x20\x01(\ + \x05R\x0bcurYearTick\x12A\n\x0bworld_poles\x18\x16\x20\x01(\x0e2\x20.Rem\ + oteFortressReader.WorldPolesR\nworldPoles\x12@\n\x0briver_tiles\x18\x17\ + \x20\x03(\x0b2\x1f.RemoteFortressReader.RiverTileR\nriverTiles\x12'\n\ + \x0fwater_elevation\x18\x18\x20\x03(\x05R\x0ewaterElevation\x12C\n\x0cre\ + gion_tiles\x18\x19\x20\x03(\x0b2\x20.RemoteFortressReader.RegionTileR\ + \x0bregionTiles\"\xa7\x01\n\x1bSiteRealizationBuildingWall\x12\x17\n\x07\ + start_x\x18\x01\x20\x01(\x05R\x06startX\x12\x17\n\x07start_y\x18\x02\x20\ + \x01(\x05R\x06startY\x12\x17\n\x07start_z\x18\x03\x20\x01(\x05R\x06start\ + Z\x12\x13\n\x05end_x\x18\x04\x20\x01(\x05R\x04endX\x12\x13\n\x05end_y\ + \x18\x05\x20\x01(\x05R\x04endY\x12\x13\n\x05end_z\x18\x06\x20\x01(\x05R\ + \x04endZ\"c\n\x1cSiteRealizationBuildingTower\x12\x15\n\x06roof_z\x18\ + \x01\x20\x01(\x05R\x05roofZ\x12\x14\n\x05round\x18\x02\x20\x01(\x08R\x05\ + round\x12\x16\n\x06goblin\x18\x03\x20\x01(\x08R\x06goblin\"\x8d\x01\n\ + \x0bTrenchSpoke\x12\x1f\n\x0bmound_start\x18\x01\x20\x01(\x05R\nmoundSta\ + rt\x12!\n\x0ctrench_start\x18\x02\x20\x01(\x05R\x0btrenchStart\x12\x1d\n\ + \ntrench_end\x18\x03\x20\x01(\x05R\ttrenchEnd\x12\x1b\n\tmound_end\x18\ + \x04\x20\x01(\x05R\x08moundEnd\"\\\n\x1fSiteRealizationBuildingTrenches\ + \x129\n\x06spokes\x18\x01\x20\x03(\x0b2!.RemoteFortressReader.TrenchSpok\ + eR\x06spokes\"\xc7\x03\n\x17SiteRealizationBuilding\x12\x0e\n\x02id\x18\ + \x01\x20\x01(\x05R\x02id\x12\x13\n\x05min_x\x18\x03\x20\x01(\x05R\x04min\ + X\x12\x13\n\x05min_y\x18\x04\x20\x01(\x05R\x04minY\x12\x13\n\x05max_x\ + \x18\x05\x20\x01(\x05R\x04maxX\x12\x13\n\x05max_y\x18\x06\x20\x01(\x05R\ + \x04maxY\x129\n\x08material\x18\x07\x20\x01(\x0b2\x1d.RemoteFortressRead\ + er.MatPairR\x08material\x12N\n\twall_info\x18\x08\x20\x01(\x0b21.RemoteF\ + ortressReader.SiteRealizationBuildingWallR\x08wallInfo\x12Q\n\ntower_inf\ + o\x18\t\x20\x01(\x0b22.RemoteFortressReader.SiteRealizationBuildingTower\ + R\ttowerInfo\x12V\n\x0btrench_info\x18\n\x20\x01(\x0b25.RemoteFortressRe\ + ader.SiteRealizationBuildingTrenchesR\ntrenchInfo\x12\x12\n\x04type\x18\ + \x0b\x20\x01(\x05R\x04type\"\x82\x06\n\nRegionTile\x12\x1c\n\televation\ + \x18\x01\x20\x01(\x05R\televation\x12\x1a\n\x08rainfall\x18\x02\x20\x01(\ + \x05R\x08rainfall\x12\x1e\n\nvegetation\x18\x03\x20\x01(\x05R\nvegetatio\ + n\x12\x20\n\x0btemperature\x18\x04\x20\x01(\x05R\x0btemperature\x12\x1a\ + \n\x08evilness\x18\x05\x20\x01(\x05R\x08evilness\x12\x1a\n\x08drainage\ + \x18\x06\x20\x01(\x05R\x08drainage\x12\x1c\n\tvolcanism\x18\x07\x20\x01(\ + \x05R\tvolcanism\x12\x1a\n\x08savagery\x18\x08\x20\x01(\x05R\x08savagery\ + \x12\x1a\n\x08salinity\x18\t\x20\x01(\x05R\x08salinity\x12@\n\x0briver_t\ + iles\x18\n\x20\x01(\x0b2\x1f.RemoteFortressReader.RiverTileR\nriverTiles\ + \x12'\n\x0fwater_elevation\x18\x0b\x20\x01(\x05R\x0ewaterElevation\x12H\ + \n\x10surface_material\x18\x0c\x20\x01(\x0b2\x1d.RemoteFortressReader.Ma\ + tPairR\x0fsurfaceMaterial\x12F\n\x0fplant_materials\x18\r\x20\x03(\x0b2\ + \x1d.RemoteFortressReader.MatPairR\x0eplantMaterials\x12K\n\tbuildings\ + \x18\x0e\x20\x03(\x0b2-.RemoteFortressReader.SiteRealizationBuildingR\tb\ + uildings\x12F\n\x0fstone_materials\x18\x0f\x20\x03(\x0b2\x1d.RemoteFortr\ + essReader.MatPairR\x0estoneMaterials\x12D\n\x0etree_materials\x18\x10\ \x20\x03(\x0b2\x1d.RemoteFortressReader.MatPairR\rtreeMaterials\x12\x12\ \n\x04snow\x18\x11\x20\x01(\x05R\x04snow\"\xa4\x01\n\tRegionMap\x12\x13\ \n\x05map_x\x18\x01\x20\x01(\x05R\x04mapX\x12\x13\n\x05map_y\x18\x02\x20\ @@ -26429,61 +26598,65 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x06hidden\x12\x1c\n\tnorthwest\x18\x0b\x20\x01(\x08R\tnorthwest\x12\x1c\ \n\tnortheast\x18\x0c\x20\x01(\x08R\tnortheast\x12\x1c\n\tsouthwest\x18\ \r\x20\x01(\x08R\tsouthwest\x12\x1c\n\tsoutheast\x18\x0e\x20\x01(\x08R\t\ - southeast\"\x8b\x03\n\x08FlowInfo\x12\x14\n\x05index\x18\x01\x20\x01(\ + southeast\"\xd3\x03\n\x08FlowInfo\x12\x14\n\x05index\x18\x01\x20\x01(\ \x05R\x05index\x122\n\x04type\x18\x02\x20\x01(\x0e2\x1e.RemoteFortressRe\ ader.FlowTypeR\x04type\x12\x18\n\x07density\x18\x03\x20\x01(\x05R\x07den\ sity\x12-\n\x03pos\x18\x04\x20\x01(\x0b2\x1b.RemoteFortressReader.CoordR\ \x03pos\x12/\n\x04dest\x18\x05\x20\x01(\x0b2\x1b.RemoteFortressReader.Co\ ordR\x04dest\x12\x1c\n\texpanding\x18\x06\x20\x01(\x08R\texpanding\x12\ - \x14\n\x05reuse\x18\x07\x20\x01(\x08R\x05reuse\x12\x19\n\x08guide_id\x18\ - \x08\x20\x01(\x05R\x07guideId\x129\n\x08material\x18\t\x20\x01(\x0b2\x1d\ - .RemoteFortressReader.MatPairR\x08material\x121\n\x04item\x18\n\x20\x01(\ - \x0b2\x1d.RemoteFortressReader.MatPairR\x04item\"f\n\x04Wave\x12/\n\x04d\ - est\x18\x01\x20\x01(\x0b2\x1b.RemoteFortressReader.CoordR\x04dest\x12-\n\ - \x03pos\x18\x02\x20\x01(\x0b2\x1b.RemoteFortressReader.CoordR\x03pos*\ - \xba\x02\n\rTiletypeShape\x12\x15\n\x08NO_SHAPE\x10\xff\xff\xff\xff\xff\ - \xff\xff\xff\xff\x01\x12\t\n\x05EMPTY\x10\0\x12\t\n\x05FLOOR\x10\x01\x12\ - \x0b\n\x07BOULDER\x10\x02\x12\x0b\n\x07PEBBLES\x10\x03\x12\x08\n\x04WALL\ - \x10\x04\x12\x11\n\rFORTIFICATION\x10\x05\x12\x0c\n\x08STAIR_UP\x10\x06\ - \x12\x0e\n\nSTAIR_DOWN\x10\x07\x12\x10\n\x0cSTAIR_UPDOWN\x10\x08\x12\x08\ - \n\x04RAMP\x10\t\x12\x0c\n\x08RAMP_TOP\x10\n\x12\r\n\tBROOK_BED\x10\x0b\ - \x12\r\n\tBROOK_TOP\x10\x0c\x12\x0e\n\nTREE_SHAPE\x10\r\x12\x0b\n\x07SAP\ - LING\x10\x0e\x12\t\n\x05SHRUB\x10\x0f\x12\x0f\n\x0bENDLESS_PIT\x10\x10\ - \x12\n\n\x06BRANCH\x10\x11\x12\x10\n\x0cTRUNK_BRANCH\x10\x12\x12\x08\n\ - \x04TWIG\x10\x13*\xc4\x01\n\x0fTiletypeSpecial\x12\x17\n\nNO_SPECIAL\x10\ - \xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\n\n\x06NORMAL\x10\0\x12\x10\ - \n\x0cRIVER_SOURCE\x10\x01\x12\r\n\tWATERFALL\x10\x02\x12\n\n\x06SMOOTH\ - \x10\x03\x12\x0c\n\x08FURROWED\x10\x04\x12\x07\n\x03WET\x10\x05\x12\x08\ - \n\x04DEAD\x10\x06\x12\n\n\x06WORN_1\x10\x07\x12\n\n\x06WORN_2\x10\x08\ - \x12\n\n\x06WORN_3\x10\t\x12\t\n\x05TRACK\x10\n\x12\x0f\n\x0bSMOOTH_DEAD\ - \x10\x0b*\x8a\x03\n\x10TiletypeMaterial\x12\x18\n\x0bNO_MATERIAL\x10\xff\ - \xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\x07\n\x03AIR\x10\0\x12\x08\n\ - \x04SOIL\x10\x01\x12\t\n\x05STONE\x10\x02\x12\x0b\n\x07FEATURE\x10\x03\ - \x12\x0e\n\nLAVA_STONE\x10\x04\x12\x0b\n\x07MINERAL\x10\x05\x12\x11\n\rF\ - ROZEN_LIQUID\x10\x06\x12\x10\n\x0cCONSTRUCTION\x10\x07\x12\x0f\n\x0bGRAS\ - S_LIGHT\x10\x08\x12\x0e\n\nGRASS_DARK\x10\t\x12\r\n\tGRASS_DRY\x10\n\x12\ - \x0e\n\nGRASS_DEAD\x10\x0b\x12\t\n\x05PLANT\x10\x0c\x12\x07\n\x03HFS\x10\ - \r\x12\x0c\n\x08CAMPFIRE\x10\x0e\x12\x08\n\x04FIRE\x10\x0f\x12\t\n\x05AS\ - HES\x10\x10\x12\t\n\x05MAGMA\x10\x11\x12\r\n\tDRIFTWOOD\x10\x12\x12\x08\ - \n\x04POOL\x10\x13\x12\t\n\x05BROOK\x10\x14\x12\t\n\x05RIVER\x10\x15\x12\ - \x08\n\x04ROOT\x10\x16\x12\x11\n\rTREE_MATERIAL\x10\x17\x12\x0c\n\x08MUS\ - HROOM\x10\x18\x12\x13\n\x0fUNDERWORLD_GATE\x10\x19*V\n\x0fTiletypeVarian\ - t\x12\x17\n\nNO_VARIANT\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\ - \t\n\x05VAR_1\x10\0\x12\t\n\x05VAR_2\x10\x01\x12\t\n\x05VAR_3\x10\x02\ - \x12\t\n\x05VAR_4\x10\x03*J\n\nWorldPoles\x12\x0c\n\x08NO_POLES\x10\0\ - \x12\x0e\n\nNORTH_POLE\x10\x01\x12\x0e\n\nSOUTH_POLE\x10\x02\x12\x0e\n\n\ - BOTH_POLES\x10\x03*G\n\x11BuildingDirection\x12\t\n\x05NORTH\x10\0\x12\ - \x08\n\x04EAST\x10\x01\x12\t\n\x05SOUTH\x10\x02\x12\x08\n\x04WEST\x10\ - \x03\x12\x08\n\x04NONE\x10\x04*\x8d\x01\n\x12TileDigDesignation\x12\n\n\ - \x06NO_DIG\x10\0\x12\x0f\n\x0bDEFAULT_DIG\x10\x01\x12\x15\n\x11UP_DOWN_S\ - TAIR_DIG\x10\x02\x12\x0f\n\x0bCHANNEL_DIG\x10\x03\x12\x0c\n\x08RAMP_DIG\ - \x10\x04\x12\x12\n\x0eDOWN_STAIR_DIG\x10\x05\x12\x10\n\x0cUP_STAIR_DIG\ - \x10\x06*u\n\tHairStyle\x12\x14\n\x07UNKEMPT\x10\xff\xff\xff\xff\xff\xff\ - \xff\xff\xff\x01\x12\x11\n\rNEATLY_COMBED\x10\0\x12\x0b\n\x07BRAIDED\x10\ - \x01\x12\x10\n\x0cDOUBLE_BRAID\x10\x02\x12\x0e\n\nPONY_TAILS\x10\x03\x12\ - \x10\n\x0cCLEAN_SHAVEN\x10\x04*\x9c\x01\n\rInventoryMode\x12\n\n\x06Haul\ - ed\x10\0\x12\n\n\x06Weapon\x10\x01\x12\x08\n\x04Worn\x10\x02\x12\x0c\n\ - \x08Piercing\x10\x03\x12\t\n\x05Flask\x10\x04\x12\x11\n\rWrappedAround\ + \x18\n\x05reuse\x18\x07\x20\x01(\x08R\x05reuseB\x02\x18\x01\x12\x19\n\ + \x08guide_id\x18\x08\x20\x01(\x05R\x07guideId\x129\n\x08material\x18\t\ + \x20\x01(\x0b2\x1d.RemoteFortressReader.MatPairR\x08material\x121\n\x04i\ + tem\x18\n\x20\x01(\x0b2\x1d.RemoteFortressReader.MatPairR\x04item\x12\ + \x12\n\x04dead\x18\x0b\x20\x01(\x08R\x04dead\x12\x12\n\x04fast\x18\x0c\ + \x20\x01(\x08R\x04fast\x12\x1a\n\x08creeping\x18\r\x20\x01(\x08R\x08cree\ + ping\"f\n\x04Wave\x12/\n\x04dest\x18\x01\x20\x01(\x0b2\x1b.RemoteFortres\ + sReader.CoordR\x04dest\x12-\n\x03pos\x18\x02\x20\x01(\x0b2\x1b.RemoteFor\ + tressReader.CoordR\x03pos*\xba\x02\n\rTiletypeShape\x12\x15\n\x08NO_SHAP\ + E\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\t\n\x05EMPTY\x10\0\x12\ + \t\n\x05FLOOR\x10\x01\x12\x0b\n\x07BOULDER\x10\x02\x12\x0b\n\x07PEBBLES\ + \x10\x03\x12\x08\n\x04WALL\x10\x04\x12\x11\n\rFORTIFICATION\x10\x05\x12\ + \x0c\n\x08STAIR_UP\x10\x06\x12\x0e\n\nSTAIR_DOWN\x10\x07\x12\x10\n\x0cST\ + AIR_UPDOWN\x10\x08\x12\x08\n\x04RAMP\x10\t\x12\x0c\n\x08RAMP_TOP\x10\n\ + \x12\r\n\tBROOK_BED\x10\x0b\x12\r\n\tBROOK_TOP\x10\x0c\x12\x0e\n\nTREE_S\ + HAPE\x10\r\x12\x0b\n\x07SAPLING\x10\x0e\x12\t\n\x05SHRUB\x10\x0f\x12\x0f\ + \n\x0bENDLESS_PIT\x10\x10\x12\n\n\x06BRANCH\x10\x11\x12\x10\n\x0cTRUNK_B\ + RANCH\x10\x12\x12\x08\n\x04TWIG\x10\x13*\xc4\x01\n\x0fTiletypeSpecial\ + \x12\x17\n\nNO_SPECIAL\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\n\ + \n\x06NORMAL\x10\0\x12\x10\n\x0cRIVER_SOURCE\x10\x01\x12\r\n\tWATERFALL\ + \x10\x02\x12\n\n\x06SMOOTH\x10\x03\x12\x0c\n\x08FURROWED\x10\x04\x12\x07\ + \n\x03WET\x10\x05\x12\x08\n\x04DEAD\x10\x06\x12\n\n\x06WORN_1\x10\x07\ + \x12\n\n\x06WORN_2\x10\x08\x12\n\n\x06WORN_3\x10\t\x12\t\n\x05TRACK\x10\ + \n\x12\x0f\n\x0bSMOOTH_DEAD\x10\x0b*\x8a\x03\n\x10TiletypeMaterial\x12\ + \x18\n\x0bNO_MATERIAL\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\ + \x07\n\x03AIR\x10\0\x12\x08\n\x04SOIL\x10\x01\x12\t\n\x05STONE\x10\x02\ + \x12\x0b\n\x07FEATURE\x10\x03\x12\x0e\n\nLAVA_STONE\x10\x04\x12\x0b\n\ + \x07MINERAL\x10\x05\x12\x11\n\rFROZEN_LIQUID\x10\x06\x12\x10\n\x0cCONSTR\ + UCTION\x10\x07\x12\x0f\n\x0bGRASS_LIGHT\x10\x08\x12\x0e\n\nGRASS_DARK\ + \x10\t\x12\r\n\tGRASS_DRY\x10\n\x12\x0e\n\nGRASS_DEAD\x10\x0b\x12\t\n\ + \x05PLANT\x10\x0c\x12\x07\n\x03HFS\x10\r\x12\x0c\n\x08CAMPFIRE\x10\x0e\ + \x12\x08\n\x04FIRE\x10\x0f\x12\t\n\x05ASHES\x10\x10\x12\t\n\x05MAGMA\x10\ + \x11\x12\r\n\tDRIFTWOOD\x10\x12\x12\x08\n\x04POOL\x10\x13\x12\t\n\x05BRO\ + OK\x10\x14\x12\t\n\x05RIVER\x10\x15\x12\x08\n\x04ROOT\x10\x16\x12\x11\n\ + \rTREE_MATERIAL\x10\x17\x12\x0c\n\x08MUSHROOM\x10\x18\x12\x13\n\x0fUNDER\ + WORLD_GATE\x10\x19*V\n\x0fTiletypeVariant\x12\x17\n\nNO_VARIANT\x10\xff\ + \xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\t\n\x05VAR_1\x10\0\x12\t\n\x05V\ + AR_2\x10\x01\x12\t\n\x05VAR_3\x10\x02\x12\t\n\x05VAR_4\x10\x03*J\n\nWorl\ + dPoles\x12\x0c\n\x08NO_POLES\x10\0\x12\x0e\n\nNORTH_POLE\x10\x01\x12\x0e\ + \n\nSOUTH_POLE\x10\x02\x12\x0e\n\nBOTH_POLES\x10\x03*\x83\x01\n\x11Build\ + ingDirection\x12\t\n\x05NORTH\x10\0\x12\x08\n\x04EAST\x10\x01\x12\t\n\ + \x05SOUTH\x10\x02\x12\x08\n\x04WEST\x10\x03\x12\r\n\tNORTHEAST\x10\x04\ + \x12\r\n\tSOUTHEAST\x10\x05\x12\r\n\tSOUTHWEST\x10\x06\x12\r\n\tNORTHWES\ + T\x10\x07\x12\x08\n\x04NONE\x10\x08*\x8d\x01\n\x12TileDigDesignation\x12\ + \n\n\x06NO_DIG\x10\0\x12\x0f\n\x0bDEFAULT_DIG\x10\x01\x12\x15\n\x11UP_DO\ + WN_STAIR_DIG\x10\x02\x12\x0f\n\x0bCHANNEL_DIG\x10\x03\x12\x0c\n\x08RAMP_\ + DIG\x10\x04\x12\x12\n\x0eDOWN_STAIR_DIG\x10\x05\x12\x10\n\x0cUP_STAIR_DI\ + G\x10\x06*u\n\tHairStyle\x12\x14\n\x07UNKEMPT\x10\xff\xff\xff\xff\xff\ + \xff\xff\xff\xff\x01\x12\x11\n\rNEATLY_COMBED\x10\0\x12\x0b\n\x07BRAIDED\ + \x10\x01\x12\x10\n\x0cDOUBLE_BRAID\x10\x02\x12\x0e\n\nPONY_TAILS\x10\x03\ + \x12\x10\n\x0cCLEAN_SHAVEN\x10\x04*\x9c\x01\n\rInventoryMode\x12\n\n\x06\ + Hauled\x10\0\x12\n\n\x06Weapon\x10\x01\x12\x08\n\x04Worn\x10\x02\x12\x0c\ + \n\x08Piercing\x10\x03\x12\t\n\x05Flask\x10\x04\x12\x11\n\rWrappedAround\ \x10\x05\x12\x0b\n\x07StuckIn\x10\x06\x12\x0b\n\x07InMouth\x10\x07\x12\ \x07\n\x03Pet\x10\x08\x12\x0c\n\x08SewnInto\x10\t\x12\x0c\n\x08Strapped\ \x10\n*O\n\nArmorLayer\x12\x0f\n\x0bLAYER_UNDER\x10\0\x12\x0e\n\nLAYER_O\ diff --git a/dfhack-proto/src/generated/messages/rename.rs b/dfhack-proto/src/generated/messages/example.rs similarity index 99% rename from dfhack-proto/src/generated/messages/rename.rs rename to dfhack-proto/src/generated/messages/example.rs index 692af2b..0c5b911 100644 --- a/dfhack-proto/src/generated/messages/rename.rs +++ b/dfhack-proto/src/generated/messages/example.rs @@ -18,7 +18,7 @@ #![allow(unused_results)] #![allow(unused_mut)] -//! Generated file from `rename.proto` +//! Generated file from `example.proto` /// Generated files are compatible only with the same version /// of protobuf runtime. @@ -727,8 +727,8 @@ impl ::protobuf::reflect::ProtobufValue for RenameBuildingIn { } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x0crename.proto\x12\x07dfproto\"\\\n\rRenameSquadIn\x12\x19\n\x08squa\ - d_id\x18\x01\x20\x02(\x05R\x07squadId\x12\x1a\n\x08nickname\x18\x02\x20\ + \n\rexample.proto\x12\x07dfproto\"\\\n\rRenameSquadIn\x12\x19\n\x08squad\ + _id\x18\x01\x20\x02(\x05R\x07squadId\x12\x1a\n\x08nickname\x18\x02\x20\ \x01(\tR\x08nickname\x12\x14\n\x05alias\x18\x03\x20\x01(\tR\x05alias\"c\ \n\x0cRenameUnitIn\x12\x17\n\x07unit_id\x18\x01\x20\x02(\x05R\x06unitId\ \x12\x1a\n\x08nickname\x18\x02\x20\x01(\tR\x08nickname\x12\x1e\n\nprofes\ diff --git a/dfhack-proto/src/generated/messages/isoworldremote.rs b/dfhack-proto/src/generated/messages/isoworldremote.rs deleted file mode 100644 index 6d594b8..0000000 --- a/dfhack-proto/src/generated/messages/isoworldremote.rs +++ /dev/null @@ -1,1982 +0,0 @@ -// This file is generated by rust-protobuf 3.7.2. Do not edit -// .proto file is parsed by pure -// @generated - -// https://github.com/rust-lang/rust-clippy/issues/702 -#![allow(unknown_lints)] -#![allow(clippy::all)] - -#![allow(unused_attributes)] -#![cfg_attr(rustfmt, rustfmt::skip)] - -#![allow(dead_code)] -#![allow(missing_docs)] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] -#![allow(non_upper_case_globals)] -#![allow(trivial_casts)] -#![allow(unused_results)] -#![allow(unused_mut)] - -//! Generated file from `isoworldremote.proto` - -/// Generated files are compatible only with the same version -/// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_2; - -// @@protoc_insertion_point(message:isoworldremote.ColorDefinition) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct ColorDefinition { - // message fields - // @@protoc_insertion_point(field:isoworldremote.ColorDefinition.red) - pub red: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.ColorDefinition.green) - pub green: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.ColorDefinition.blue) - pub blue: ::std::option::Option, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.ColorDefinition.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a ColorDefinition { - fn default() -> &'a ColorDefinition { - ::default_instance() - } -} - -impl ColorDefinition { - pub fn new() -> ColorDefinition { - ::std::default::Default::default() - } - - // required int32 red = 1; - - pub fn red(&self) -> i32 { - self.red.unwrap_or(0) - } - - pub fn clear_red(&mut self) { - self.red = ::std::option::Option::None; - } - - pub fn has_red(&self) -> bool { - self.red.is_some() - } - - // Param is passed by value, moved - pub fn set_red(&mut self, v: i32) { - self.red = ::std::option::Option::Some(v); - } - - // required int32 green = 2; - - pub fn green(&self) -> i32 { - self.green.unwrap_or(0) - } - - pub fn clear_green(&mut self) { - self.green = ::std::option::Option::None; - } - - pub fn has_green(&self) -> bool { - self.green.is_some() - } - - // Param is passed by value, moved - pub fn set_green(&mut self, v: i32) { - self.green = ::std::option::Option::Some(v); - } - - // required int32 blue = 3; - - pub fn blue(&self) -> i32 { - self.blue.unwrap_or(0) - } - - pub fn clear_blue(&mut self) { - self.blue = ::std::option::Option::None; - } - - pub fn has_blue(&self) -> bool { - self.blue.is_some() - } - - // Param is passed by value, moved - pub fn set_blue(&mut self, v: i32) { - self.blue = ::std::option::Option::Some(v); - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(3); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "red", - |m: &ColorDefinition| { &m.red }, - |m: &mut ColorDefinition| { &mut m.red }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "green", - |m: &ColorDefinition| { &m.green }, - |m: &mut ColorDefinition| { &mut m.green }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "blue", - |m: &ColorDefinition| { &m.blue }, - |m: &mut ColorDefinition| { &mut m.blue }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "ColorDefinition", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for ColorDefinition { - const NAME: &'static str = "ColorDefinition"; - - fn is_initialized(&self) -> bool { - if self.red.is_none() { - return false; - } - if self.green.is_none() { - return false; - } - if self.blue.is_none() { - return false; - } - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 8 => { - self.red = ::std::option::Option::Some(is.read_int32()?); - }, - 16 => { - self.green = ::std::option::Option::Some(is.read_int32()?); - }, - 24 => { - self.blue = ::std::option::Option::Some(is.read_int32()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.red { - my_size += ::protobuf::rt::int32_size(1, v); - } - if let Some(v) = self.green { - my_size += ::protobuf::rt::int32_size(2, v); - } - if let Some(v) = self.blue { - my_size += ::protobuf::rt::int32_size(3, v); - } - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.red { - os.write_int32(1, v)?; - } - if let Some(v) = self.green { - os.write_int32(2, v)?; - } - if let Some(v) = self.blue { - os.write_int32(3, v)?; - } - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> ColorDefinition { - ColorDefinition::new() - } - - fn clear(&mut self) { - self.red = ::std::option::Option::None; - self.green = ::std::option::Option::None; - self.blue = ::std::option::Option::None; - self.special_fields.clear(); - } - - fn default_instance() -> &'static ColorDefinition { - static instance: ColorDefinition = ColorDefinition { - red: ::std::option::Option::None, - green: ::std::option::Option::None, - blue: ::std::option::Option::None, - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for ColorDefinition { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("ColorDefinition").unwrap()).clone() - } -} - -impl ::std::fmt::Display for ColorDefinition { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for ColorDefinition { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.EmbarkTileLayer) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct EmbarkTileLayer { - // message fields - // @@protoc_insertion_point(field:isoworldremote.EmbarkTileLayer.mat_type_table) - pub mat_type_table: ::std::vec::Vec<::protobuf::EnumOrUnknown>, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTileLayer.mat_subtype_table) - pub mat_subtype_table: ::std::vec::Vec, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTileLayer.tile_shape_table) - pub tile_shape_table: ::std::vec::Vec<::protobuf::EnumOrUnknown>, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTileLayer.tile_color_table) - pub tile_color_table: ::std::vec::Vec, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.EmbarkTileLayer.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a EmbarkTileLayer { - fn default() -> &'a EmbarkTileLayer { - ::default_instance() - } -} - -impl EmbarkTileLayer { - pub fn new() -> EmbarkTileLayer { - ::std::default::Default::default() - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(4); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "mat_type_table", - |m: &EmbarkTileLayer| { &m.mat_type_table }, - |m: &mut EmbarkTileLayer| { &mut m.mat_type_table }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "mat_subtype_table", - |m: &EmbarkTileLayer| { &m.mat_subtype_table }, - |m: &mut EmbarkTileLayer| { &mut m.mat_subtype_table }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "tile_shape_table", - |m: &EmbarkTileLayer| { &m.tile_shape_table }, - |m: &mut EmbarkTileLayer| { &mut m.tile_shape_table }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "tile_color_table", - |m: &EmbarkTileLayer| { &m.tile_color_table }, - |m: &mut EmbarkTileLayer| { &mut m.tile_color_table }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "EmbarkTileLayer", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for EmbarkTileLayer { - const NAME: &'static str = "EmbarkTileLayer"; - - fn is_initialized(&self) -> bool { - for v in &self.tile_color_table { - if !v.is_initialized() { - return false; - } - }; - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 32 => { - self.mat_type_table.push(is.read_enum_or_unknown()?); - }, - 34 => { - ::protobuf::rt::read_repeated_packed_enum_or_unknown_into(is, &mut self.mat_type_table)? - }, - 42 => { - is.read_repeated_packed_int32_into(&mut self.mat_subtype_table)?; - }, - 40 => { - self.mat_subtype_table.push(is.read_int32()?); - }, - 48 => { - self.tile_shape_table.push(is.read_enum_or_unknown()?); - }, - 50 => { - ::protobuf::rt::read_repeated_packed_enum_or_unknown_into(is, &mut self.tile_shape_table)? - }, - 58 => { - self.tile_color_table.push(is.read_message()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - my_size += ::protobuf::rt::vec_packed_enum_or_unknown_size(4, &self.mat_type_table); - my_size += ::protobuf::rt::vec_packed_int32_size(5, &self.mat_subtype_table); - my_size += ::protobuf::rt::vec_packed_enum_or_unknown_size(6, &self.tile_shape_table); - for value in &self.tile_color_table { - let len = value.compute_size(); - my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; - }; - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - os.write_repeated_packed_enum_or_unknown(4, &self.mat_type_table)?; - os.write_repeated_packed_int32(5, &self.mat_subtype_table)?; - os.write_repeated_packed_enum_or_unknown(6, &self.tile_shape_table)?; - for v in &self.tile_color_table { - ::protobuf::rt::write_message_field_with_cached_size(7, v, os)?; - }; - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> EmbarkTileLayer { - EmbarkTileLayer::new() - } - - fn clear(&mut self) { - self.mat_type_table.clear(); - self.mat_subtype_table.clear(); - self.tile_shape_table.clear(); - self.tile_color_table.clear(); - self.special_fields.clear(); - } - - fn default_instance() -> &'static EmbarkTileLayer { - static instance: EmbarkTileLayer = EmbarkTileLayer { - mat_type_table: ::std::vec::Vec::new(), - mat_subtype_table: ::std::vec::Vec::new(), - tile_shape_table: ::std::vec::Vec::new(), - tile_color_table: ::std::vec::Vec::new(), - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for EmbarkTileLayer { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("EmbarkTileLayer").unwrap()).clone() - } -} - -impl ::std::fmt::Display for EmbarkTileLayer { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for EmbarkTileLayer { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.EmbarkTile) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct EmbarkTile { - // message fields - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.world_x) - pub world_x: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.world_y) - pub world_y: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.world_z) - pub world_z: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.tile_layer) - pub tile_layer: ::std::vec::Vec, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.current_year) - pub current_year: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.current_season) - pub current_season: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.EmbarkTile.is_valid) - pub is_valid: ::std::option::Option, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.EmbarkTile.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a EmbarkTile { - fn default() -> &'a EmbarkTile { - ::default_instance() - } -} - -impl EmbarkTile { - pub fn new() -> EmbarkTile { - ::std::default::Default::default() - } - - // required int32 world_x = 1; - - pub fn world_x(&self) -> i32 { - self.world_x.unwrap_or(0) - } - - pub fn clear_world_x(&mut self) { - self.world_x = ::std::option::Option::None; - } - - pub fn has_world_x(&self) -> bool { - self.world_x.is_some() - } - - // Param is passed by value, moved - pub fn set_world_x(&mut self, v: i32) { - self.world_x = ::std::option::Option::Some(v); - } - - // required int32 world_y = 2; - - pub fn world_y(&self) -> i32 { - self.world_y.unwrap_or(0) - } - - pub fn clear_world_y(&mut self) { - self.world_y = ::std::option::Option::None; - } - - pub fn has_world_y(&self) -> bool { - self.world_y.is_some() - } - - // Param is passed by value, moved - pub fn set_world_y(&mut self, v: i32) { - self.world_y = ::std::option::Option::Some(v); - } - - // required sint32 world_z = 3; - - pub fn world_z(&self) -> i32 { - self.world_z.unwrap_or(0) - } - - pub fn clear_world_z(&mut self) { - self.world_z = ::std::option::Option::None; - } - - pub fn has_world_z(&self) -> bool { - self.world_z.is_some() - } - - // Param is passed by value, moved - pub fn set_world_z(&mut self, v: i32) { - self.world_z = ::std::option::Option::Some(v); - } - - // optional int32 current_year = 5; - - pub fn current_year(&self) -> i32 { - self.current_year.unwrap_or(0) - } - - pub fn clear_current_year(&mut self) { - self.current_year = ::std::option::Option::None; - } - - pub fn has_current_year(&self) -> bool { - self.current_year.is_some() - } - - // Param is passed by value, moved - pub fn set_current_year(&mut self, v: i32) { - self.current_year = ::std::option::Option::Some(v); - } - - // optional int32 current_season = 6; - - pub fn current_season(&self) -> i32 { - self.current_season.unwrap_or(0) - } - - pub fn clear_current_season(&mut self) { - self.current_season = ::std::option::Option::None; - } - - pub fn has_current_season(&self) -> bool { - self.current_season.is_some() - } - - // Param is passed by value, moved - pub fn set_current_season(&mut self, v: i32) { - self.current_season = ::std::option::Option::Some(v); - } - - // optional bool is_valid = 7; - - pub fn is_valid(&self) -> bool { - self.is_valid.unwrap_or(false) - } - - pub fn clear_is_valid(&mut self) { - self.is_valid = ::std::option::Option::None; - } - - pub fn has_is_valid(&self) -> bool { - self.is_valid.is_some() - } - - // Param is passed by value, moved - pub fn set_is_valid(&mut self, v: bool) { - self.is_valid = ::std::option::Option::Some(v); - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(7); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "world_x", - |m: &EmbarkTile| { &m.world_x }, - |m: &mut EmbarkTile| { &mut m.world_x }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "world_y", - |m: &EmbarkTile| { &m.world_y }, - |m: &mut EmbarkTile| { &mut m.world_y }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "world_z", - |m: &EmbarkTile| { &m.world_z }, - |m: &mut EmbarkTile| { &mut m.world_z }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "tile_layer", - |m: &EmbarkTile| { &m.tile_layer }, - |m: &mut EmbarkTile| { &mut m.tile_layer }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "current_year", - |m: &EmbarkTile| { &m.current_year }, - |m: &mut EmbarkTile| { &mut m.current_year }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "current_season", - |m: &EmbarkTile| { &m.current_season }, - |m: &mut EmbarkTile| { &mut m.current_season }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "is_valid", - |m: &EmbarkTile| { &m.is_valid }, - |m: &mut EmbarkTile| { &mut m.is_valid }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "EmbarkTile", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for EmbarkTile { - const NAME: &'static str = "EmbarkTile"; - - fn is_initialized(&self) -> bool { - if self.world_x.is_none() { - return false; - } - if self.world_y.is_none() { - return false; - } - if self.world_z.is_none() { - return false; - } - for v in &self.tile_layer { - if !v.is_initialized() { - return false; - } - }; - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 8 => { - self.world_x = ::std::option::Option::Some(is.read_int32()?); - }, - 16 => { - self.world_y = ::std::option::Option::Some(is.read_int32()?); - }, - 24 => { - self.world_z = ::std::option::Option::Some(is.read_sint32()?); - }, - 34 => { - self.tile_layer.push(is.read_message()?); - }, - 40 => { - self.current_year = ::std::option::Option::Some(is.read_int32()?); - }, - 48 => { - self.current_season = ::std::option::Option::Some(is.read_int32()?); - }, - 56 => { - self.is_valid = ::std::option::Option::Some(is.read_bool()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.world_x { - my_size += ::protobuf::rt::int32_size(1, v); - } - if let Some(v) = self.world_y { - my_size += ::protobuf::rt::int32_size(2, v); - } - if let Some(v) = self.world_z { - my_size += ::protobuf::rt::sint32_size(3, v); - } - for value in &self.tile_layer { - let len = value.compute_size(); - my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; - }; - if let Some(v) = self.current_year { - my_size += ::protobuf::rt::int32_size(5, v); - } - if let Some(v) = self.current_season { - my_size += ::protobuf::rt::int32_size(6, v); - } - if let Some(v) = self.is_valid { - my_size += 1 + 1; - } - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.world_x { - os.write_int32(1, v)?; - } - if let Some(v) = self.world_y { - os.write_int32(2, v)?; - } - if let Some(v) = self.world_z { - os.write_sint32(3, v)?; - } - for v in &self.tile_layer { - ::protobuf::rt::write_message_field_with_cached_size(4, v, os)?; - }; - if let Some(v) = self.current_year { - os.write_int32(5, v)?; - } - if let Some(v) = self.current_season { - os.write_int32(6, v)?; - } - if let Some(v) = self.is_valid { - os.write_bool(7, v)?; - } - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> EmbarkTile { - EmbarkTile::new() - } - - fn clear(&mut self) { - self.world_x = ::std::option::Option::None; - self.world_y = ::std::option::Option::None; - self.world_z = ::std::option::Option::None; - self.tile_layer.clear(); - self.current_year = ::std::option::Option::None; - self.current_season = ::std::option::Option::None; - self.is_valid = ::std::option::Option::None; - self.special_fields.clear(); - } - - fn default_instance() -> &'static EmbarkTile { - static instance: EmbarkTile = EmbarkTile { - world_x: ::std::option::Option::None, - world_y: ::std::option::Option::None, - world_z: ::std::option::Option::None, - tile_layer: ::std::vec::Vec::new(), - current_year: ::std::option::Option::None, - current_season: ::std::option::Option::None, - is_valid: ::std::option::Option::None, - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for EmbarkTile { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("EmbarkTile").unwrap()).clone() - } -} - -impl ::std::fmt::Display for EmbarkTile { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for EmbarkTile { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.TileRequest) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct TileRequest { - // message fields - // @@protoc_insertion_point(field:isoworldremote.TileRequest.want_x) - pub want_x: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.TileRequest.want_y) - pub want_y: ::std::option::Option, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.TileRequest.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a TileRequest { - fn default() -> &'a TileRequest { - ::default_instance() - } -} - -impl TileRequest { - pub fn new() -> TileRequest { - ::std::default::Default::default() - } - - // optional int32 want_x = 1; - - pub fn want_x(&self) -> i32 { - self.want_x.unwrap_or(0) - } - - pub fn clear_want_x(&mut self) { - self.want_x = ::std::option::Option::None; - } - - pub fn has_want_x(&self) -> bool { - self.want_x.is_some() - } - - // Param is passed by value, moved - pub fn set_want_x(&mut self, v: i32) { - self.want_x = ::std::option::Option::Some(v); - } - - // optional int32 want_y = 2; - - pub fn want_y(&self) -> i32 { - self.want_y.unwrap_or(0) - } - - pub fn clear_want_y(&mut self) { - self.want_y = ::std::option::Option::None; - } - - pub fn has_want_y(&self) -> bool { - self.want_y.is_some() - } - - // Param is passed by value, moved - pub fn set_want_y(&mut self, v: i32) { - self.want_y = ::std::option::Option::Some(v); - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(2); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "want_x", - |m: &TileRequest| { &m.want_x }, - |m: &mut TileRequest| { &mut m.want_x }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "want_y", - |m: &TileRequest| { &m.want_y }, - |m: &mut TileRequest| { &mut m.want_y }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "TileRequest", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for TileRequest { - const NAME: &'static str = "TileRequest"; - - fn is_initialized(&self) -> bool { - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 8 => { - self.want_x = ::std::option::Option::Some(is.read_int32()?); - }, - 16 => { - self.want_y = ::std::option::Option::Some(is.read_int32()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.want_x { - my_size += ::protobuf::rt::int32_size(1, v); - } - if let Some(v) = self.want_y { - my_size += ::protobuf::rt::int32_size(2, v); - } - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.want_x { - os.write_int32(1, v)?; - } - if let Some(v) = self.want_y { - os.write_int32(2, v)?; - } - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> TileRequest { - TileRequest::new() - } - - fn clear(&mut self) { - self.want_x = ::std::option::Option::None; - self.want_y = ::std::option::Option::None; - self.special_fields.clear(); - } - - fn default_instance() -> &'static TileRequest { - static instance: TileRequest = TileRequest { - want_x: ::std::option::Option::None, - want_y: ::std::option::Option::None, - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for TileRequest { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("TileRequest").unwrap()).clone() - } -} - -impl ::std::fmt::Display for TileRequest { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for TileRequest { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.MapRequest) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct MapRequest { - // message fields - // @@protoc_insertion_point(field:isoworldremote.MapRequest.save_folder) - pub save_folder: ::std::option::Option<::std::string::String>, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.MapRequest.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a MapRequest { - fn default() -> &'a MapRequest { - ::default_instance() - } -} - -impl MapRequest { - pub fn new() -> MapRequest { - ::std::default::Default::default() - } - - // optional string save_folder = 1; - - pub fn save_folder(&self) -> &str { - match self.save_folder.as_ref() { - Some(v) => v, - None => "", - } - } - - pub fn clear_save_folder(&mut self) { - self.save_folder = ::std::option::Option::None; - } - - pub fn has_save_folder(&self) -> bool { - self.save_folder.is_some() - } - - // Param is passed by value, moved - pub fn set_save_folder(&mut self, v: ::std::string::String) { - self.save_folder = ::std::option::Option::Some(v); - } - - // Mutable pointer to the field. - // If field is not initialized, it is initialized with default value first. - pub fn mut_save_folder(&mut self) -> &mut ::std::string::String { - if self.save_folder.is_none() { - self.save_folder = ::std::option::Option::Some(::std::string::String::new()); - } - self.save_folder.as_mut().unwrap() - } - - // Take field - pub fn take_save_folder(&mut self) -> ::std::string::String { - self.save_folder.take().unwrap_or_else(|| ::std::string::String::new()) - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(1); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "save_folder", - |m: &MapRequest| { &m.save_folder }, - |m: &mut MapRequest| { &mut m.save_folder }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "MapRequest", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for MapRequest { - const NAME: &'static str = "MapRequest"; - - fn is_initialized(&self) -> bool { - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 10 => { - self.save_folder = ::std::option::Option::Some(is.read_string()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.save_folder.as_ref() { - my_size += ::protobuf::rt::string_size(1, &v); - } - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.save_folder.as_ref() { - os.write_string(1, v)?; - } - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> MapRequest { - MapRequest::new() - } - - fn clear(&mut self) { - self.save_folder = ::std::option::Option::None; - self.special_fields.clear(); - } - - fn default_instance() -> &'static MapRequest { - static instance: MapRequest = MapRequest { - save_folder: ::std::option::Option::None, - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for MapRequest { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("MapRequest").unwrap()).clone() - } -} - -impl ::std::fmt::Display for MapRequest { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for MapRequest { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.MapReply) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct MapReply { - // message fields - // @@protoc_insertion_point(field:isoworldremote.MapReply.available) - pub available: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.region_x) - pub region_x: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.region_y) - pub region_y: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.region_size_x) - pub region_size_x: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.region_size_y) - pub region_size_y: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.current_year) - pub current_year: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.MapReply.current_season) - pub current_season: ::std::option::Option, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.MapReply.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a MapReply { - fn default() -> &'a MapReply { - ::default_instance() - } -} - -impl MapReply { - pub fn new() -> MapReply { - ::std::default::Default::default() - } - - // required bool available = 1; - - pub fn available(&self) -> bool { - self.available.unwrap_or(false) - } - - pub fn clear_available(&mut self) { - self.available = ::std::option::Option::None; - } - - pub fn has_available(&self) -> bool { - self.available.is_some() - } - - // Param is passed by value, moved - pub fn set_available(&mut self, v: bool) { - self.available = ::std::option::Option::Some(v); - } - - // optional int32 region_x = 2; - - pub fn region_x(&self) -> i32 { - self.region_x.unwrap_or(0) - } - - pub fn clear_region_x(&mut self) { - self.region_x = ::std::option::Option::None; - } - - pub fn has_region_x(&self) -> bool { - self.region_x.is_some() - } - - // Param is passed by value, moved - pub fn set_region_x(&mut self, v: i32) { - self.region_x = ::std::option::Option::Some(v); - } - - // optional int32 region_y = 3; - - pub fn region_y(&self) -> i32 { - self.region_y.unwrap_or(0) - } - - pub fn clear_region_y(&mut self) { - self.region_y = ::std::option::Option::None; - } - - pub fn has_region_y(&self) -> bool { - self.region_y.is_some() - } - - // Param is passed by value, moved - pub fn set_region_y(&mut self, v: i32) { - self.region_y = ::std::option::Option::Some(v); - } - - // optional int32 region_size_x = 4; - - pub fn region_size_x(&self) -> i32 { - self.region_size_x.unwrap_or(0) - } - - pub fn clear_region_size_x(&mut self) { - self.region_size_x = ::std::option::Option::None; - } - - pub fn has_region_size_x(&self) -> bool { - self.region_size_x.is_some() - } - - // Param is passed by value, moved - pub fn set_region_size_x(&mut self, v: i32) { - self.region_size_x = ::std::option::Option::Some(v); - } - - // optional int32 region_size_y = 5; - - pub fn region_size_y(&self) -> i32 { - self.region_size_y.unwrap_or(0) - } - - pub fn clear_region_size_y(&mut self) { - self.region_size_y = ::std::option::Option::None; - } - - pub fn has_region_size_y(&self) -> bool { - self.region_size_y.is_some() - } - - // Param is passed by value, moved - pub fn set_region_size_y(&mut self, v: i32) { - self.region_size_y = ::std::option::Option::Some(v); - } - - // optional int32 current_year = 6; - - pub fn current_year(&self) -> i32 { - self.current_year.unwrap_or(0) - } - - pub fn clear_current_year(&mut self) { - self.current_year = ::std::option::Option::None; - } - - pub fn has_current_year(&self) -> bool { - self.current_year.is_some() - } - - // Param is passed by value, moved - pub fn set_current_year(&mut self, v: i32) { - self.current_year = ::std::option::Option::Some(v); - } - - // optional int32 current_season = 7; - - pub fn current_season(&self) -> i32 { - self.current_season.unwrap_or(0) - } - - pub fn clear_current_season(&mut self) { - self.current_season = ::std::option::Option::None; - } - - pub fn has_current_season(&self) -> bool { - self.current_season.is_some() - } - - // Param is passed by value, moved - pub fn set_current_season(&mut self, v: i32) { - self.current_season = ::std::option::Option::Some(v); - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(7); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "available", - |m: &MapReply| { &m.available }, - |m: &mut MapReply| { &mut m.available }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "region_x", - |m: &MapReply| { &m.region_x }, - |m: &mut MapReply| { &mut m.region_x }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "region_y", - |m: &MapReply| { &m.region_y }, - |m: &mut MapReply| { &mut m.region_y }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "region_size_x", - |m: &MapReply| { &m.region_size_x }, - |m: &mut MapReply| { &mut m.region_size_x }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "region_size_y", - |m: &MapReply| { &m.region_size_y }, - |m: &mut MapReply| { &mut m.region_size_y }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "current_year", - |m: &MapReply| { &m.current_year }, - |m: &mut MapReply| { &mut m.current_year }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "current_season", - |m: &MapReply| { &m.current_season }, - |m: &mut MapReply| { &mut m.current_season }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "MapReply", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for MapReply { - const NAME: &'static str = "MapReply"; - - fn is_initialized(&self) -> bool { - if self.available.is_none() { - return false; - } - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 8 => { - self.available = ::std::option::Option::Some(is.read_bool()?); - }, - 16 => { - self.region_x = ::std::option::Option::Some(is.read_int32()?); - }, - 24 => { - self.region_y = ::std::option::Option::Some(is.read_int32()?); - }, - 32 => { - self.region_size_x = ::std::option::Option::Some(is.read_int32()?); - }, - 40 => { - self.region_size_y = ::std::option::Option::Some(is.read_int32()?); - }, - 48 => { - self.current_year = ::std::option::Option::Some(is.read_int32()?); - }, - 56 => { - self.current_season = ::std::option::Option::Some(is.read_int32()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.available { - my_size += 1 + 1; - } - if let Some(v) = self.region_x { - my_size += ::protobuf::rt::int32_size(2, v); - } - if let Some(v) = self.region_y { - my_size += ::protobuf::rt::int32_size(3, v); - } - if let Some(v) = self.region_size_x { - my_size += ::protobuf::rt::int32_size(4, v); - } - if let Some(v) = self.region_size_y { - my_size += ::protobuf::rt::int32_size(5, v); - } - if let Some(v) = self.current_year { - my_size += ::protobuf::rt::int32_size(6, v); - } - if let Some(v) = self.current_season { - my_size += ::protobuf::rt::int32_size(7, v); - } - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.available { - os.write_bool(1, v)?; - } - if let Some(v) = self.region_x { - os.write_int32(2, v)?; - } - if let Some(v) = self.region_y { - os.write_int32(3, v)?; - } - if let Some(v) = self.region_size_x { - os.write_int32(4, v)?; - } - if let Some(v) = self.region_size_y { - os.write_int32(5, v)?; - } - if let Some(v) = self.current_year { - os.write_int32(6, v)?; - } - if let Some(v) = self.current_season { - os.write_int32(7, v)?; - } - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> MapReply { - MapReply::new() - } - - fn clear(&mut self) { - self.available = ::std::option::Option::None; - self.region_x = ::std::option::Option::None; - self.region_y = ::std::option::Option::None; - self.region_size_x = ::std::option::Option::None; - self.region_size_y = ::std::option::Option::None; - self.current_year = ::std::option::Option::None; - self.current_season = ::std::option::Option::None; - self.special_fields.clear(); - } - - fn default_instance() -> &'static MapReply { - static instance: MapReply = MapReply { - available: ::std::option::Option::None, - region_x: ::std::option::Option::None, - region_y: ::std::option::Option::None, - region_size_x: ::std::option::Option::None, - region_size_y: ::std::option::Option::None, - current_year: ::std::option::Option::None, - current_season: ::std::option::Option::None, - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for MapReply { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("MapReply").unwrap()).clone() - } -} - -impl ::std::fmt::Display for MapReply { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for MapReply { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -// @@protoc_insertion_point(message:isoworldremote.RawNames) -#[derive(PartialEq,Clone,Default,Debug)] -pub struct RawNames { - // message fields - // @@protoc_insertion_point(field:isoworldremote.RawNames.available) - pub available: ::std::option::Option, - // @@protoc_insertion_point(field:isoworldremote.RawNames.inorganic) - pub inorganic: ::std::vec::Vec<::std::string::String>, - // @@protoc_insertion_point(field:isoworldremote.RawNames.organic) - pub organic: ::std::vec::Vec<::std::string::String>, - // special fields - // @@protoc_insertion_point(special_field:isoworldremote.RawNames.special_fields) - pub special_fields: ::protobuf::SpecialFields, -} - -impl<'a> ::std::default::Default for &'a RawNames { - fn default() -> &'a RawNames { - ::default_instance() - } -} - -impl RawNames { - pub fn new() -> RawNames { - ::std::default::Default::default() - } - - // required bool available = 1; - - pub fn available(&self) -> bool { - self.available.unwrap_or(false) - } - - pub fn clear_available(&mut self) { - self.available = ::std::option::Option::None; - } - - pub fn has_available(&self) -> bool { - self.available.is_some() - } - - // Param is passed by value, moved - pub fn set_available(&mut self, v: bool) { - self.available = ::std::option::Option::Some(v); - } - - fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(3); - let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "available", - |m: &RawNames| { &m.available }, - |m: &mut RawNames| { &mut m.available }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "inorganic", - |m: &RawNames| { &m.inorganic }, - |m: &mut RawNames| { &mut m.inorganic }, - )); - fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( - "organic", - |m: &RawNames| { &m.organic }, - |m: &mut RawNames| { &mut m.organic }, - )); - ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( - "RawNames", - fields, - oneofs, - ) - } -} - -impl ::protobuf::Message for RawNames { - const NAME: &'static str = "RawNames"; - - fn is_initialized(&self) -> bool { - if self.available.is_none() { - return false; - } - true - } - - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { - while let Some(tag) = is.read_raw_tag_or_eof()? { - match tag { - 8 => { - self.available = ::std::option::Option::Some(is.read_bool()?); - }, - 18 => { - self.inorganic.push(is.read_string()?); - }, - 26 => { - self.organic.push(is.read_string()?); - }, - tag => { - ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; - }, - }; - } - ::std::result::Result::Ok(()) - } - - // Compute sizes of nested messages - #[allow(unused_variables)] - fn compute_size(&self) -> u64 { - let mut my_size = 0; - if let Some(v) = self.available { - my_size += 1 + 1; - } - for value in &self.inorganic { - my_size += ::protobuf::rt::string_size(2, &value); - }; - for value in &self.organic { - my_size += ::protobuf::rt::string_size(3, &value); - }; - my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); - self.special_fields.cached_size().set(my_size as u32); - my_size - } - - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.available { - os.write_bool(1, v)?; - } - for v in &self.inorganic { - os.write_string(2, &v)?; - }; - for v in &self.organic { - os.write_string(3, &v)?; - }; - os.write_unknown_fields(self.special_fields.unknown_fields())?; - ::std::result::Result::Ok(()) - } - - fn special_fields(&self) -> &::protobuf::SpecialFields { - &self.special_fields - } - - fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { - &mut self.special_fields - } - - fn new() -> RawNames { - RawNames::new() - } - - fn clear(&mut self) { - self.available = ::std::option::Option::None; - self.inorganic.clear(); - self.organic.clear(); - self.special_fields.clear(); - } - - fn default_instance() -> &'static RawNames { - static instance: RawNames = RawNames { - available: ::std::option::Option::None, - inorganic: ::std::vec::Vec::new(), - organic: ::std::vec::Vec::new(), - special_fields: ::protobuf::SpecialFields::new(), - }; - &instance - } -} - -impl ::protobuf::MessageFull for RawNames { - fn descriptor() -> ::protobuf::reflect::MessageDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().message_by_package_relative_name("RawNames").unwrap()).clone() - } -} - -impl ::std::fmt::Display for RawNames { - fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - ::protobuf::text_format::fmt(self, f) - } -} - -impl ::protobuf::reflect::ProtobufValue for RawNames { - type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; -} - -#[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] -// @@protoc_insertion_point(enum:isoworldremote.BasicMaterial) -pub enum BasicMaterial { - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.AIR) - AIR = 0, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.OTHER) - OTHER = 1, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.INORGANIC) - INORGANIC = 2, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.LIQUID) - LIQUID = 3, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.PLANT) - PLANT = 4, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicMaterial.WOOD) - WOOD = 5, -} - -impl ::protobuf::Enum for BasicMaterial { - const NAME: &'static str = "BasicMaterial"; - - fn value(&self) -> i32 { - *self as i32 - } - - fn from_i32(value: i32) -> ::std::option::Option { - match value { - 0 => ::std::option::Option::Some(BasicMaterial::AIR), - 1 => ::std::option::Option::Some(BasicMaterial::OTHER), - 2 => ::std::option::Option::Some(BasicMaterial::INORGANIC), - 3 => ::std::option::Option::Some(BasicMaterial::LIQUID), - 4 => ::std::option::Option::Some(BasicMaterial::PLANT), - 5 => ::std::option::Option::Some(BasicMaterial::WOOD), - _ => ::std::option::Option::None - } - } - - fn from_str(str: &str) -> ::std::option::Option { - match str { - "AIR" => ::std::option::Option::Some(BasicMaterial::AIR), - "OTHER" => ::std::option::Option::Some(BasicMaterial::OTHER), - "INORGANIC" => ::std::option::Option::Some(BasicMaterial::INORGANIC), - "LIQUID" => ::std::option::Option::Some(BasicMaterial::LIQUID), - "PLANT" => ::std::option::Option::Some(BasicMaterial::PLANT), - "WOOD" => ::std::option::Option::Some(BasicMaterial::WOOD), - _ => ::std::option::Option::None - } - } - - const VALUES: &'static [BasicMaterial] = &[ - BasicMaterial::AIR, - BasicMaterial::OTHER, - BasicMaterial::INORGANIC, - BasicMaterial::LIQUID, - BasicMaterial::PLANT, - BasicMaterial::WOOD, - ]; -} - -impl ::protobuf::EnumFull for BasicMaterial { - fn enum_descriptor() -> ::protobuf::reflect::EnumDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().enum_by_package_relative_name("BasicMaterial").unwrap()).clone() - } - - fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor { - let index = *self as usize; - Self::enum_descriptor().value_by_index(index) - } -} - -impl ::std::default::Default for BasicMaterial { - fn default() -> Self { - BasicMaterial::AIR - } -} - -impl BasicMaterial { - fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData { - ::protobuf::reflect::GeneratedEnumDescriptorData::new::("BasicMaterial") - } -} - -#[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] -// @@protoc_insertion_point(enum:isoworldremote.LiquidType) -pub enum LiquidType { - // @@protoc_insertion_point(enum_value:isoworldremote.LiquidType.ICE) - ICE = 0, - // @@protoc_insertion_point(enum_value:isoworldremote.LiquidType.WATER) - WATER = 1, - // @@protoc_insertion_point(enum_value:isoworldremote.LiquidType.MAGMA) - MAGMA = 2, -} - -impl ::protobuf::Enum for LiquidType { - const NAME: &'static str = "LiquidType"; - - fn value(&self) -> i32 { - *self as i32 - } - - fn from_i32(value: i32) -> ::std::option::Option { - match value { - 0 => ::std::option::Option::Some(LiquidType::ICE), - 1 => ::std::option::Option::Some(LiquidType::WATER), - 2 => ::std::option::Option::Some(LiquidType::MAGMA), - _ => ::std::option::Option::None - } - } - - fn from_str(str: &str) -> ::std::option::Option { - match str { - "ICE" => ::std::option::Option::Some(LiquidType::ICE), - "WATER" => ::std::option::Option::Some(LiquidType::WATER), - "MAGMA" => ::std::option::Option::Some(LiquidType::MAGMA), - _ => ::std::option::Option::None - } - } - - const VALUES: &'static [LiquidType] = &[ - LiquidType::ICE, - LiquidType::WATER, - LiquidType::MAGMA, - ]; -} - -impl ::protobuf::EnumFull for LiquidType { - fn enum_descriptor() -> ::protobuf::reflect::EnumDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().enum_by_package_relative_name("LiquidType").unwrap()).clone() - } - - fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor { - let index = *self as usize; - Self::enum_descriptor().value_by_index(index) - } -} - -impl ::std::default::Default for LiquidType { - fn default() -> Self { - LiquidType::ICE - } -} - -impl LiquidType { - fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData { - ::protobuf::reflect::GeneratedEnumDescriptorData::new::("LiquidType") - } -} - -#[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)] -// @@protoc_insertion_point(enum:isoworldremote.BasicShape) -pub enum BasicShape { - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.NONE) - NONE = 0, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.OPEN) - OPEN = 1, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.WALL) - WALL = 3, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.FLOOR) - FLOOR = 4, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.RAMP_UP) - RAMP_UP = 5, - // @@protoc_insertion_point(enum_value:isoworldremote.BasicShape.RAMP_DOWN) - RAMP_DOWN = 6, -} - -impl ::protobuf::Enum for BasicShape { - const NAME: &'static str = "BasicShape"; - - fn value(&self) -> i32 { - *self as i32 - } - - fn from_i32(value: i32) -> ::std::option::Option { - match value { - 0 => ::std::option::Option::Some(BasicShape::NONE), - 1 => ::std::option::Option::Some(BasicShape::OPEN), - 3 => ::std::option::Option::Some(BasicShape::WALL), - 4 => ::std::option::Option::Some(BasicShape::FLOOR), - 5 => ::std::option::Option::Some(BasicShape::RAMP_UP), - 6 => ::std::option::Option::Some(BasicShape::RAMP_DOWN), - _ => ::std::option::Option::None - } - } - - fn from_str(str: &str) -> ::std::option::Option { - match str { - "NONE" => ::std::option::Option::Some(BasicShape::NONE), - "OPEN" => ::std::option::Option::Some(BasicShape::OPEN), - "WALL" => ::std::option::Option::Some(BasicShape::WALL), - "FLOOR" => ::std::option::Option::Some(BasicShape::FLOOR), - "RAMP_UP" => ::std::option::Option::Some(BasicShape::RAMP_UP), - "RAMP_DOWN" => ::std::option::Option::Some(BasicShape::RAMP_DOWN), - _ => ::std::option::Option::None - } - } - - const VALUES: &'static [BasicShape] = &[ - BasicShape::NONE, - BasicShape::OPEN, - BasicShape::WALL, - BasicShape::FLOOR, - BasicShape::RAMP_UP, - BasicShape::RAMP_DOWN, - ]; -} - -impl ::protobuf::EnumFull for BasicShape { - fn enum_descriptor() -> ::protobuf::reflect::EnumDescriptor { - static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::Lazy::new(); - descriptor.get(|| file_descriptor().enum_by_package_relative_name("BasicShape").unwrap()).clone() - } - - fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor { - let index = match self { - BasicShape::NONE => 0, - BasicShape::OPEN => 1, - BasicShape::WALL => 2, - BasicShape::FLOOR => 3, - BasicShape::RAMP_UP => 4, - BasicShape::RAMP_DOWN => 5, - }; - Self::enum_descriptor().value_by_index(index) - } -} - -impl ::std::default::Default for BasicShape { - fn default() -> Self { - BasicShape::NONE - } -} - -impl BasicShape { - fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData { - ::protobuf::reflect::GeneratedEnumDescriptorData::new::("BasicShape") - } -} - -static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x14isoworldremote.proto\x12\x0eisoworldremote\"M\n\x0fColorDefinition\ - \x12\x10\n\x03red\x18\x01\x20\x02(\x05R\x03red\x12\x14\n\x05green\x18\ - \x02\x20\x02(\x05R\x05green\x12\x12\n\x04blue\x18\x03\x20\x02(\x05R\x04b\ - lue\"\x9f\x02\n\x0fEmbarkTileLayer\x12G\n\x0emat_type_table\x18\x04\x20\ - \x03(\x0e2\x1d.isoworldremote.BasicMaterialR\x0cmatTypeTableB\x02\x10\ - \x01\x12.\n\x11mat_subtype_table\x18\x05\x20\x03(\x05R\x0fmatSubtypeTabl\ - eB\x02\x10\x01\x12H\n\x10tile_shape_table\x18\x06\x20\x03(\x0e2\x1a.isow\ - orldremote.BasicShapeR\x0etileShapeTableB\x02\x10\x01\x12I\n\x10tile_col\ - or_table\x18\x07\x20\x03(\x0b2\x1f.isoworldremote.ColorDefinitionR\x0eti\ - leColorTable\"\xfc\x01\n\nEmbarkTile\x12\x17\n\x07world_x\x18\x01\x20\ - \x02(\x05R\x06worldX\x12\x17\n\x07world_y\x18\x02\x20\x02(\x05R\x06world\ - Y\x12\x17\n\x07world_z\x18\x03\x20\x02(\x11R\x06worldZ\x12>\n\ntile_laye\ - r\x18\x04\x20\x03(\x0b2\x1f.isoworldremote.EmbarkTileLayerR\ttileLayer\ - \x12!\n\x0ccurrent_year\x18\x05\x20\x01(\x05R\x0bcurrentYear\x12%\n\x0ec\ - urrent_season\x18\x06\x20\x01(\x05R\rcurrentSeason\x12\x19\n\x08is_valid\ - \x18\x07\x20\x01(\x08R\x07isValid\";\n\x0bTileRequest\x12\x15\n\x06want_\ - x\x18\x01\x20\x01(\x05R\x05wantX\x12\x15\n\x06want_y\x18\x02\x20\x01(\ - \x05R\x05wantY\"-\n\nMapRequest\x12\x1f\n\x0bsave_folder\x18\x01\x20\x01\ - (\tR\nsaveFolder\"\xf0\x01\n\x08MapReply\x12\x1c\n\tavailable\x18\x01\ - \x20\x02(\x08R\tavailable\x12\x19\n\x08region_x\x18\x02\x20\x01(\x05R\ - \x07regionX\x12\x19\n\x08region_y\x18\x03\x20\x01(\x05R\x07regionY\x12\"\ - \n\rregion_size_x\x18\x04\x20\x01(\x05R\x0bregionSizeX\x12\"\n\rregion_s\ - ize_y\x18\x05\x20\x01(\x05R\x0bregionSizeY\x12!\n\x0ccurrent_year\x18\ - \x06\x20\x01(\x05R\x0bcurrentYear\x12%\n\x0ecurrent_season\x18\x07\x20\ - \x01(\x05R\rcurrentSeason\"`\n\x08RawNames\x12\x1c\n\tavailable\x18\x01\ - \x20\x02(\x08R\tavailable\x12\x1c\n\tinorganic\x18\x02\x20\x03(\tR\tinor\ - ganic\x12\x18\n\x07organic\x18\x03\x20\x03(\tR\x07organic*S\n\rBasicMate\ - rial\x12\x07\n\x03AIR\x10\0\x12\t\n\x05OTHER\x10\x01\x12\r\n\tINORGANIC\ - \x10\x02\x12\n\n\x06LIQUID\x10\x03\x12\t\n\x05PLANT\x10\x04\x12\x08\n\ - \x04WOOD\x10\x05*+\n\nLiquidType\x12\x07\n\x03ICE\x10\0\x12\t\n\x05WATER\ - \x10\x01\x12\t\n\x05MAGMA\x10\x02*Q\n\nBasicShape\x12\x08\n\x04NONE\x10\ - \0\x12\x08\n\x04OPEN\x10\x01\x12\x08\n\x04WALL\x10\x03\x12\t\n\x05FLOOR\ - \x10\x04\x12\x0b\n\x07RAMP_UP\x10\x05\x12\r\n\tRAMP_DOWN\x10\x06B\x02H\ - \x03b\x06proto2\ -"; - -/// `FileDescriptorProto` object which was a source for this generated file -fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - static file_descriptor_proto_lazy: ::protobuf::rt::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::Lazy::new(); - file_descriptor_proto_lazy.get(|| { - ::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap() - }) -} - -/// `FileDescriptor` object which allows dynamic access to files -pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { - static generated_file_descriptor_lazy: ::protobuf::rt::Lazy<::protobuf::reflect::GeneratedFileDescriptor> = ::protobuf::rt::Lazy::new(); - static file_descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::FileDescriptor> = ::protobuf::rt::Lazy::new(); - file_descriptor.get(|| { - let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { - let mut deps = ::std::vec::Vec::with_capacity(0); - let mut messages = ::std::vec::Vec::with_capacity(7); - messages.push(ColorDefinition::generated_message_descriptor_data()); - messages.push(EmbarkTileLayer::generated_message_descriptor_data()); - messages.push(EmbarkTile::generated_message_descriptor_data()); - messages.push(TileRequest::generated_message_descriptor_data()); - messages.push(MapRequest::generated_message_descriptor_data()); - messages.push(MapReply::generated_message_descriptor_data()); - messages.push(RawNames::generated_message_descriptor_data()); - let mut enums = ::std::vec::Vec::with_capacity(3); - enums.push(BasicMaterial::generated_enum_descriptor_data()); - enums.push(LiquidType::generated_enum_descriptor_data()); - enums.push(BasicShape::generated_enum_descriptor_data()); - ::protobuf::reflect::GeneratedFileDescriptor::new_generated( - file_descriptor_proto(), - deps, - messages, - enums, - ) - }); - ::protobuf::reflect::FileDescriptor::new_generated_2(generated_file_descriptor) - }) -} diff --git a/dfhack-proto/src/generated/messages/mod.rs b/dfhack-proto/src/generated/messages/mod.rs index 41b3c66..557b435 100644 --- a/dfhack-proto/src/generated/messages/mod.rs +++ b/dfhack-proto/src/generated/messages/mod.rs @@ -12,10 +12,8 @@ mod ItemdefInstrument; pub use self::ItemdefInstrument::*; mod RemoteFortressReader; pub use self::RemoteFortressReader::*; -mod isoworldremote; -pub use self::isoworldremote::*; -mod rename; -pub use self::rename::*; +mod example; +pub use self::example::*; mod stockpiles; pub use self::stockpiles::*; mod ui_sidebar_mode; diff --git a/dfhack-proto/src/generated/messages/stockpiles.rs b/dfhack-proto/src/generated/messages/stockpiles.rs index 36108bf..d725b97 100644 --- a/dfhack-proto/src/generated/messages/stockpiles.rs +++ b/dfhack-proto/src/generated/messages/stockpiles.rs @@ -28,54 +28,58 @@ const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_2; #[derive(PartialEq,Clone,Default,Debug)] pub struct StockpileSettings { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_barrels) + pub max_barrels: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_bins) + pub max_bins: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_wheelbarrows) + pub max_wheelbarrows: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.use_links_only) + pub use_links_only: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.allow_organic) + pub allow_organic: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.allow_inorganic) + pub allow_inorganic: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ammo) + pub ammo: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.animals) pub animals: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.armor) + pub armor: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.barsblocks) + pub barsblocks: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.cloth) + pub cloth: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.coin) + pub coin: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.finished_goods) + pub finished_goods: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.food) pub food: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.furniture) pub furniture: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.unknown1) - pub unknown1: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.refuse) - pub refuse: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.stone) - pub stone: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ore) - pub ore: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ammo) - pub ammo: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.coin) - pub coin: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.barsblocks) - pub barsblocks: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.gems) pub gems: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.finished_goods) - pub finished_goods: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.leather) pub leather: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.cloth) - pub cloth: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.wood) - pub wood: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.corpses_v50) + pub corpses_v50: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.refuse) + pub refuse: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.sheet) + pub sheet: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.stone) + pub stone: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.weapons) pub weapons: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.armor) - pub armor: ::protobuf::MessageField, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.allow_organic) - pub allow_organic: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.allow_inorganic) - pub allow_inorganic: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.wood) + pub wood: ::protobuf::MessageField, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.corpses) pub corpses: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_barrels) - pub max_barrels: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_bins) - pub max_bins: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.max_wheelbarrows) - pub max_wheelbarrows: ::std::option::Option, - // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.use_links_only) - pub use_links_only: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ore) + pub ore: ::protobuf::MessageField, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.unknown1) + pub unknown1: ::std::option::Option, // special fields // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -92,280 +96,290 @@ impl StockpileSettings { ::std::default::Default::default() } - // optional int32 unknown1 = 4; + // optional int32 max_barrels = 20; - pub fn unknown1(&self) -> i32 { - self.unknown1.unwrap_or(0) + pub fn max_barrels(&self) -> i32 { + self.max_barrels.unwrap_or(0) } - pub fn clear_unknown1(&mut self) { - self.unknown1 = ::std::option::Option::None; + pub fn clear_max_barrels(&mut self) { + self.max_barrels = ::std::option::Option::None; } - pub fn has_unknown1(&self) -> bool { - self.unknown1.is_some() + pub fn has_max_barrels(&self) -> bool { + self.max_barrels.is_some() } // Param is passed by value, moved - pub fn set_unknown1(&mut self, v: i32) { - self.unknown1 = ::std::option::Option::Some(v); + pub fn set_max_barrels(&mut self, v: i32) { + self.max_barrels = ::std::option::Option::Some(v); } - // optional bool allow_organic = 18; + // optional int32 max_bins = 21; - pub fn allow_organic(&self) -> bool { - self.allow_organic.unwrap_or(false) + pub fn max_bins(&self) -> i32 { + self.max_bins.unwrap_or(0) } - pub fn clear_allow_organic(&mut self) { - self.allow_organic = ::std::option::Option::None; + pub fn clear_max_bins(&mut self) { + self.max_bins = ::std::option::Option::None; } - pub fn has_allow_organic(&self) -> bool { - self.allow_organic.is_some() + pub fn has_max_bins(&self) -> bool { + self.max_bins.is_some() } // Param is passed by value, moved - pub fn set_allow_organic(&mut self, v: bool) { - self.allow_organic = ::std::option::Option::Some(v); + pub fn set_max_bins(&mut self, v: i32) { + self.max_bins = ::std::option::Option::Some(v); } - // optional bool allow_inorganic = 19; + // optional int32 max_wheelbarrows = 22; - pub fn allow_inorganic(&self) -> bool { - self.allow_inorganic.unwrap_or(false) + pub fn max_wheelbarrows(&self) -> i32 { + self.max_wheelbarrows.unwrap_or(0) } - pub fn clear_allow_inorganic(&mut self) { - self.allow_inorganic = ::std::option::Option::None; + pub fn clear_max_wheelbarrows(&mut self) { + self.max_wheelbarrows = ::std::option::Option::None; } - pub fn has_allow_inorganic(&self) -> bool { - self.allow_inorganic.is_some() + pub fn has_max_wheelbarrows(&self) -> bool { + self.max_wheelbarrows.is_some() } // Param is passed by value, moved - pub fn set_allow_inorganic(&mut self, v: bool) { - self.allow_inorganic = ::std::option::Option::Some(v); + pub fn set_max_wheelbarrows(&mut self, v: i32) { + self.max_wheelbarrows = ::std::option::Option::Some(v); } - // optional bool corpses = 24; + // optional bool use_links_only = 23; - pub fn corpses(&self) -> bool { - self.corpses.unwrap_or(false) + pub fn use_links_only(&self) -> bool { + self.use_links_only.unwrap_or(false) } - pub fn clear_corpses(&mut self) { - self.corpses = ::std::option::Option::None; + pub fn clear_use_links_only(&mut self) { + self.use_links_only = ::std::option::Option::None; } - pub fn has_corpses(&self) -> bool { - self.corpses.is_some() + pub fn has_use_links_only(&self) -> bool { + self.use_links_only.is_some() } // Param is passed by value, moved - pub fn set_corpses(&mut self, v: bool) { - self.corpses = ::std::option::Option::Some(v); + pub fn set_use_links_only(&mut self, v: bool) { + self.use_links_only = ::std::option::Option::Some(v); } - // optional int32 max_barrels = 20; + // optional bool allow_organic = 18; - pub fn max_barrels(&self) -> i32 { - self.max_barrels.unwrap_or(0) + pub fn allow_organic(&self) -> bool { + self.allow_organic.unwrap_or(false) } - pub fn clear_max_barrels(&mut self) { - self.max_barrels = ::std::option::Option::None; + pub fn clear_allow_organic(&mut self) { + self.allow_organic = ::std::option::Option::None; } - pub fn has_max_barrels(&self) -> bool { - self.max_barrels.is_some() + pub fn has_allow_organic(&self) -> bool { + self.allow_organic.is_some() } // Param is passed by value, moved - pub fn set_max_barrels(&mut self, v: i32) { - self.max_barrels = ::std::option::Option::Some(v); + pub fn set_allow_organic(&mut self, v: bool) { + self.allow_organic = ::std::option::Option::Some(v); } - // optional int32 max_bins = 21; + // optional bool allow_inorganic = 19; - pub fn max_bins(&self) -> i32 { - self.max_bins.unwrap_or(0) + pub fn allow_inorganic(&self) -> bool { + self.allow_inorganic.unwrap_or(false) } - pub fn clear_max_bins(&mut self) { - self.max_bins = ::std::option::Option::None; + pub fn clear_allow_inorganic(&mut self) { + self.allow_inorganic = ::std::option::Option::None; } - pub fn has_max_bins(&self) -> bool { - self.max_bins.is_some() + pub fn has_allow_inorganic(&self) -> bool { + self.allow_inorganic.is_some() } // Param is passed by value, moved - pub fn set_max_bins(&mut self, v: i32) { - self.max_bins = ::std::option::Option::Some(v); + pub fn set_allow_inorganic(&mut self, v: bool) { + self.allow_inorganic = ::std::option::Option::Some(v); } - // optional int32 max_wheelbarrows = 22; + // optional bool corpses = 24; - pub fn max_wheelbarrows(&self) -> i32 { - self.max_wheelbarrows.unwrap_or(0) + pub fn corpses(&self) -> bool { + self.corpses.unwrap_or(false) } - pub fn clear_max_wheelbarrows(&mut self) { - self.max_wheelbarrows = ::std::option::Option::None; + pub fn clear_corpses(&mut self) { + self.corpses = ::std::option::Option::None; } - pub fn has_max_wheelbarrows(&self) -> bool { - self.max_wheelbarrows.is_some() + pub fn has_corpses(&self) -> bool { + self.corpses.is_some() } // Param is passed by value, moved - pub fn set_max_wheelbarrows(&mut self, v: i32) { - self.max_wheelbarrows = ::std::option::Option::Some(v); + pub fn set_corpses(&mut self, v: bool) { + self.corpses = ::std::option::Option::Some(v); } - // optional bool use_links_only = 23; + // optional int32 unknown1 = 4; - pub fn use_links_only(&self) -> bool { - self.use_links_only.unwrap_or(false) + pub fn unknown1(&self) -> i32 { + self.unknown1.unwrap_or(0) } - pub fn clear_use_links_only(&mut self) { - self.use_links_only = ::std::option::Option::None; + pub fn clear_unknown1(&mut self) { + self.unknown1 = ::std::option::Option::None; } - pub fn has_use_links_only(&self) -> bool { - self.use_links_only.is_some() + pub fn has_unknown1(&self) -> bool { + self.unknown1.is_some() } // Param is passed by value, moved - pub fn set_use_links_only(&mut self, v: bool) { - self.use_links_only = ::std::option::Option::Some(v); + pub fn set_unknown1(&mut self, v: i32) { + self.unknown1 = ::std::option::Option::Some(v); } fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(24); + let mut fields = ::std::vec::Vec::with_capacity(26); let mut oneofs = ::std::vec::Vec::with_capacity(0); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::AnimalsSet>( - "animals", - |m: &StockpileSettings| { &m.animals }, - |m: &mut StockpileSettings| { &mut m.animals }, - )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::FoodSet>( - "food", - |m: &StockpileSettings| { &m.food }, - |m: &mut StockpileSettings| { &mut m.food }, + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "max_barrels", + |m: &StockpileSettings| { &m.max_barrels }, + |m: &mut StockpileSettings| { &mut m.max_barrels }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::FurnitureSet>( - "furniture", - |m: &StockpileSettings| { &m.furniture }, - |m: &mut StockpileSettings| { &mut m.furniture }, + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "max_bins", + |m: &StockpileSettings| { &m.max_bins }, + |m: &mut StockpileSettings| { &mut m.max_bins }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "unknown1", - |m: &StockpileSettings| { &m.unknown1 }, - |m: &mut StockpileSettings| { &mut m.unknown1 }, + "max_wheelbarrows", + |m: &StockpileSettings| { &m.max_wheelbarrows }, + |m: &mut StockpileSettings| { &mut m.max_wheelbarrows }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::RefuseSet>( - "refuse", - |m: &StockpileSettings| { &m.refuse }, - |m: &mut StockpileSettings| { &mut m.refuse }, + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "use_links_only", + |m: &StockpileSettings| { &m.use_links_only }, + |m: &mut StockpileSettings| { &mut m.use_links_only }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::StoneSet>( - "stone", - |m: &StockpileSettings| { &m.stone }, - |m: &mut StockpileSettings| { &mut m.stone }, + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "allow_organic", + |m: &StockpileSettings| { &m.allow_organic }, + |m: &mut StockpileSettings| { &mut m.allow_organic }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::OreSet>( - "ore", - |m: &StockpileSettings| { &m.ore }, - |m: &mut StockpileSettings| { &mut m.ore }, + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "allow_inorganic", + |m: &StockpileSettings| { &m.allow_inorganic }, + |m: &mut StockpileSettings| { &mut m.allow_inorganic }, )); fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::AmmoSet>( "ammo", |m: &StockpileSettings| { &m.ammo }, |m: &mut StockpileSettings| { &mut m.ammo }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::CoinSet>( - "coin", - |m: &StockpileSettings| { &m.coin }, - |m: &mut StockpileSettings| { &mut m.coin }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::AnimalsSet>( + "animals", + |m: &StockpileSettings| { &m.animals }, + |m: &mut StockpileSettings| { &mut m.animals }, + )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::ArmorSet>( + "armor", + |m: &StockpileSettings| { &m.armor }, + |m: &mut StockpileSettings| { &mut m.armor }, )); fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::BarsBlocksSet>( "barsblocks", |m: &StockpileSettings| { &m.barsblocks }, |m: &mut StockpileSettings| { &mut m.barsblocks }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::GemsSet>( - "gems", - |m: &StockpileSettings| { &m.gems }, - |m: &mut StockpileSettings| { &mut m.gems }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::ClothSet>( + "cloth", + |m: &StockpileSettings| { &m.cloth }, + |m: &mut StockpileSettings| { &mut m.cloth }, + )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::CoinSet>( + "coin", + |m: &StockpileSettings| { &m.coin }, + |m: &mut StockpileSettings| { &mut m.coin }, )); fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::FinishedGoodsSet>( "finished_goods", |m: &StockpileSettings| { &m.finished_goods }, |m: &mut StockpileSettings| { &mut m.finished_goods }, )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::FoodSet>( + "food", + |m: &StockpileSettings| { &m.food }, + |m: &mut StockpileSettings| { &mut m.food }, + )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::FurnitureSet>( + "furniture", + |m: &StockpileSettings| { &m.furniture }, + |m: &mut StockpileSettings| { &mut m.furniture }, + )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::GemsSet>( + "gems", + |m: &StockpileSettings| { &m.gems }, + |m: &mut StockpileSettings| { &mut m.gems }, + )); fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::LeatherSet>( "leather", |m: &StockpileSettings| { &m.leather }, |m: &mut StockpileSettings| { &mut m.leather }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::ClothSet>( - "cloth", - |m: &StockpileSettings| { &m.cloth }, - |m: &mut StockpileSettings| { &mut m.cloth }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::CorpsesSet>( + "corpses_v50", + |m: &StockpileSettings| { &m.corpses_v50 }, + |m: &mut StockpileSettings| { &mut m.corpses_v50 }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::WoodSet>( - "wood", - |m: &StockpileSettings| { &m.wood }, - |m: &mut StockpileSettings| { &mut m.wood }, - )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::WeaponsSet>( - "weapons", - |m: &StockpileSettings| { &m.weapons }, - |m: &mut StockpileSettings| { &mut m.weapons }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::RefuseSet>( + "refuse", + |m: &StockpileSettings| { &m.refuse }, + |m: &mut StockpileSettings| { &mut m.refuse }, )); - fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::ArmorSet>( - "armor", - |m: &StockpileSettings| { &m.armor }, - |m: &mut StockpileSettings| { &mut m.armor }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::SheetSet>( + "sheet", + |m: &StockpileSettings| { &m.sheet }, + |m: &mut StockpileSettings| { &mut m.sheet }, )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "allow_organic", - |m: &StockpileSettings| { &m.allow_organic }, - |m: &mut StockpileSettings| { &mut m.allow_organic }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::StoneSet>( + "stone", + |m: &StockpileSettings| { &m.stone }, + |m: &mut StockpileSettings| { &mut m.stone }, )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "allow_inorganic", - |m: &StockpileSettings| { &m.allow_inorganic }, - |m: &mut StockpileSettings| { &mut m.allow_inorganic }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::WeaponsSet>( + "weapons", + |m: &StockpileSettings| { &m.weapons }, + |m: &mut StockpileSettings| { &mut m.weapons }, + )); + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::WoodSet>( + "wood", + |m: &StockpileSettings| { &m.wood }, + |m: &mut StockpileSettings| { &mut m.wood }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "corpses", |m: &StockpileSettings| { &m.corpses }, |m: &mut StockpileSettings| { &mut m.corpses }, )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "max_barrels", - |m: &StockpileSettings| { &m.max_barrels }, - |m: &mut StockpileSettings| { &mut m.max_barrels }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "max_bins", - |m: &StockpileSettings| { &m.max_bins }, - |m: &mut StockpileSettings| { &mut m.max_bins }, - )); - fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "max_wheelbarrows", - |m: &StockpileSettings| { &m.max_wheelbarrows }, - |m: &mut StockpileSettings| { &mut m.max_wheelbarrows }, + fields.push(::protobuf::reflect::rt::v2::make_message_field_accessor::<_, stockpile_settings::OreSet>( + "ore", + |m: &StockpileSettings| { &m.ore }, + |m: &mut StockpileSettings| { &mut m.ore }, )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( - "use_links_only", - |m: &StockpileSettings| { &m.use_links_only }, - |m: &mut StockpileSettings| { &mut m.use_links_only }, + "unknown1", + |m: &StockpileSettings| { &m.unknown1 }, + |m: &mut StockpileSettings| { &mut m.unknown1 }, )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "StockpileSettings", @@ -385,77 +399,83 @@ impl ::protobuf::Message for StockpileSettings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { - 10 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.animals)?; - }, - 18 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.food)?; + 160 => { + self.max_barrels = ::std::option::Option::Some(is.read_int32()?); }, - 26 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.furniture)?; + 168 => { + self.max_bins = ::std::option::Option::Some(is.read_int32()?); }, - 32 => { - self.unknown1 = ::std::option::Option::Some(is.read_int32()?); + 176 => { + self.max_wheelbarrows = ::std::option::Option::Some(is.read_int32()?); }, - 42 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.refuse)?; + 184 => { + self.use_links_only = ::std::option::Option::Some(is.read_bool()?); }, - 50 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.stone)?; + 144 => { + self.allow_organic = ::std::option::Option::Some(is.read_bool()?); }, - 58 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.ore)?; + 152 => { + self.allow_inorganic = ::std::option::Option::Some(is.read_bool()?); }, 66 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.ammo)?; }, - 74 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.coin)?; + 10 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.animals)?; + }, + 138 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.armor)?; }, 82 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.barsblocks)?; }, - 90 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.gems)?; + 114 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.cloth)?; + }, + 74 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.coin)?; }, 98 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.finished_goods)?; }, + 18 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.food)?; + }, + 26 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.furniture)?; + }, + 90 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.gems)?; + }, 106 => { ::protobuf::rt::read_singular_message_into_field(is, &mut self.leather)?; }, - 114 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.cloth)?; + 202 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.corpses_v50)?; }, - 122 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.wood)?; + 42 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.refuse)?; }, - 130 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.weapons)?; + 210 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.sheet)?; }, - 138 => { - ::protobuf::rt::read_singular_message_into_field(is, &mut self.armor)?; + 50 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.stone)?; }, - 144 => { - self.allow_organic = ::std::option::Option::Some(is.read_bool()?); + 130 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.weapons)?; }, - 152 => { - self.allow_inorganic = ::std::option::Option::Some(is.read_bool()?); + 122 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.wood)?; }, 192 => { self.corpses = ::std::option::Option::Some(is.read_bool()?); }, - 160 => { - self.max_barrels = ::std::option::Option::Some(is.read_int32()?); - }, - 168 => { - self.max_bins = ::std::option::Option::Some(is.read_int32()?); - }, - 176 => { - self.max_wheelbarrows = ::std::option::Option::Some(is.read_int32()?); + 58 => { + ::protobuf::rt::read_singular_message_into_field(is, &mut self.ore)?; }, - 184 => { - self.use_links_only = ::std::option::Option::Some(is.read_bool()?); + 32 => { + self.unknown1 = ::std::option::Option::Some(is.read_int32()?); }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; @@ -469,42 +489,57 @@ impl ::protobuf::Message for StockpileSettings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; - if let Some(v) = self.animals.as_ref() { - let len = v.compute_size(); - my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; + if let Some(v) = self.max_barrels { + my_size += ::protobuf::rt::int32_size(20, v); } - if let Some(v) = self.food.as_ref() { + if let Some(v) = self.max_bins { + my_size += ::protobuf::rt::int32_size(21, v); + } + if let Some(v) = self.max_wheelbarrows { + my_size += ::protobuf::rt::int32_size(22, v); + } + if let Some(v) = self.use_links_only { + my_size += 2 + 1; + } + if let Some(v) = self.allow_organic { + my_size += 2 + 1; + } + if let Some(v) = self.allow_inorganic { + my_size += 2 + 1; + } + if let Some(v) = self.ammo.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.furniture.as_ref() { + if let Some(v) = self.animals.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.unknown1 { - my_size += ::protobuf::rt::int32_size(4, v); + if let Some(v) = self.armor.as_ref() { + let len = v.compute_size(); + my_size += 2 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.refuse.as_ref() { + if let Some(v) = self.barsblocks.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.stone.as_ref() { + if let Some(v) = self.cloth.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.ore.as_ref() { + if let Some(v) = self.coin.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.ammo.as_ref() { + if let Some(v) = self.finished_goods.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.coin.as_ref() { + if let Some(v) = self.food.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.barsblocks.as_ref() { + if let Some(v) = self.furniture.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } @@ -512,19 +547,23 @@ impl ::protobuf::Message for StockpileSettings { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.finished_goods.as_ref() { + if let Some(v) = self.leather.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.leather.as_ref() { + if let Some(v) = self.corpses_v50.as_ref() { let len = v.compute_size(); - my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; + my_size += 2 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.cloth.as_ref() { + if let Some(v) = self.refuse.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.wood.as_ref() { + if let Some(v) = self.sheet.as_ref() { + let len = v.compute_size(); + my_size += 2 + ::protobuf::rt::compute_raw_varint64_size(len) + len; + } + if let Some(v) = self.stone.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } @@ -532,30 +571,19 @@ impl ::protobuf::Message for StockpileSettings { let len = v.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.armor.as_ref() { + if let Some(v) = self.wood.as_ref() { let len = v.compute_size(); - my_size += 2 + ::protobuf::rt::compute_raw_varint64_size(len) + len; - } - if let Some(v) = self.allow_organic { - my_size += 2 + 1; - } - if let Some(v) = self.allow_inorganic { - my_size += 2 + 1; + my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } if let Some(v) = self.corpses { my_size += 2 + 1; } - if let Some(v) = self.max_barrels { - my_size += ::protobuf::rt::int32_size(20, v); - } - if let Some(v) = self.max_bins { - my_size += ::protobuf::rt::int32_size(21, v); - } - if let Some(v) = self.max_wheelbarrows { - my_size += ::protobuf::rt::int32_size(22, v); + if let Some(v) = self.ore.as_ref() { + let len = v.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len; } - if let Some(v) = self.use_links_only { - my_size += 2 + 1; + if let Some(v) = self.unknown1 { + my_size += ::protobuf::rt::int32_size(4, v); } my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); @@ -563,77 +591,83 @@ impl ::protobuf::Message for StockpileSettings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { - if let Some(v) = self.animals.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(1, v, os)?; - } - if let Some(v) = self.food.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(2, v, os)?; + if let Some(v) = self.max_barrels { + os.write_int32(20, v)?; } - if let Some(v) = self.furniture.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(3, v, os)?; + if let Some(v) = self.max_bins { + os.write_int32(21, v)?; } - if let Some(v) = self.unknown1 { - os.write_int32(4, v)?; + if let Some(v) = self.max_wheelbarrows { + os.write_int32(22, v)?; } - if let Some(v) = self.refuse.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(5, v, os)?; + if let Some(v) = self.use_links_only { + os.write_bool(23, v)?; } - if let Some(v) = self.stone.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(6, v, os)?; + if let Some(v) = self.allow_organic { + os.write_bool(18, v)?; } - if let Some(v) = self.ore.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(7, v, os)?; + if let Some(v) = self.allow_inorganic { + os.write_bool(19, v)?; } if let Some(v) = self.ammo.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(8, v, os)?; } - if let Some(v) = self.coin.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(9, v, os)?; + if let Some(v) = self.animals.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(1, v, os)?; + } + if let Some(v) = self.armor.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(17, v, os)?; } if let Some(v) = self.barsblocks.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(10, v, os)?; } - if let Some(v) = self.gems.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(11, v, os)?; + if let Some(v) = self.cloth.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(14, v, os)?; + } + if let Some(v) = self.coin.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(9, v, os)?; } if let Some(v) = self.finished_goods.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(12, v, os)?; } + if let Some(v) = self.food.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(2, v, os)?; + } + if let Some(v) = self.furniture.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(3, v, os)?; + } + if let Some(v) = self.gems.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(11, v, os)?; + } if let Some(v) = self.leather.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(13, v, os)?; } - if let Some(v) = self.cloth.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(14, v, os)?; + if let Some(v) = self.corpses_v50.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(25, v, os)?; + } + if let Some(v) = self.refuse.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(5, v, os)?; } - if let Some(v) = self.wood.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(15, v, os)?; + if let Some(v) = self.sheet.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(26, v, os)?; + } + if let Some(v) = self.stone.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(6, v, os)?; } if let Some(v) = self.weapons.as_ref() { ::protobuf::rt::write_message_field_with_cached_size(16, v, os)?; } - if let Some(v) = self.armor.as_ref() { - ::protobuf::rt::write_message_field_with_cached_size(17, v, os)?; - } - if let Some(v) = self.allow_organic { - os.write_bool(18, v)?; - } - if let Some(v) = self.allow_inorganic { - os.write_bool(19, v)?; + if let Some(v) = self.wood.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(15, v, os)?; } if let Some(v) = self.corpses { os.write_bool(24, v)?; } - if let Some(v) = self.max_barrels { - os.write_int32(20, v)?; - } - if let Some(v) = self.max_bins { - os.write_int32(21, v)?; - } - if let Some(v) = self.max_wheelbarrows { - os.write_int32(22, v)?; + if let Some(v) = self.ore.as_ref() { + ::protobuf::rt::write_message_field_with_cached_size(7, v, os)?; } - if let Some(v) = self.use_links_only { - os.write_bool(23, v)?; + if let Some(v) = self.unknown1 { + os.write_int32(4, v)?; } os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) @@ -652,59 +686,63 @@ impl ::protobuf::Message for StockpileSettings { } fn clear(&mut self) { + self.max_barrels = ::std::option::Option::None; + self.max_bins = ::std::option::Option::None; + self.max_wheelbarrows = ::std::option::Option::None; + self.use_links_only = ::std::option::Option::None; + self.allow_organic = ::std::option::Option::None; + self.allow_inorganic = ::std::option::Option::None; + self.ammo.clear(); self.animals.clear(); + self.armor.clear(); + self.barsblocks.clear(); + self.cloth.clear(); + self.coin.clear(); + self.finished_goods.clear(); self.food.clear(); self.furniture.clear(); - self.unknown1 = ::std::option::Option::None; - self.refuse.clear(); - self.stone.clear(); - self.ore.clear(); - self.ammo.clear(); - self.coin.clear(); - self.barsblocks.clear(); self.gems.clear(); - self.finished_goods.clear(); self.leather.clear(); - self.cloth.clear(); - self.wood.clear(); + self.corpses_v50.clear(); + self.refuse.clear(); + self.sheet.clear(); + self.stone.clear(); self.weapons.clear(); - self.armor.clear(); - self.allow_organic = ::std::option::Option::None; - self.allow_inorganic = ::std::option::Option::None; + self.wood.clear(); self.corpses = ::std::option::Option::None; - self.max_barrels = ::std::option::Option::None; - self.max_bins = ::std::option::Option::None; - self.max_wheelbarrows = ::std::option::Option::None; - self.use_links_only = ::std::option::Option::None; + self.ore.clear(); + self.unknown1 = ::std::option::Option::None; self.special_fields.clear(); } fn default_instance() -> &'static StockpileSettings { static instance: StockpileSettings = StockpileSettings { + max_barrels: ::std::option::Option::None, + max_bins: ::std::option::Option::None, + max_wheelbarrows: ::std::option::Option::None, + use_links_only: ::std::option::Option::None, + allow_organic: ::std::option::Option::None, + allow_inorganic: ::std::option::Option::None, + ammo: ::protobuf::MessageField::none(), animals: ::protobuf::MessageField::none(), + armor: ::protobuf::MessageField::none(), + barsblocks: ::protobuf::MessageField::none(), + cloth: ::protobuf::MessageField::none(), + coin: ::protobuf::MessageField::none(), + finished_goods: ::protobuf::MessageField::none(), food: ::protobuf::MessageField::none(), furniture: ::protobuf::MessageField::none(), - unknown1: ::std::option::Option::None, - refuse: ::protobuf::MessageField::none(), - stone: ::protobuf::MessageField::none(), - ore: ::protobuf::MessageField::none(), - ammo: ::protobuf::MessageField::none(), - coin: ::protobuf::MessageField::none(), - barsblocks: ::protobuf::MessageField::none(), gems: ::protobuf::MessageField::none(), - finished_goods: ::protobuf::MessageField::none(), leather: ::protobuf::MessageField::none(), - cloth: ::protobuf::MessageField::none(), - wood: ::protobuf::MessageField::none(), + corpses_v50: ::protobuf::MessageField::none(), + refuse: ::protobuf::MessageField::none(), + sheet: ::protobuf::MessageField::none(), + stone: ::protobuf::MessageField::none(), weapons: ::protobuf::MessageField::none(), - armor: ::protobuf::MessageField::none(), - allow_organic: ::std::option::Option::None, - allow_inorganic: ::std::option::Option::None, + wood: ::protobuf::MessageField::none(), corpses: ::std::option::Option::None, - max_barrels: ::std::option::Option::None, - max_bins: ::std::option::Option::None, - max_wheelbarrows: ::std::option::Option::None, - use_links_only: ::std::option::Option::None, + ore: ::protobuf::MessageField::none(), + unknown1: ::std::option::Option::None, special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -734,6 +772,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct AnimalsSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AnimalsSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AnimalsSet.empty_cages) pub empty_cages: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AnimalsSet.empty_traps) @@ -756,6 +796,25 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 4; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + // optional bool empty_cages = 1; pub fn empty_cages(&self) -> bool { @@ -795,8 +854,13 @@ pub mod stockpile_settings { } pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(3); + let mut fields = ::std::vec::Vec::with_capacity(4); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &AnimalsSet| { &m.all }, + |m: &mut AnimalsSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( "empty_cages", |m: &AnimalsSet| { &m.empty_cages }, @@ -830,6 +894,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 32 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 8 => { self.empty_cages = ::std::option::Option::Some(is.read_bool()?); }, @@ -851,6 +918,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } if let Some(v) = self.empty_cages { my_size += 1 + 1; } @@ -866,6 +936,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(4, v)?; + } if let Some(v) = self.empty_cages { os.write_bool(1, v)?; } @@ -892,6 +965,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.empty_cages = ::std::option::Option::None; self.empty_traps = ::std::option::Option::None; self.enabled.clear(); @@ -900,6 +974,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static AnimalsSet { static instance: AnimalsSet = AnimalsSet { + all: ::std::option::Option::None, empty_cages: ::std::option::Option::None, empty_traps: ::std::option::Option::None, enabled: ::std::vec::Vec::new(), @@ -930,6 +1005,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct FoodSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FoodSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FoodSet.meat) pub meat: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FoodSet.fish) @@ -986,6 +1063,25 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 21; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + // optional bool prepared_meals = 19; pub fn prepared_meals(&self) -> bool { @@ -1006,8 +1102,13 @@ pub mod stockpile_settings { } pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(20); + let mut fields = ::std::vec::Vec::with_capacity(21); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &FoodSet| { &m.all }, + |m: &mut FoodSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "meat", |m: &FoodSet| { &m.meat }, @@ -1126,6 +1227,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 168 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.meat.push(is.read_string()?); }, @@ -1198,6 +1302,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 2 + 1; + } for value in &self.meat { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -1264,6 +1371,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(21, v)?; + } for v in &self.meat { os.write_string(1, &v)?; }; @@ -1341,6 +1451,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.meat.clear(); self.fish.clear(); self.unprepared_fish.clear(); @@ -1366,6 +1477,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static FoodSet { static instance: FoodSet = FoodSet { + all: ::std::option::Option::None, meat: ::std::vec::Vec::new(), fish: ::std::vec::Vec::new(), unprepared_fish: ::std::vec::Vec::new(), @@ -1413,6 +1525,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct FurnitureSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FurnitureSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FurnitureSet.type) pub type_: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FurnitureSet.other_mats) @@ -1439,9 +1553,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 7; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(5); + let mut fields = ::std::vec::Vec::with_capacity(6); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &FurnitureSet| { &m.all }, + |m: &mut FurnitureSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "type", |m: &FurnitureSet| { &m.type_ }, @@ -1485,6 +1623,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 56 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.type_.push(is.read_string()?); }, @@ -1512,6 +1653,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.type_ { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -1533,6 +1677,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(7, v)?; + } for v in &self.type_ { os.write_string(1, &v)?; }; @@ -1565,6 +1712,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.type_.clear(); self.other_mats.clear(); self.mats.clear(); @@ -1575,6 +1723,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static FurnitureSet { static instance: FurnitureSet = FurnitureSet { + all: ::std::option::Option::None, type_: ::std::vec::Vec::new(), other_mats: ::std::vec::Vec::new(), mats: ::std::vec::Vec::new(), @@ -1607,6 +1756,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct RefuseSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.RefuseSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.RefuseSet.type) pub type_: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.RefuseSet.corpses) @@ -1645,6 +1796,25 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 12; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + // optional bool fresh_raw_hide = 10; pub fn fresh_raw_hide(&self) -> bool { @@ -1684,8 +1854,13 @@ pub mod stockpile_settings { } pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(11); + let mut fields = ::std::vec::Vec::with_capacity(12); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &RefuseSet| { &m.all }, + |m: &mut RefuseSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "type", |m: &RefuseSet| { &m.type_ }, @@ -1759,6 +1934,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 96 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.type_.push(is.read_string()?); }, @@ -1804,6 +1982,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.type_ { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -1843,6 +2024,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(12, v)?; + } for v in &self.type_ { os.write_string(1, &v)?; }; @@ -1893,6 +2077,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.type_.clear(); self.corpses.clear(); self.body_parts.clear(); @@ -1909,6 +2094,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static RefuseSet { static instance: RefuseSet = RefuseSet { + all: ::std::option::Option::None, type_: ::std::vec::Vec::new(), corpses: ::std::vec::Vec::new(), body_parts: ::std::vec::Vec::new(), @@ -1947,6 +2133,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct StoneSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.StoneSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.StoneSet.mats) pub mats: ::std::vec::Vec<::std::string::String>, // special fields @@ -1965,9 +2153,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 2; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(1); + let mut fields = ::std::vec::Vec::with_capacity(2); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &StoneSet| { &m.all }, + |m: &mut StoneSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "mats", |m: &StoneSet| { &m.mats }, @@ -1991,6 +2203,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 16 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.mats.push(is.read_string()?); }, @@ -2006,6 +2221,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.mats { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2015,6 +2233,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(2, v)?; + } for v in &self.mats { os.write_string(1, &v)?; }; @@ -2035,12 +2256,14 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.mats.clear(); self.special_fields.clear(); } fn default_instance() -> &'static StoneSet { static instance: StoneSet = StoneSet { + all: ::std::option::Option::None, mats: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; @@ -2191,6 +2414,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct AmmoSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AmmoSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AmmoSet.type) pub type_: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.AmmoSet.other_mats) @@ -2217,9 +2442,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 6; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(5); + let mut fields = ::std::vec::Vec::with_capacity(6); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &AmmoSet| { &m.all }, + |m: &mut AmmoSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "type", |m: &AmmoSet| { &m.type_ }, @@ -2263,6 +2512,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 48 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.type_.push(is.read_string()?); }, @@ -2290,6 +2542,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.type_ { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2311,6 +2566,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(6, v)?; + } for v in &self.type_ { os.write_string(1, &v)?; }; @@ -2343,6 +2601,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.type_.clear(); self.other_mats.clear(); self.mats.clear(); @@ -2353,6 +2612,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static AmmoSet { static instance: AmmoSet = AmmoSet { + all: ::std::option::Option::None, type_: ::std::vec::Vec::new(), other_mats: ::std::vec::Vec::new(), mats: ::std::vec::Vec::new(), @@ -2385,6 +2645,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct CoinSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.CoinSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.CoinSet.mats) pub mats: ::std::vec::Vec<::std::string::String>, // special fields @@ -2403,9 +2665,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 2; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(1); + let mut fields = ::std::vec::Vec::with_capacity(2); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &CoinSet| { &m.all }, + |m: &mut CoinSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "mats", |m: &CoinSet| { &m.mats }, @@ -2429,6 +2715,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 16 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.mats.push(is.read_string()?); }, @@ -2444,6 +2733,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.mats { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2453,6 +2745,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(2, v)?; + } for v in &self.mats { os.write_string(1, &v)?; }; @@ -2473,12 +2768,14 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.mats.clear(); self.special_fields.clear(); } fn default_instance() -> &'static CoinSet { static instance: CoinSet = CoinSet { + all: ::std::option::Option::None, mats: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; @@ -2507,6 +2804,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct BarsBlocksSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.BarsBlocksSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.BarsBlocksSet.bars_other_mats) pub bars_other_mats: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.BarsBlocksSet.blocks_other_mats) @@ -2531,9 +2830,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 5; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(4); + let mut fields = ::std::vec::Vec::with_capacity(5); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &BarsBlocksSet| { &m.all }, + |m: &mut BarsBlocksSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "bars_other_mats", |m: &BarsBlocksSet| { &m.bars_other_mats }, @@ -2572,6 +2895,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 40 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.bars_other_mats.push(is.read_string()?); }, @@ -2596,6 +2922,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.bars_other_mats { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2614,6 +2943,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(5, v)?; + } for v in &self.bars_other_mats { os.write_string(1, &v)?; }; @@ -2643,6 +2975,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.bars_other_mats.clear(); self.blocks_other_mats.clear(); self.bars_mats.clear(); @@ -2652,6 +2985,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static BarsBlocksSet { static instance: BarsBlocksSet = BarsBlocksSet { + all: ::std::option::Option::None, bars_other_mats: ::std::vec::Vec::new(), blocks_other_mats: ::std::vec::Vec::new(), bars_mats: ::std::vec::Vec::new(), @@ -2683,6 +3017,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct GemsSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.GemsSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.GemsSet.rough_other_mats) pub rough_other_mats: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.GemsSet.cut_other_mats) @@ -2707,9 +3043,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 5; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(4); + let mut fields = ::std::vec::Vec::with_capacity(5); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &GemsSet| { &m.all }, + |m: &mut GemsSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "rough_other_mats", |m: &GemsSet| { &m.rough_other_mats }, @@ -2748,6 +3108,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 40 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.rough_other_mats.push(is.read_string()?); }, @@ -2772,6 +3135,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.rough_other_mats { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2790,6 +3156,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(5, v)?; + } for v in &self.rough_other_mats { os.write_string(1, &v)?; }; @@ -2819,6 +3188,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.rough_other_mats.clear(); self.cut_other_mats.clear(); self.rough_mats.clear(); @@ -2828,6 +3198,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static GemsSet { static instance: GemsSet = GemsSet { + all: ::std::option::Option::None, rough_other_mats: ::std::vec::Vec::new(), cut_other_mats: ::std::vec::Vec::new(), rough_mats: ::std::vec::Vec::new(), @@ -2859,6 +3230,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct FinishedGoodsSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.type) pub type_: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.other_mats) @@ -2869,6 +3242,12 @@ pub mod stockpile_settings { pub quality_core: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.quality_total) pub quality_total: ::std::vec::Vec<::std::string::String>, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.dyed) + pub dyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.undyed) + pub undyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.FinishedGoodsSet.color) + pub color: ::std::vec::Vec<::std::string::String>, // special fields // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.FinishedGoodsSet.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -2885,9 +3264,71 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 6; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + + // optional bool dyed = 7; + + pub fn dyed(&self) -> bool { + self.dyed.unwrap_or(false) + } + + pub fn clear_dyed(&mut self) { + self.dyed = ::std::option::Option::None; + } + + pub fn has_dyed(&self) -> bool { + self.dyed.is_some() + } + + // Param is passed by value, moved + pub fn set_dyed(&mut self, v: bool) { + self.dyed = ::std::option::Option::Some(v); + } + + // optional bool undyed = 8; + + pub fn undyed(&self) -> bool { + self.undyed.unwrap_or(false) + } + + pub fn clear_undyed(&mut self) { + self.undyed = ::std::option::Option::None; + } + + pub fn has_undyed(&self) -> bool { + self.undyed.is_some() + } + + // Param is passed by value, moved + pub fn set_undyed(&mut self, v: bool) { + self.undyed = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(5); + let mut fields = ::std::vec::Vec::with_capacity(9); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &FinishedGoodsSet| { &m.all }, + |m: &mut FinishedGoodsSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "type", |m: &FinishedGoodsSet| { &m.type_ }, @@ -2913,6 +3354,21 @@ pub mod stockpile_settings { |m: &FinishedGoodsSet| { &m.quality_total }, |m: &mut FinishedGoodsSet| { &mut m.quality_total }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "dyed", + |m: &FinishedGoodsSet| { &m.dyed }, + |m: &mut FinishedGoodsSet| { &mut m.dyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "undyed", + |m: &FinishedGoodsSet| { &m.undyed }, + |m: &mut FinishedGoodsSet| { &mut m.undyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "color", + |m: &FinishedGoodsSet| { &m.color }, + |m: &mut FinishedGoodsSet| { &mut m.color }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "StockpileSettings.FinishedGoodsSet", fields, @@ -2931,6 +3387,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 48 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.type_.push(is.read_string()?); }, @@ -2946,6 +3405,15 @@ pub mod stockpile_settings { 42 => { self.quality_total.push(is.read_string()?); }, + 56 => { + self.dyed = ::std::option::Option::Some(is.read_bool()?); + }, + 64 => { + self.undyed = ::std::option::Option::Some(is.read_bool()?); + }, + 74 => { + self.color.push(is.read_string()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -2958,6 +3426,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.type_ { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -2973,12 +3444,24 @@ pub mod stockpile_settings { for value in &self.quality_total { my_size += ::protobuf::rt::string_size(5, &value); }; + if let Some(v) = self.dyed { + my_size += 1 + 1; + } + if let Some(v) = self.undyed { + my_size += 1 + 1; + } + for value in &self.color { + my_size += ::protobuf::rt::string_size(9, &value); + }; my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(6, v)?; + } for v in &self.type_ { os.write_string(1, &v)?; }; @@ -2994,6 +3477,15 @@ pub mod stockpile_settings { for v in &self.quality_total { os.write_string(5, &v)?; }; + if let Some(v) = self.dyed { + os.write_bool(7, v)?; + } + if let Some(v) = self.undyed { + os.write_bool(8, v)?; + } + for v in &self.color { + os.write_string(9, &v)?; + }; os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3011,21 +3503,29 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.type_.clear(); self.other_mats.clear(); self.mats.clear(); self.quality_core.clear(); self.quality_total.clear(); + self.dyed = ::std::option::Option::None; + self.undyed = ::std::option::Option::None; + self.color.clear(); self.special_fields.clear(); } fn default_instance() -> &'static FinishedGoodsSet { static instance: FinishedGoodsSet = FinishedGoodsSet { + all: ::std::option::Option::None, type_: ::std::vec::Vec::new(), other_mats: ::std::vec::Vec::new(), mats: ::std::vec::Vec::new(), quality_core: ::std::vec::Vec::new(), quality_total: ::std::vec::Vec::new(), + dyed: ::std::option::Option::None, + undyed: ::std::option::Option::None, + color: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -3053,8 +3553,16 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct LeatherSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.LeatherSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.LeatherSet.mats) pub mats: ::std::vec::Vec<::std::string::String>, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.LeatherSet.dyed) + pub dyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.LeatherSet.undyed) + pub undyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.LeatherSet.color) + pub color: ::std::vec::Vec<::std::string::String>, // special fields // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.LeatherSet.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -3071,14 +3579,91 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 2; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + + // optional bool dyed = 3; + + pub fn dyed(&self) -> bool { + self.dyed.unwrap_or(false) + } + + pub fn clear_dyed(&mut self) { + self.dyed = ::std::option::Option::None; + } + + pub fn has_dyed(&self) -> bool { + self.dyed.is_some() + } + + // Param is passed by value, moved + pub fn set_dyed(&mut self, v: bool) { + self.dyed = ::std::option::Option::Some(v); + } + + // optional bool undyed = 4; + + pub fn undyed(&self) -> bool { + self.undyed.unwrap_or(false) + } + + pub fn clear_undyed(&mut self) { + self.undyed = ::std::option::Option::None; + } + + pub fn has_undyed(&self) -> bool { + self.undyed.is_some() + } + + // Param is passed by value, moved + pub fn set_undyed(&mut self, v: bool) { + self.undyed = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(1); + let mut fields = ::std::vec::Vec::with_capacity(5); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &LeatherSet| { &m.all }, + |m: &mut LeatherSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "mats", |m: &LeatherSet| { &m.mats }, |m: &mut LeatherSet| { &mut m.mats }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "dyed", + |m: &LeatherSet| { &m.dyed }, + |m: &mut LeatherSet| { &mut m.dyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "undyed", + |m: &LeatherSet| { &m.undyed }, + |m: &mut LeatherSet| { &mut m.undyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "color", + |m: &LeatherSet| { &m.color }, + |m: &mut LeatherSet| { &mut m.color }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "StockpileSettings.LeatherSet", fields, @@ -3097,9 +3682,21 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 16 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.mats.push(is.read_string()?); }, + 24 => { + self.dyed = ::std::option::Option::Some(is.read_bool()?); + }, + 32 => { + self.undyed = ::std::option::Option::Some(is.read_bool()?); + }, + 42 => { + self.color.push(is.read_string()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -3112,18 +3709,42 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.mats { my_size += ::protobuf::rt::string_size(1, &value); }; + if let Some(v) = self.dyed { + my_size += 1 + 1; + } + if let Some(v) = self.undyed { + my_size += 1 + 1; + } + for value in &self.color { + my_size += ::protobuf::rt::string_size(5, &value); + }; my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(2, v)?; + } for v in &self.mats { os.write_string(1, &v)?; }; + if let Some(v) = self.dyed { + os.write_bool(3, v)?; + } + if let Some(v) = self.undyed { + os.write_bool(4, v)?; + } + for v in &self.color { + os.write_string(5, &v)?; + }; os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3141,13 +3762,21 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.mats.clear(); + self.dyed = ::std::option::Option::None; + self.undyed = ::std::option::Option::None; + self.color.clear(); self.special_fields.clear(); } fn default_instance() -> &'static LeatherSet { static instance: LeatherSet = LeatherSet { + all: ::std::option::Option::None, mats: ::std::vec::Vec::new(), + dyed: ::std::option::Option::None, + undyed: ::std::option::Option::None, + color: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -3175,6 +3804,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct ClothSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.thread_silk) pub thread_silk: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.thread_plant) @@ -3191,6 +3822,12 @@ pub mod stockpile_settings { pub cloth_yarn: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.cloth_metal) pub cloth_metal: ::std::vec::Vec<::std::string::String>, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.dyed) + pub dyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.undyed) + pub undyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ClothSet.color) + pub color: ::std::vec::Vec<::std::string::String>, // special fields // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.ClothSet.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -3207,9 +3844,71 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 9; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + + // optional bool dyed = 10; + + pub fn dyed(&self) -> bool { + self.dyed.unwrap_or(false) + } + + pub fn clear_dyed(&mut self) { + self.dyed = ::std::option::Option::None; + } + + pub fn has_dyed(&self) -> bool { + self.dyed.is_some() + } + + // Param is passed by value, moved + pub fn set_dyed(&mut self, v: bool) { + self.dyed = ::std::option::Option::Some(v); + } + + // optional bool undyed = 11; + + pub fn undyed(&self) -> bool { + self.undyed.unwrap_or(false) + } + + pub fn clear_undyed(&mut self) { + self.undyed = ::std::option::Option::None; + } + + pub fn has_undyed(&self) -> bool { + self.undyed.is_some() + } + + // Param is passed by value, moved + pub fn set_undyed(&mut self, v: bool) { + self.undyed = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(8); + let mut fields = ::std::vec::Vec::with_capacity(12); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &ClothSet| { &m.all }, + |m: &mut ClothSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "thread_silk", |m: &ClothSet| { &m.thread_silk }, @@ -3250,6 +3949,21 @@ pub mod stockpile_settings { |m: &ClothSet| { &m.cloth_metal }, |m: &mut ClothSet| { &mut m.cloth_metal }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "dyed", + |m: &ClothSet| { &m.dyed }, + |m: &mut ClothSet| { &mut m.dyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "undyed", + |m: &ClothSet| { &m.undyed }, + |m: &mut ClothSet| { &mut m.undyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "color", + |m: &ClothSet| { &m.color }, + |m: &mut ClothSet| { &mut m.color }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "StockpileSettings.ClothSet", fields, @@ -3268,6 +3982,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 72 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.thread_silk.push(is.read_string()?); }, @@ -3292,6 +4009,15 @@ pub mod stockpile_settings { 66 => { self.cloth_metal.push(is.read_string()?); }, + 80 => { + self.dyed = ::std::option::Option::Some(is.read_bool()?); + }, + 88 => { + self.undyed = ::std::option::Option::Some(is.read_bool()?); + }, + 98 => { + self.color.push(is.read_string()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -3304,6 +4030,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.thread_silk { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -3328,12 +4057,24 @@ pub mod stockpile_settings { for value in &self.cloth_metal { my_size += ::protobuf::rt::string_size(8, &value); }; + if let Some(v) = self.dyed { + my_size += 1 + 1; + } + if let Some(v) = self.undyed { + my_size += 1 + 1; + } + for value in &self.color { + my_size += ::protobuf::rt::string_size(12, &value); + }; my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(9, v)?; + } for v in &self.thread_silk { os.write_string(1, &v)?; }; @@ -3358,6 +4099,15 @@ pub mod stockpile_settings { for v in &self.cloth_metal { os.write_string(8, &v)?; }; + if let Some(v) = self.dyed { + os.write_bool(10, v)?; + } + if let Some(v) = self.undyed { + os.write_bool(11, v)?; + } + for v in &self.color { + os.write_string(12, &v)?; + }; os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3375,6 +4125,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.thread_silk.clear(); self.thread_plant.clear(); self.thread_yarn.clear(); @@ -3383,11 +4134,15 @@ pub mod stockpile_settings { self.cloth_plant.clear(); self.cloth_yarn.clear(); self.cloth_metal.clear(); + self.dyed = ::std::option::Option::None; + self.undyed = ::std::option::Option::None; + self.color.clear(); self.special_fields.clear(); } fn default_instance() -> &'static ClothSet { static instance: ClothSet = ClothSet { + all: ::std::option::Option::None, thread_silk: ::std::vec::Vec::new(), thread_plant: ::std::vec::Vec::new(), thread_yarn: ::std::vec::Vec::new(), @@ -3396,6 +4151,9 @@ pub mod stockpile_settings { cloth_plant: ::std::vec::Vec::new(), cloth_yarn: ::std::vec::Vec::new(), cloth_metal: ::std::vec::Vec::new(), + dyed: ::std::option::Option::None, + undyed: ::std::option::Option::None, + color: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -3423,6 +4181,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct WoodSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.WoodSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.WoodSet.mats) pub mats: ::std::vec::Vec<::std::string::String>, // special fields @@ -3441,9 +4201,33 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 2; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(1); + let mut fields = ::std::vec::Vec::with_capacity(2); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &WoodSet| { &m.all }, + |m: &mut WoodSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "mats", |m: &WoodSet| { &m.mats }, @@ -3467,6 +4251,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 16 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.mats.push(is.read_string()?); }, @@ -3482,6 +4269,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.mats { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -3491,6 +4281,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(2, v)?; + } for v in &self.mats { os.write_string(1, &v)?; }; @@ -3511,12 +4304,14 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.mats.clear(); self.special_fields.clear(); } fn default_instance() -> &'static WoodSet { static instance: WoodSet = WoodSet { + all: ::std::option::Option::None, mats: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; @@ -3545,6 +4340,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct WeaponsSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.WeaponsSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.WeaponsSet.weapon_type) pub weapon_type: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.WeaponsSet.trapcomp_type) @@ -3577,6 +4374,25 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 9; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + // optional bool usable = 7; pub fn usable(&self) -> bool { @@ -3616,8 +4432,13 @@ pub mod stockpile_settings { } pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(8); + let mut fields = ::std::vec::Vec::with_capacity(9); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &WeaponsSet| { &m.all }, + |m: &mut WeaponsSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "weapon_type", |m: &WeaponsSet| { &m.weapon_type }, @@ -3676,6 +4497,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 72 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.weapon_type.push(is.read_string()?); }, @@ -3712,6 +4536,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.weapon_type { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -3742,6 +4569,9 @@ pub mod stockpile_settings { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(9, v)?; + } for v in &self.weapon_type { os.write_string(1, &v)?; }; @@ -3783,6 +4613,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.weapon_type.clear(); self.trapcomp_type.clear(); self.other_mats.clear(); @@ -3796,6 +4627,7 @@ pub mod stockpile_settings { fn default_instance() -> &'static WeaponsSet { static instance: WeaponsSet = WeaponsSet { + all: ::std::option::Option::None, weapon_type: ::std::vec::Vec::new(), trapcomp_type: ::std::vec::Vec::new(), other_mats: ::std::vec::Vec::new(), @@ -3831,6 +4663,8 @@ pub mod stockpile_settings { #[derive(PartialEq,Clone,Default,Debug)] pub struct ArmorSet { // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.all) + pub all: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.body) pub body: ::std::vec::Vec<::std::string::String>, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.head) @@ -3855,6 +4689,12 @@ pub mod stockpile_settings { pub usable: ::std::option::Option, // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.unusable) pub unusable: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.dyed) + pub dyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.undyed) + pub undyed: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.ArmorSet.color) + pub color: ::std::vec::Vec<::std::string::String>, // special fields // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.ArmorSet.special_fields) pub special_fields: ::protobuf::SpecialFields, @@ -3871,6 +4711,25 @@ pub mod stockpile_settings { ::std::default::Default::default() } + // optional bool all = 13; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + // optional bool usable = 11; pub fn usable(&self) -> bool { @@ -3909,9 +4768,52 @@ pub mod stockpile_settings { self.unusable = ::std::option::Option::Some(v); } + // optional bool dyed = 14; + + pub fn dyed(&self) -> bool { + self.dyed.unwrap_or(false) + } + + pub fn clear_dyed(&mut self) { + self.dyed = ::std::option::Option::None; + } + + pub fn has_dyed(&self) -> bool { + self.dyed.is_some() + } + + // Param is passed by value, moved + pub fn set_dyed(&mut self, v: bool) { + self.dyed = ::std::option::Option::Some(v); + } + + // optional bool undyed = 15; + + pub fn undyed(&self) -> bool { + self.undyed.unwrap_or(false) + } + + pub fn clear_undyed(&mut self) { + self.undyed = ::std::option::Option::None; + } + + pub fn has_undyed(&self) -> bool { + self.undyed.is_some() + } + + // Param is passed by value, moved + pub fn set_undyed(&mut self, v: bool) { + self.undyed = ::std::option::Option::Some(v); + } + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { - let mut fields = ::std::vec::Vec::with_capacity(12); + let mut fields = ::std::vec::Vec::with_capacity(16); let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &ArmorSet| { &m.all }, + |m: &mut ArmorSet| { &mut m.all }, + )); fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( "body", |m: &ArmorSet| { &m.body }, @@ -3972,6 +4874,21 @@ pub mod stockpile_settings { |m: &ArmorSet| { &m.unusable }, |m: &mut ArmorSet| { &mut m.unusable }, )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "dyed", + |m: &ArmorSet| { &m.dyed }, + |m: &mut ArmorSet| { &mut m.dyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "undyed", + |m: &ArmorSet| { &m.undyed }, + |m: &mut ArmorSet| { &mut m.undyed }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "color", + |m: &ArmorSet| { &m.color }, + |m: &mut ArmorSet| { &mut m.color }, + )); ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( "StockpileSettings.ArmorSet", fields, @@ -3990,6 +4907,9 @@ pub mod stockpile_settings { fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { while let Some(tag) = is.read_raw_tag_or_eof()? { match tag { + 104 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, 10 => { self.body.push(is.read_string()?); }, @@ -4026,6 +4946,15 @@ pub mod stockpile_settings { 96 => { self.unusable = ::std::option::Option::Some(is.read_bool()?); }, + 112 => { + self.dyed = ::std::option::Option::Some(is.read_bool()?); + }, + 120 => { + self.undyed = ::std::option::Option::Some(is.read_bool()?); + }, + 130 => { + self.color.push(is.read_string()?); + }, tag => { ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; }, @@ -4038,6 +4967,9 @@ pub mod stockpile_settings { #[allow(unused_variables)] fn compute_size(&self) -> u64 { let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } for value in &self.body { my_size += ::protobuf::rt::string_size(1, &value); }; @@ -4074,12 +5006,24 @@ pub mod stockpile_settings { if let Some(v) = self.unusable { my_size += 1 + 1; } + if let Some(v) = self.dyed { + my_size += 1 + 1; + } + if let Some(v) = self.undyed { + my_size += 1 + 1; + } + for value in &self.color { + my_size += ::protobuf::rt::string_size(16, &value); + }; my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); self.special_fields.cached_size().set(my_size as u32); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(13, v)?; + } for v in &self.body { os.write_string(1, &v)?; }; @@ -4116,6 +5060,15 @@ pub mod stockpile_settings { if let Some(v) = self.unusable { os.write_bool(12, v)?; } + if let Some(v) = self.dyed { + os.write_bool(14, v)?; + } + if let Some(v) = self.undyed { + os.write_bool(15, v)?; + } + for v in &self.color { + os.write_string(16, &v)?; + }; os.write_unknown_fields(self.special_fields.unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4133,6 +5086,7 @@ pub mod stockpile_settings { } fn clear(&mut self) { + self.all = ::std::option::Option::None; self.body.clear(); self.head.clear(); self.feet.clear(); @@ -4145,11 +5099,15 @@ pub mod stockpile_settings { self.quality_total.clear(); self.usable = ::std::option::Option::None; self.unusable = ::std::option::Option::None; + self.dyed = ::std::option::Option::None; + self.undyed = ::std::option::Option::None; + self.color.clear(); self.special_fields.clear(); } fn default_instance() -> &'static ArmorSet { static instance: ArmorSet = ArmorSet { + all: ::std::option::Option::None, body: ::std::vec::Vec::new(), head: ::std::vec::Vec::new(), feet: ::std::vec::Vec::new(), @@ -4162,6 +5120,9 @@ pub mod stockpile_settings { quality_total: ::std::vec::Vec::new(), usable: ::std::option::Option::None, unusable: ::std::option::Option::None, + dyed: ::std::option::Option::None, + undyed: ::std::option::Option::None, + color: ::std::vec::Vec::new(), special_fields: ::protobuf::SpecialFields::new(), }; &instance @@ -4184,110 +5145,471 @@ pub mod stockpile_settings { impl ::protobuf::reflect::ProtobufValue for ArmorSet { type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; } + + // @@protoc_insertion_point(message:dfstockpiles.StockpileSettings.CorpsesSet) + #[derive(PartialEq,Clone,Default,Debug)] + pub struct CorpsesSet { + // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.CorpsesSet.all) + pub all: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.CorpsesSet.corpses) + pub corpses: ::std::vec::Vec<::std::string::String>, + // special fields + // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.CorpsesSet.special_fields) + pub special_fields: ::protobuf::SpecialFields, + } + + impl<'a> ::std::default::Default for &'a CorpsesSet { + fn default() -> &'a CorpsesSet { + ::default_instance() + } + } + + impl CorpsesSet { + pub fn new() -> CorpsesSet { + ::std::default::Default::default() + } + + // optional bool all = 1; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { + let mut fields = ::std::vec::Vec::with_capacity(2); + let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &CorpsesSet| { &m.all }, + |m: &mut CorpsesSet| { &mut m.all }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "corpses", + |m: &CorpsesSet| { &m.corpses }, + |m: &mut CorpsesSet| { &mut m.corpses }, + )); + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "StockpileSettings.CorpsesSet", + fields, + oneofs, + ) + } + } + + impl ::protobuf::Message for CorpsesSet { + const NAME: &'static str = "CorpsesSet"; + + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { + while let Some(tag) = is.read_raw_tag_or_eof()? { + match tag { + 8 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, + 18 => { + self.corpses.push(is.read_string()?); + }, + tag => { + ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u64 { + let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } + for value in &self.corpses { + my_size += ::protobuf::rt::string_size(2, &value); + }; + my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); + self.special_fields.cached_size().set(my_size as u32); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(1, v)?; + } + for v in &self.corpses { + os.write_string(2, &v)?; + }; + os.write_unknown_fields(self.special_fields.unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn special_fields(&self) -> &::protobuf::SpecialFields { + &self.special_fields + } + + fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { + &mut self.special_fields + } + + fn new() -> CorpsesSet { + CorpsesSet::new() + } + + fn clear(&mut self) { + self.all = ::std::option::Option::None; + self.corpses.clear(); + self.special_fields.clear(); + } + + fn default_instance() -> &'static CorpsesSet { + static instance: CorpsesSet = CorpsesSet { + all: ::std::option::Option::None, + corpses: ::std::vec::Vec::new(), + special_fields: ::protobuf::SpecialFields::new(), + }; + &instance + } + } + + impl ::protobuf::MessageFull for CorpsesSet { + fn descriptor() -> ::protobuf::reflect::MessageDescriptor { + static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); + descriptor.get(|| super::file_descriptor().message_by_package_relative_name("StockpileSettings.CorpsesSet").unwrap()).clone() + } + } + + impl ::std::fmt::Display for CorpsesSet { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } + } + + impl ::protobuf::reflect::ProtobufValue for CorpsesSet { + type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; + } + + // @@protoc_insertion_point(message:dfstockpiles.StockpileSettings.SheetSet) + #[derive(PartialEq,Clone,Default,Debug)] + pub struct SheetSet { + // message fields + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.SheetSet.all) + pub all: ::std::option::Option, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.SheetSet.paper) + pub paper: ::std::vec::Vec<::std::string::String>, + // @@protoc_insertion_point(field:dfstockpiles.StockpileSettings.SheetSet.parchment) + pub parchment: ::std::vec::Vec<::std::string::String>, + // special fields + // @@protoc_insertion_point(special_field:dfstockpiles.StockpileSettings.SheetSet.special_fields) + pub special_fields: ::protobuf::SpecialFields, + } + + impl<'a> ::std::default::Default for &'a SheetSet { + fn default() -> &'a SheetSet { + ::default_instance() + } + } + + impl SheetSet { + pub fn new() -> SheetSet { + ::std::default::Default::default() + } + + // optional bool all = 1; + + pub fn all(&self) -> bool { + self.all.unwrap_or(false) + } + + pub fn clear_all(&mut self) { + self.all = ::std::option::Option::None; + } + + pub fn has_all(&self) -> bool { + self.all.is_some() + } + + // Param is passed by value, moved + pub fn set_all(&mut self, v: bool) { + self.all = ::std::option::Option::Some(v); + } + + pub(in super) fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData { + let mut fields = ::std::vec::Vec::with_capacity(3); + let mut oneofs = ::std::vec::Vec::with_capacity(0); + fields.push(::protobuf::reflect::rt::v2::make_option_accessor::<_, _>( + "all", + |m: &SheetSet| { &m.all }, + |m: &mut SheetSet| { &mut m.all }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "paper", + |m: &SheetSet| { &m.paper }, + |m: &mut SheetSet| { &mut m.paper }, + )); + fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>( + "parchment", + |m: &SheetSet| { &m.parchment }, + |m: &mut SheetSet| { &mut m.parchment }, + )); + ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::( + "StockpileSettings.SheetSet", + fields, + oneofs, + ) + } + } + + impl ::protobuf::Message for SheetSet { + const NAME: &'static str = "SheetSet"; + + fn is_initialized(&self) -> bool { + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> { + while let Some(tag) = is.read_raw_tag_or_eof()? { + match tag { + 8 => { + self.all = ::std::option::Option::Some(is.read_bool()?); + }, + 18 => { + self.paper.push(is.read_string()?); + }, + 26 => { + self.parchment.push(is.read_string()?); + }, + tag => { + ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u64 { + let mut my_size = 0; + if let Some(v) = self.all { + my_size += 1 + 1; + } + for value in &self.paper { + my_size += ::protobuf::rt::string_size(2, &value); + }; + for value in &self.parchment { + my_size += ::protobuf::rt::string_size(3, &value); + }; + my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields()); + self.special_fields.cached_size().set(my_size as u32); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> { + if let Some(v) = self.all { + os.write_bool(1, v)?; + } + for v in &self.paper { + os.write_string(2, &v)?; + }; + for v in &self.parchment { + os.write_string(3, &v)?; + }; + os.write_unknown_fields(self.special_fields.unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn special_fields(&self) -> &::protobuf::SpecialFields { + &self.special_fields + } + + fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields { + &mut self.special_fields + } + + fn new() -> SheetSet { + SheetSet::new() + } + + fn clear(&mut self) { + self.all = ::std::option::Option::None; + self.paper.clear(); + self.parchment.clear(); + self.special_fields.clear(); + } + + fn default_instance() -> &'static SheetSet { + static instance: SheetSet = SheetSet { + all: ::std::option::Option::None, + paper: ::std::vec::Vec::new(), + parchment: ::std::vec::Vec::new(), + special_fields: ::protobuf::SpecialFields::new(), + }; + &instance + } + } + + impl ::protobuf::MessageFull for SheetSet { + fn descriptor() -> ::protobuf::reflect::MessageDescriptor { + static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new(); + descriptor.get(|| super::file_descriptor().message_by_package_relative_name("StockpileSettings.SheetSet").unwrap()).clone() + } + } + + impl ::std::fmt::Display for SheetSet { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } + } + + impl ::protobuf::reflect::ProtobufValue for SheetSet { + type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage; + } } static file_descriptor_proto_data: &'static [u8] = b"\ - \n\x10stockpiles.proto\x12\x0cdfstockpiles\"\xee\x20\n\x11StockpileSetti\ - ngs\x12D\n\x07animals\x18\x01\x20\x01(\x0b2*.dfstockpiles.StockpileSetti\ - ngs.AnimalsSetR\x07animals\x12;\n\x04food\x18\x02\x20\x01(\x0b2'.dfstock\ - piles.StockpileSettings.FoodSetR\x04food\x12J\n\tfurniture\x18\x03\x20\ - \x01(\x0b2,.dfstockpiles.StockpileSettings.FurnitureSetR\tfurniture\x12\ - \x1a\n\x08unknown1\x18\x04\x20\x01(\x05R\x08unknown1\x12A\n\x06refuse\ - \x18\x05\x20\x01(\x0b2).dfstockpiles.StockpileSettings.RefuseSetR\x06ref\ - use\x12>\n\x05stone\x18\x06\x20\x01(\x0b2(.dfstockpiles.StockpileSetting\ - s.StoneSetR\x05stone\x128\n\x03ore\x18\x07\x20\x01(\x0b2&.dfstockpiles.S\ - tockpileSettings.OreSetR\x03ore\x12;\n\x04ammo\x18\x08\x20\x01(\x0b2'.df\ - stockpiles.StockpileSettings.AmmoSetR\x04ammo\x12;\n\x04coin\x18\t\x20\ - \x01(\x0b2'.dfstockpiles.StockpileSettings.CoinSetR\x04coin\x12M\n\nbars\ - blocks\x18\n\x20\x01(\x0b2-.dfstockpiles.StockpileSettings.BarsBlocksSet\ - R\nbarsblocks\x12;\n\x04gems\x18\x0b\x20\x01(\x0b2'.dfstockpiles.Stockpi\ - leSettings.GemsSetR\x04gems\x12W\n\x0efinished_goods\x18\x0c\x20\x01(\ - \x0b20.dfstockpiles.StockpileSettings.FinishedGoodsSetR\rfinishedGoods\ - \x12D\n\x07leather\x18\r\x20\x01(\x0b2*.dfstockpiles.StockpileSettings.L\ - eatherSetR\x07leather\x12>\n\x05cloth\x18\x0e\x20\x01(\x0b2(.dfstockpile\ - s.StockpileSettings.ClothSetR\x05cloth\x12;\n\x04wood\x18\x0f\x20\x01(\ - \x0b2'.dfstockpiles.StockpileSettings.WoodSetR\x04wood\x12D\n\x07weapons\ - \x18\x10\x20\x01(\x0b2*.dfstockpiles.StockpileSettings.WeaponsSetR\x07we\ - apons\x12>\n\x05armor\x18\x11\x20\x01(\x0b2(.dfstockpiles.StockpileSetti\ - ngs.ArmorSetR\x05armor\x12#\n\rallow_organic\x18\x12\x20\x01(\x08R\x0cal\ - lowOrganic\x12'\n\x0fallow_inorganic\x18\x13\x20\x01(\x08R\x0eallowInorg\ - anic\x12\x18\n\x07corpses\x18\x18\x20\x01(\x08R\x07corpses\x12\x1f\n\x0b\ - max_barrels\x18\x14\x20\x01(\x05R\nmaxBarrels\x12\x19\n\x08max_bins\x18\ - \x15\x20\x01(\x05R\x07maxBins\x12)\n\x10max_wheelbarrows\x18\x16\x20\x01\ - (\x05R\x0fmaxWheelbarrows\x12$\n\x0euse_links_only\x18\x17\x20\x01(\x08R\ - \x0cuseLinksOnly\x1ah\n\nAnimalsSet\x12\x1f\n\x0bempty_cages\x18\x01\x20\ - \x01(\x08R\nemptyCages\x12\x1f\n\x0bempty_traps\x18\x02\x20\x01(\x08R\ne\ - mptyTraps\x12\x18\n\x07enabled\x18\x03\x20\x03(\tR\x07enabled\x1a\xf0\ - \x04\n\x07FoodSet\x12\x12\n\x04meat\x18\x01\x20\x03(\tR\x04meat\x12\x12\ - \n\x04fish\x18\x02\x20\x03(\tR\x04fish\x12'\n\x0funprepared_fish\x18\x14\ - \x20\x03(\tR\x0eunpreparedFish\x12\x10\n\x03egg\x18\x03\x20\x03(\tR\x03e\ - gg\x12\x16\n\x06plants\x18\x04\x20\x03(\tR\x06plants\x12\x1f\n\x0bdrink_\ - plant\x18\x05\x20\x03(\tR\ndrinkPlant\x12!\n\x0cdrink_animal\x18\x06\x20\ - \x03(\tR\x0bdrinkAnimal\x12!\n\x0ccheese_plant\x18\x07\x20\x03(\tR\x0bch\ - eesePlant\x12#\n\rcheese_animal\x18\x08\x20\x03(\tR\x0ccheeseAnimal\x12\ - \x14\n\x05seeds\x18\t\x20\x03(\tR\x05seeds\x12\x16\n\x06leaves\x18\n\x20\ - \x03(\tR\x06leaves\x12!\n\x0cpowder_plant\x18\x0b\x20\x03(\tR\x0bpowderP\ - lant\x12'\n\x0fpowder_creature\x18\x0c\x20\x03(\tR\x0epowderCreature\x12\ - \x12\n\x04glob\x18\r\x20\x03(\tR\x04glob\x12\x1d\n\nglob_paste\x18\x0e\ - \x20\x03(\tR\tglobPaste\x12!\n\x0cglob_pressed\x18\x0f\x20\x03(\tR\x0bgl\ - obPressed\x12!\n\x0cliquid_plant\x18\x10\x20\x03(\tR\x0bliquidPlant\x12#\ - \n\rliquid_animal\x18\x11\x20\x03(\tR\x0cliquidAnimal\x12\x1f\n\x0bliqui\ - d_misc\x18\x12\x20\x03(\tR\nliquidMisc\x12%\n\x0eprepared_meals\x18\x13\ - \x20\x01(\x08R\rpreparedMeals\x1a\x9d\x01\n\x0cFurnitureSet\x12\x12\n\ - \x04type\x18\x01\x20\x03(\tR\x04type\x12\x1d\n\nother_mats\x18\x02\x20\ - \x03(\tR\totherMats\x12\x12\n\x04mats\x18\x03\x20\x03(\tR\x04mats\x12!\n\ - \x0cquality_core\x18\x04\x20\x03(\tR\x0bqualityCore\x12#\n\rquality_tota\ - l\x18\x05\x20\x03(\tR\x0cqualityTotal\x1a\xac\x02\n\tRefuseSet\x12\x12\n\ - \x04type\x18\x01\x20\x03(\tR\x04type\x12\x18\n\x07corpses\x18\x02\x20\ - \x03(\tR\x07corpses\x12\x1d\n\nbody_parts\x18\x03\x20\x03(\tR\tbodyParts\ - \x12\x16\n\x06skulls\x18\x04\x20\x03(\tR\x06skulls\x12\x14\n\x05bones\ - \x18\x05\x20\x03(\tR\x05bones\x12\x12\n\x04hair\x18\x06\x20\x03(\tR\x04h\ - air\x12\x16\n\x06shells\x18\x07\x20\x03(\tR\x06shells\x12\x14\n\x05teeth\ - \x18\x08\x20\x03(\tR\x05teeth\x12\x14\n\x05horns\x18\t\x20\x03(\tR\x05ho\ - rns\x12$\n\x0efresh_raw_hide\x18\n\x20\x01(\x08R\x0cfreshRawHide\x12&\n\ - \x0frotten_raw_hide\x18\x0b\x20\x01(\x08R\rrottenRawHide\x1a\x1e\n\x08St\ - oneSet\x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\x1a\x1c\n\x06OreSet\ - \x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\x1a\x98\x01\n\x07AmmoSet\ + \n\x10stockpiles.proto\x12\x0cdfstockpiles\"\xa5'\n\x11StockpileSettings\ + \x12\x1f\n\x0bmax_barrels\x18\x14\x20\x01(\x05R\nmaxBarrels\x12\x19\n\ + \x08max_bins\x18\x15\x20\x01(\x05R\x07maxBins\x12)\n\x10max_wheelbarrows\ + \x18\x16\x20\x01(\x05R\x0fmaxWheelbarrows\x12$\n\x0euse_links_only\x18\ + \x17\x20\x01(\x08R\x0cuseLinksOnly\x12#\n\rallow_organic\x18\x12\x20\x01\ + (\x08R\x0callowOrganic\x12'\n\x0fallow_inorganic\x18\x13\x20\x01(\x08R\ + \x0eallowInorganic\x12;\n\x04ammo\x18\x08\x20\x01(\x0b2'.dfstockpiles.St\ + ockpileSettings.AmmoSetR\x04ammo\x12D\n\x07animals\x18\x01\x20\x01(\x0b2\ + *.dfstockpiles.StockpileSettings.AnimalsSetR\x07animals\x12>\n\x05armor\ + \x18\x11\x20\x01(\x0b2(.dfstockpiles.StockpileSettings.ArmorSetR\x05armo\ + r\x12M\n\nbarsblocks\x18\n\x20\x01(\x0b2-.dfstockpiles.StockpileSettings\ + .BarsBlocksSetR\nbarsblocks\x12>\n\x05cloth\x18\x0e\x20\x01(\x0b2(.dfsto\ + ckpiles.StockpileSettings.ClothSetR\x05cloth\x12;\n\x04coin\x18\t\x20\ + \x01(\x0b2'.dfstockpiles.StockpileSettings.CoinSetR\x04coin\x12W\n\x0efi\ + nished_goods\x18\x0c\x20\x01(\x0b20.dfstockpiles.StockpileSettings.Finis\ + hedGoodsSetR\rfinishedGoods\x12;\n\x04food\x18\x02\x20\x01(\x0b2'.dfstoc\ + kpiles.StockpileSettings.FoodSetR\x04food\x12J\n\tfurniture\x18\x03\x20\ + \x01(\x0b2,.dfstockpiles.StockpileSettings.FurnitureSetR\tfurniture\x12;\ + \n\x04gems\x18\x0b\x20\x01(\x0b2'.dfstockpiles.StockpileSettings.GemsSet\ + R\x04gems\x12D\n\x07leather\x18\r\x20\x01(\x0b2*.dfstockpiles.StockpileS\ + ettings.LeatherSetR\x07leather\x12K\n\x0bcorpses_v50\x18\x19\x20\x01(\ + \x0b2*.dfstockpiles.StockpileSettings.CorpsesSetR\ncorpsesV50\x12A\n\x06\ + refuse\x18\x05\x20\x01(\x0b2).dfstockpiles.StockpileSettings.RefuseSetR\ + \x06refuse\x12>\n\x05sheet\x18\x1a\x20\x01(\x0b2(.dfstockpiles.Stockpile\ + Settings.SheetSetR\x05sheet\x12>\n\x05stone\x18\x06\x20\x01(\x0b2(.dfsto\ + ckpiles.StockpileSettings.StoneSetR\x05stone\x12D\n\x07weapons\x18\x10\ + \x20\x01(\x0b2*.dfstockpiles.StockpileSettings.WeaponsSetR\x07weapons\ + \x12;\n\x04wood\x18\x0f\x20\x01(\x0b2'.dfstockpiles.StockpileSettings.Wo\ + odSetR\x04wood\x12\x18\n\x07corpses\x18\x18\x20\x01(\x08R\x07corpses\x12\ + <\n\x03ore\x18\x07\x20\x01(\x0b2&.dfstockpiles.StockpileSettings.OreSetR\ + \x03oreB\x02\x18\x01\x12\x1e\n\x08unknown1\x18\x04\x20\x01(\x05R\x08unkn\ + own1B\x02\x18\x01\x1az\n\nAnimalsSet\x12\x10\n\x03all\x18\x04\x20\x01(\ + \x08R\x03all\x12\x1f\n\x0bempty_cages\x18\x01\x20\x01(\x08R\nemptyCages\ + \x12\x1f\n\x0bempty_traps\x18\x02\x20\x01(\x08R\nemptyTraps\x12\x18\n\ + \x07enabled\x18\x03\x20\x03(\tR\x07enabled\x1a\x82\x05\n\x07FoodSet\x12\ + \x10\n\x03all\x18\x15\x20\x01(\x08R\x03all\x12\x12\n\x04meat\x18\x01\x20\ + \x03(\tR\x04meat\x12\x12\n\x04fish\x18\x02\x20\x03(\tR\x04fish\x12'\n\ + \x0funprepared_fish\x18\x14\x20\x03(\tR\x0eunpreparedFish\x12\x10\n\x03e\ + gg\x18\x03\x20\x03(\tR\x03egg\x12\x16\n\x06plants\x18\x04\x20\x03(\tR\ + \x06plants\x12\x1f\n\x0bdrink_plant\x18\x05\x20\x03(\tR\ndrinkPlant\x12!\ + \n\x0cdrink_animal\x18\x06\x20\x03(\tR\x0bdrinkAnimal\x12!\n\x0ccheese_p\ + lant\x18\x07\x20\x03(\tR\x0bcheesePlant\x12#\n\rcheese_animal\x18\x08\ + \x20\x03(\tR\x0ccheeseAnimal\x12\x14\n\x05seeds\x18\t\x20\x03(\tR\x05see\ + ds\x12\x16\n\x06leaves\x18\n\x20\x03(\tR\x06leaves\x12!\n\x0cpowder_plan\ + t\x18\x0b\x20\x03(\tR\x0bpowderPlant\x12'\n\x0fpowder_creature\x18\x0c\ + \x20\x03(\tR\x0epowderCreature\x12\x12\n\x04glob\x18\r\x20\x03(\tR\x04gl\ + ob\x12\x1d\n\nglob_paste\x18\x0e\x20\x03(\tR\tglobPaste\x12!\n\x0cglob_p\ + ressed\x18\x0f\x20\x03(\tR\x0bglobPressed\x12!\n\x0cliquid_plant\x18\x10\ + \x20\x03(\tR\x0bliquidPlant\x12#\n\rliquid_animal\x18\x11\x20\x03(\tR\ + \x0cliquidAnimal\x12\x1f\n\x0bliquid_misc\x18\x12\x20\x03(\tR\nliquidMis\ + c\x12%\n\x0eprepared_meals\x18\x13\x20\x01(\x08R\rpreparedMeals\x1a\xaf\ + \x01\n\x0cFurnitureSet\x12\x10\n\x03all\x18\x07\x20\x01(\x08R\x03all\x12\ + \x12\n\x04type\x18\x01\x20\x03(\tR\x04type\x12\x1d\n\nother_mats\x18\x02\ + \x20\x03(\tR\totherMats\x12\x12\n\x04mats\x18\x03\x20\x03(\tR\x04mats\ + \x12!\n\x0cquality_core\x18\x04\x20\x03(\tR\x0bqualityCore\x12#\n\rquali\ + ty_total\x18\x05\x20\x03(\tR\x0cqualityTotal\x1a\xbe\x02\n\tRefuseSet\ + \x12\x10\n\x03all\x18\x0c\x20\x01(\x08R\x03all\x12\x12\n\x04type\x18\x01\ + \x20\x03(\tR\x04type\x12\x18\n\x07corpses\x18\x02\x20\x03(\tR\x07corpses\ + \x12\x1d\n\nbody_parts\x18\x03\x20\x03(\tR\tbodyParts\x12\x16\n\x06skull\ + s\x18\x04\x20\x03(\tR\x06skulls\x12\x14\n\x05bones\x18\x05\x20\x03(\tR\ + \x05bones\x12\x12\n\x04hair\x18\x06\x20\x03(\tR\x04hair\x12\x16\n\x06she\ + lls\x18\x07\x20\x03(\tR\x06shells\x12\x14\n\x05teeth\x18\x08\x20\x03(\tR\ + \x05teeth\x12\x14\n\x05horns\x18\t\x20\x03(\tR\x05horns\x12$\n\x0efresh_\ + raw_hide\x18\n\x20\x01(\x08R\x0cfreshRawHide\x12&\n\x0frotten_raw_hide\ + \x18\x0b\x20\x01(\x08R\rrottenRawHide\x1a0\n\x08StoneSet\x12\x10\n\x03al\ + l\x18\x02\x20\x01(\x08R\x03all\x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04\ + mats\x1a\x1c\n\x06OreSet\x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\ + \x1a\xaa\x01\n\x07AmmoSet\x12\x10\n\x03all\x18\x06\x20\x01(\x08R\x03all\ \x12\x12\n\x04type\x18\x01\x20\x03(\tR\x04type\x12\x1d\n\nother_mats\x18\ \x02\x20\x03(\tR\totherMats\x12\x12\n\x04mats\x18\x03\x20\x03(\tR\x04mat\ s\x12!\n\x0cquality_core\x18\x04\x20\x03(\tR\x0bqualityCore\x12#\n\rqual\ - ity_total\x18\x05\x20\x03(\tR\x0cqualityTotal\x1a\x1d\n\x07CoinSet\x12\ - \x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\x1a\xa1\x01\n\rBarsBlocksSet\ - \x12&\n\x0fbars_other_mats\x18\x01\x20\x03(\tR\rbarsOtherMats\x12*\n\x11\ - blocks_other_mats\x18\x02\x20\x03(\tR\x0fblocksOtherMats\x12\x1b\n\tbars\ - _mats\x18\x03\x20\x03(\tR\x08barsMats\x12\x1f\n\x0bblocks_mats\x18\x04\ - \x20\x03(\tR\nblocksMats\x1a\x93\x01\n\x07GemsSet\x12(\n\x10rough_other_\ - mats\x18\x01\x20\x03(\tR\x0eroughOtherMats\x12$\n\x0ecut_other_mats\x18\ - \x02\x20\x03(\tR\x0ccutOtherMats\x12\x1d\n\nrough_mats\x18\x03\x20\x03(\ - \tR\troughMats\x12\x19\n\x08cut_mats\x18\x04\x20\x03(\tR\x07cutMats\x1a\ - \xa1\x01\n\x10FinishedGoodsSet\x12\x12\n\x04type\x18\x01\x20\x03(\tR\x04\ - type\x12\x1d\n\nother_mats\x18\x02\x20\x03(\tR\totherMats\x12\x12\n\x04m\ - ats\x18\x03\x20\x03(\tR\x04mats\x12!\n\x0cquality_core\x18\x04\x20\x03(\ - \tR\x0bqualityCore\x12#\n\rquality_total\x18\x05\x20\x03(\tR\x0cqualityT\ - otal\x1a\x20\n\nLeatherSet\x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\ - \x1a\x92\x02\n\x08ClothSet\x12\x1f\n\x0bthread_silk\x18\x01\x20\x03(\tR\ - \nthreadSilk\x12!\n\x0cthread_plant\x18\x02\x20\x03(\tR\x0bthreadPlant\ - \x12\x1f\n\x0bthread_yarn\x18\x03\x20\x03(\tR\nthreadYarn\x12!\n\x0cthre\ - ad_metal\x18\x04\x20\x03(\tR\x0bthreadMetal\x12\x1d\n\ncloth_silk\x18\ - \x05\x20\x03(\tR\tclothSilk\x12\x1f\n\x0bcloth_plant\x18\x06\x20\x03(\tR\ - \nclothPlant\x12\x1d\n\ncloth_yarn\x18\x07\x20\x03(\tR\tclothYarn\x12\ - \x1f\n\x0bcloth_metal\x18\x08\x20\x03(\tR\nclothMetal\x1a\x1d\n\x07WoodS\ - et\x12\x12\n\x04mats\x18\x01\x20\x03(\tR\x04mats\x1a\x81\x02\n\nWeaponsS\ - et\x12\x1f\n\x0bweapon_type\x18\x01\x20\x03(\tR\nweaponType\x12#\n\rtrap\ - comp_type\x18\x02\x20\x03(\tR\x0ctrapcompType\x12\x1d\n\nother_mats\x18\ - \x03\x20\x03(\tR\totherMats\x12\x12\n\x04mats\x18\x04\x20\x03(\tR\x04mat\ - s\x12!\n\x0cquality_core\x18\x05\x20\x03(\tR\x0bqualityCore\x12#\n\rqual\ - ity_total\x18\x06\x20\x03(\tR\x0cqualityTotal\x12\x16\n\x06usable\x18\ - \x07\x20\x01(\x08R\x06usable\x12\x1a\n\x08unusable\x18\x08\x20\x01(\x08R\ - \x08unusable\x1a\xb7\x02\n\x08ArmorSet\x12\x12\n\x04body\x18\x01\x20\x03\ - (\tR\x04body\x12\x12\n\x04head\x18\x02\x20\x03(\tR\x04head\x12\x12\n\x04\ - feet\x18\x03\x20\x03(\tR\x04feet\x12\x14\n\x05hands\x18\x04\x20\x03(\tR\ - \x05hands\x12\x12\n\x04legs\x18\x05\x20\x03(\tR\x04legs\x12\x16\n\x06shi\ - eld\x18\x06\x20\x03(\tR\x06shield\x12\x1d\n\nother_mats\x18\x07\x20\x03(\ - \tR\totherMats\x12\x12\n\x04mats\x18\x08\x20\x03(\tR\x04mats\x12!\n\x0cq\ - uality_core\x18\t\x20\x03(\tR\x0bqualityCore\x12#\n\rquality_total\x18\n\ - \x20\x03(\tR\x0cqualityTotal\x12\x16\n\x06usable\x18\x0b\x20\x01(\x08R\ - \x06usable\x12\x1a\n\x08unusable\x18\x0c\x20\x01(\x08R\x08unusableB\x02H\ + ity_total\x18\x05\x20\x03(\tR\x0cqualityTotal\x1a/\n\x07CoinSet\x12\x10\ + \n\x03all\x18\x02\x20\x01(\x08R\x03all\x12\x12\n\x04mats\x18\x01\x20\x03\ + (\tR\x04mats\x1a\xb3\x01\n\rBarsBlocksSet\x12\x10\n\x03all\x18\x05\x20\ + \x01(\x08R\x03all\x12&\n\x0fbars_other_mats\x18\x01\x20\x03(\tR\rbarsOth\ + erMats\x12*\n\x11blocks_other_mats\x18\x02\x20\x03(\tR\x0fblocksOtherMat\ + s\x12\x1b\n\tbars_mats\x18\x03\x20\x03(\tR\x08barsMats\x12\x1f\n\x0bbloc\ + ks_mats\x18\x04\x20\x03(\tR\nblocksMats\x1a\xa5\x01\n\x07GemsSet\x12\x10\ + \n\x03all\x18\x05\x20\x01(\x08R\x03all\x12(\n\x10rough_other_mats\x18\ + \x01\x20\x03(\tR\x0eroughOtherMats\x12$\n\x0ecut_other_mats\x18\x02\x20\ + \x03(\tR\x0ccutOtherMats\x12\x1d\n\nrough_mats\x18\x03\x20\x03(\tR\troug\ + hMats\x12\x19\n\x08cut_mats\x18\x04\x20\x03(\tR\x07cutMats\x1a\xf5\x01\n\ + \x10FinishedGoodsSet\x12\x10\n\x03all\x18\x06\x20\x01(\x08R\x03all\x12\ + \x12\n\x04type\x18\x01\x20\x03(\tR\x04type\x12\x1d\n\nother_mats\x18\x02\ + \x20\x03(\tR\totherMats\x12\x12\n\x04mats\x18\x03\x20\x03(\tR\x04mats\ + \x12!\n\x0cquality_core\x18\x04\x20\x03(\tR\x0bqualityCore\x12#\n\rquali\ + ty_total\x18\x05\x20\x03(\tR\x0cqualityTotal\x12\x12\n\x04dyed\x18\x07\ + \x20\x01(\x08R\x04dyed\x12\x16\n\x06undyed\x18\x08\x20\x01(\x08R\x06undy\ + ed\x12\x14\n\x05color\x18\t\x20\x03(\tR\x05color\x1at\n\nLeatherSet\x12\ + \x10\n\x03all\x18\x02\x20\x01(\x08R\x03all\x12\x12\n\x04mats\x18\x01\x20\ + \x03(\tR\x04mats\x12\x12\n\x04dyed\x18\x03\x20\x01(\x08R\x04dyed\x12\x16\ + \n\x06undyed\x18\x04\x20\x01(\x08R\x06undyed\x12\x14\n\x05color\x18\x05\ + \x20\x03(\tR\x05color\x1a\xe6\x02\n\x08ClothSet\x12\x10\n\x03all\x18\t\ + \x20\x01(\x08R\x03all\x12\x1f\n\x0bthread_silk\x18\x01\x20\x03(\tR\nthre\ + adSilk\x12!\n\x0cthread_plant\x18\x02\x20\x03(\tR\x0bthreadPlant\x12\x1f\ + \n\x0bthread_yarn\x18\x03\x20\x03(\tR\nthreadYarn\x12!\n\x0cthread_metal\ + \x18\x04\x20\x03(\tR\x0bthreadMetal\x12\x1d\n\ncloth_silk\x18\x05\x20\ + \x03(\tR\tclothSilk\x12\x1f\n\x0bcloth_plant\x18\x06\x20\x03(\tR\nclothP\ + lant\x12\x1d\n\ncloth_yarn\x18\x07\x20\x03(\tR\tclothYarn\x12\x1f\n\x0bc\ + loth_metal\x18\x08\x20\x03(\tR\nclothMetal\x12\x12\n\x04dyed\x18\n\x20\ + \x01(\x08R\x04dyed\x12\x16\n\x06undyed\x18\x0b\x20\x01(\x08R\x06undyed\ + \x12\x14\n\x05color\x18\x0c\x20\x03(\tR\x05color\x1a/\n\x07WoodSet\x12\ + \x10\n\x03all\x18\x02\x20\x01(\x08R\x03all\x12\x12\n\x04mats\x18\x01\x20\ + \x03(\tR\x04mats\x1a\x93\x02\n\nWeaponsSet\x12\x10\n\x03all\x18\t\x20\ + \x01(\x08R\x03all\x12\x1f\n\x0bweapon_type\x18\x01\x20\x03(\tR\nweaponTy\ + pe\x12#\n\rtrapcomp_type\x18\x02\x20\x03(\tR\x0ctrapcompType\x12\x1d\n\n\ + other_mats\x18\x03\x20\x03(\tR\totherMats\x12\x12\n\x04mats\x18\x04\x20\ + \x03(\tR\x04mats\x12!\n\x0cquality_core\x18\x05\x20\x03(\tR\x0bqualityCo\ + re\x12#\n\rquality_total\x18\x06\x20\x03(\tR\x0cqualityTotal\x12\x16\n\ + \x06usable\x18\x07\x20\x01(\x08R\x06usable\x12\x1a\n\x08unusable\x18\x08\ + \x20\x01(\x08R\x08unusable\x1a\x8b\x03\n\x08ArmorSet\x12\x10\n\x03all\ + \x18\r\x20\x01(\x08R\x03all\x12\x12\n\x04body\x18\x01\x20\x03(\tR\x04bod\ + y\x12\x12\n\x04head\x18\x02\x20\x03(\tR\x04head\x12\x12\n\x04feet\x18\ + \x03\x20\x03(\tR\x04feet\x12\x14\n\x05hands\x18\x04\x20\x03(\tR\x05hands\ + \x12\x12\n\x04legs\x18\x05\x20\x03(\tR\x04legs\x12\x16\n\x06shield\x18\ + \x06\x20\x03(\tR\x06shield\x12\x1d\n\nother_mats\x18\x07\x20\x03(\tR\tot\ + herMats\x12\x12\n\x04mats\x18\x08\x20\x03(\tR\x04mats\x12!\n\x0cquality_\ + core\x18\t\x20\x03(\tR\x0bqualityCore\x12#\n\rquality_total\x18\n\x20\ + \x03(\tR\x0cqualityTotal\x12\x16\n\x06usable\x18\x0b\x20\x01(\x08R\x06us\ + able\x12\x1a\n\x08unusable\x18\x0c\x20\x01(\x08R\x08unusable\x12\x12\n\ + \x04dyed\x18\x0e\x20\x01(\x08R\x04dyed\x12\x16\n\x06undyed\x18\x0f\x20\ + \x01(\x08R\x06undyed\x12\x14\n\x05color\x18\x10\x20\x03(\tR\x05color\x1a\ + 8\n\nCorpsesSet\x12\x10\n\x03all\x18\x01\x20\x01(\x08R\x03all\x12\x18\n\ + \x07corpses\x18\x02\x20\x03(\tR\x07corpses\x1aP\n\x08SheetSet\x12\x10\n\ + \x03all\x18\x01\x20\x01(\x08R\x03all\x12\x14\n\x05paper\x18\x02\x20\x03(\ + \tR\x05paper\x12\x1c\n\tparchment\x18\x03\x20\x03(\tR\tparchmentB\x02H\ \x03b\x06proto2\ "; @@ -4306,7 +5628,7 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { file_descriptor.get(|| { let generated_file_descriptor = generated_file_descriptor_lazy.get(|| { let mut deps = ::std::vec::Vec::with_capacity(0); - let mut messages = ::std::vec::Vec::with_capacity(17); + let mut messages = ::std::vec::Vec::with_capacity(19); messages.push(StockpileSettings::generated_message_descriptor_data()); messages.push(stockpile_settings::AnimalsSet::generated_message_descriptor_data()); messages.push(stockpile_settings::FoodSet::generated_message_descriptor_data()); @@ -4324,6 +5646,8 @@ pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor { messages.push(stockpile_settings::WoodSet::generated_message_descriptor_data()); messages.push(stockpile_settings::WeaponsSet::generated_message_descriptor_data()); messages.push(stockpile_settings::ArmorSet::generated_message_descriptor_data()); + messages.push(stockpile_settings::CorpsesSet::generated_message_descriptor_data()); + messages.push(stockpile_settings::SheetSet::generated_message_descriptor_data()); let mut enums = ::std::vec::Vec::with_capacity(0); ::protobuf::reflect::GeneratedFileDescriptor::new_generated( file_descriptor_proto(), diff --git a/dfhack-proto/src/generated/stubs/mod.rs b/dfhack-proto/src/generated/stubs/mod.rs index cb84bad..0d7e3a1 100644 --- a/dfhack-proto/src/generated/stubs/mod.rs +++ b/dfhack-proto/src/generated/stubs/mod.rs @@ -22,13 +22,9 @@ impl Stubs { ) -> crate::stubs::RemoteFortressReader { crate::stubs::RemoteFortressReader::new(&mut self.channel) } - ///RPCs of the isoworldremote plugin - pub fn isoworldremote(&mut self) -> crate::stubs::Isoworldremote { - crate::stubs::Isoworldremote::new(&mut self.channel) - } - ///RPCs of the rename plugin - pub fn rename(&mut self) -> crate::stubs::Rename { - crate::stubs::Rename::new(&mut self.channel) + ///RPCs of the mypluginname plugin + pub fn mypluginname(&mut self) -> crate::stubs::Mypluginname { + crate::stubs::Mypluginname::new(&mut self.channel) } } #[cfg(feature = "reflection")] @@ -38,7 +34,6 @@ impl crate::reflection::StubReflection for Stubs::list_methods()); methods.extend(Core::::list_methods()); methods.extend(Core::::list_methods()); - methods.extend(Core::::list_methods()); methods } } @@ -1001,121 +996,52 @@ for RemoteFortressReader<'_, TChannel> { ] } } -///RPC for the "isoworldremote" plugin. -pub struct Isoworldremote<'a, TChannel: crate::Channel> { - ///Reference to the client to exchange messages. - pub channel: &'a mut TChannel, -} -impl<'a, TChannel: crate::Channel> Isoworldremote<'a, TChannel> { - ///Initialize the plugin from a channel to DFHack. - pub fn new(channel: &'a mut TChannel) -> Self { - Self { channel } - } - ///Method `GetEmbarkInfo` from the plugin `isoworldremote` - pub fn get_embark_info( - &mut self, - request: MapRequest, - ) -> Result, TChannel::TError> { - let _response: crate::Reply = self - .channel - .request( - "isoworldremote".to_string(), - "GetEmbarkInfo".to_string(), - request, - )?; - Ok(_response) - } - ///Method `GetEmbarkTile` from the plugin `isoworldremote` - pub fn get_embark_tile( - &mut self, - request: TileRequest, - ) -> Result, TChannel::TError> { - let _response: crate::Reply = self - .channel - .request( - "isoworldremote".to_string(), - "GetEmbarkTile".to_string(), - request, - )?; - Ok(_response) - } - ///Method `GetRawNames` from the plugin `isoworldremote` - pub fn get_raw_names( - &mut self, - request: MapRequest, - ) -> Result, TChannel::TError> { - let _response: crate::Reply = self - .channel - .request("isoworldremote".to_string(), "GetRawNames".to_string(), request)?; - Ok(_response) - } -} -#[cfg(feature = "reflection")] -impl crate::reflection::StubReflection -for Isoworldremote<'_, TChannel> { - fn list_methods() -> Vec { - vec![ - crate ::reflection::RemoteProcedureDescriptor { name : "GetEmbarkInfo" - .to_string(), plugin_name : "isoworldremote".to_string(), input_type : - MapRequest::descriptor().full_name().to_string(), output_type : - MapReply::descriptor().full_name().to_string(), }, crate - ::reflection::RemoteProcedureDescriptor { name : "GetEmbarkTile".to_string(), - plugin_name : "isoworldremote".to_string(), input_type : - TileRequest::descriptor().full_name().to_string(), output_type : - EmbarkTile::descriptor().full_name().to_string(), }, crate - ::reflection::RemoteProcedureDescriptor { name : "GetRawNames".to_string(), - plugin_name : "isoworldremote".to_string(), input_type : - MapRequest::descriptor().full_name().to_string(), output_type : - RawNames::descriptor().full_name().to_string(), }, - ] - } -} -///RPC for the "rename" plugin. -pub struct Rename<'a, TChannel: crate::Channel> { +///RPC for the "mypluginname" plugin. +pub struct Mypluginname<'a, TChannel: crate::Channel> { ///Reference to the client to exchange messages. pub channel: &'a mut TChannel, } -impl<'a, TChannel: crate::Channel> Rename<'a, TChannel> { +impl<'a, TChannel: crate::Channel> Mypluginname<'a, TChannel> { ///Initialize the plugin from a channel to DFHack. pub fn new(channel: &'a mut TChannel) -> Self { Self { channel } } - ///Method `RenameBuilding` from the plugin `rename` + ///Method `RenameBuilding` from the plugin `mypluginname` pub fn rename_building( &mut self, request: RenameBuildingIn, ) -> Result, TChannel::TError> { let _response: crate::Reply = self .channel - .request("rename".to_string(), "RenameBuilding".to_string(), request)?; + .request("mypluginname".to_string(), "RenameBuilding".to_string(), request)?; let _response = crate::Reply { reply: (), fragments: _response.fragments, }; Ok(_response) } - ///Method `RenameSquad` from the plugin `rename` + ///Method `RenameSquad` from the plugin `mypluginname` pub fn rename_squad( &mut self, request: RenameSquadIn, ) -> Result, TChannel::TError> { let _response: crate::Reply = self .channel - .request("rename".to_string(), "RenameSquad".to_string(), request)?; + .request("mypluginname".to_string(), "RenameSquad".to_string(), request)?; let _response = crate::Reply { reply: (), fragments: _response.fragments, }; Ok(_response) } - ///Method `RenameUnit` from the plugin `rename` + ///Method `RenameUnit` from the plugin `mypluginname` pub fn rename_unit( &mut self, request: RenameUnitIn, ) -> Result, TChannel::TError> { let _response: crate::Reply = self .channel - .request("rename".to_string(), "RenameUnit".to_string(), request)?; + .request("mypluginname".to_string(), "RenameUnit".to_string(), request)?; let _response = crate::Reply { reply: (), fragments: _response.fragments, @@ -1125,20 +1051,21 @@ impl<'a, TChannel: crate::Channel> Rename<'a, TChannel> { } #[cfg(feature = "reflection")] impl crate::reflection::StubReflection -for Rename<'_, TChannel> { +for Mypluginname<'_, TChannel> { fn list_methods() -> Vec { vec![ crate ::reflection::RemoteProcedureDescriptor { name : "RenameBuilding" - .to_string(), plugin_name : "rename".to_string(), input_type : + .to_string(), plugin_name : "mypluginname".to_string(), input_type : RenameBuildingIn::descriptor().full_name().to_string(), output_type : EmptyMessage::descriptor().full_name().to_string(), }, crate ::reflection::RemoteProcedureDescriptor { name : "RenameSquad".to_string(), - plugin_name : "rename".to_string(), input_type : RenameSquadIn::descriptor() - .full_name().to_string(), output_type : EmptyMessage::descriptor() - .full_name().to_string(), }, crate ::reflection::RemoteProcedureDescriptor { - name : "RenameUnit".to_string(), plugin_name : "rename".to_string(), - input_type : RenameUnitIn::descriptor().full_name().to_string(), output_type - : EmptyMessage::descriptor().full_name().to_string(), }, + plugin_name : "mypluginname".to_string(), input_type : + RenameSquadIn::descriptor().full_name().to_string(), output_type : + EmptyMessage::descriptor().full_name().to_string(), }, crate + ::reflection::RemoteProcedureDescriptor { name : "RenameUnit".to_string(), + plugin_name : "mypluginname".to_string(), input_type : + RenameUnitIn::descriptor().full_name().to_string(), output_type : + EmptyMessage::descriptor().full_name().to_string(), }, ] } }