From be9f93051df832c1132739d8abf953de6c08504e Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 18:51:52 -0700 Subject: [PATCH 01/23] minor adjustments to professions; more to come --- data/examples/professions/Farmer | 19 +---------- .../professions/{Unskilled => Laborer} | 3 +- data/examples/professions/Miner | 2 +- .../examples/professions/{Clothier => Tailor} | 2 +- docs/guides/examples-guide.rst | 32 +++++++++++++++---- 5 files changed, 30 insertions(+), 28 deletions(-) rename data/examples/professions/{Unskilled => Laborer} (92%) rename data/examples/professions/{Clothier => Tailor} (85%) diff --git a/data/examples/professions/Farmer b/data/examples/professions/Farmer index 07a33e6c84..e3be2a3bb7 100644 --- a/data/examples/professions/Farmer +++ b/data/examples/professions/Farmer @@ -11,24 +11,7 @@ MILK SHEARER SPINNER PRESSING -BEEKEEPING GELD -CLEAN_FISH -DISSECT_FISH PAPERMAKING -HAUL_STONE -HAUL_WOOD -HAUL_ITEM -HAUL_BODY HAUL_FOOD -HAUL_REFUSE -HAUL_FURNITURE -HAUL_ANIMALS -HANDLE_VEHICLES -HAUL_TRADE -HAUL_WATER -CLEAN -PULL_LEVER -BUILD_ROAD -BUILD_CONSTRUCTION -REMOVE_CONSTRUCTION +ALCHEMIST diff --git a/data/examples/professions/Unskilled b/data/examples/professions/Laborer similarity index 92% rename from data/examples/professions/Unskilled rename to data/examples/professions/Laborer index b3e341ee3e..82d26c4a72 100644 --- a/data/examples/professions/Unskilled +++ b/data/examples/professions/Laborer @@ -1,5 +1,4 @@ -NAME Unskilled -TANNER +NAME Laborer SOAP_MAKER BURN_WOOD POTASH_MAKING diff --git a/data/examples/professions/Miner b/data/examples/professions/Miner index bc1f71eae2..7be84512d6 100644 --- a/data/examples/professions/Miner +++ b/data/examples/professions/Miner @@ -1,5 +1,5 @@ NAME Miner MINE DETAIL -HANDLE_VEHICLES +RECOVER_WOUNDED ALCHEMIST diff --git a/data/examples/professions/Clothier b/data/examples/professions/Tailor similarity index 85% rename from data/examples/professions/Clothier rename to data/examples/professions/Tailor index 4f9b364594..d90527ccdf 100644 --- a/data/examples/professions/Clothier +++ b/data/examples/professions/Tailor @@ -1,4 +1,4 @@ -NAME Clothier +NAME Tailor DYER LEATHER WEAVER diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst index 0fed9a9c33..8e99160df5 100644 --- a/docs/guides/examples-guide.rst +++ b/docs/guides/examples-guide.rst @@ -177,20 +177,27 @@ Chef 0 2 Cooking. It is important to focus just a few dwarves on cooking since well-crafted meals make dwarves very happy. They are also an excellent trade good. -Clothier 0 2 Textile industry labors: Dying, Leatherworking, +Tailor 0 2 Textile industry labors: Dying, Leatherworking, Weaving, and Clothesmaking. Doctor 0 2-4 The full suite of medical labors, plus Animal Caretaking for those using the dwarfvet plugin. Farmer 0 5 Food- and animal product-related labors. -Fisherdwarf 0 0 Fishing. If you assign this profession to any - dwarf, be prepared to be inundated with fish. - Fisherdwarves *never stop fishing*. +Fisherdwarf 0 0 Fishing and fish cleaning. If you assign this + profession to any dwarf, be prepared to be + inundated with fish. Fisherdwarves *never stop + fishing*. Be sure to also run `prioritize -a + PrepareRawFish ExtractFromRawFish` (or use the + ``onMapLoad_dreamfort.init`` file above) or else + caught fish will just be left to rot. Hauler 0 >20 All hauling labors plus Mechanic (so haulers can assist in reloading traps) and Architecture (so haulers can help build massive windmill farms and pump stacks). As you accumulate enough Haulers, you can turn off hauling labors for other dwarves - so they can focus on their skilled tasks. + so they can focus on their skilled tasks. You may + also want to restrict your Mechanic's workshops + to only skilled mechanics so your haulers don't + make low-quality mechanisms. Marksdwarf 0 10 Same as Hauler, but with a different name so you can find your military dwarves more easily. Meleedwarf 0 50 Mostly the same as Hauler, but with a different @@ -201,7 +208,20 @@ Smith 0 4 Smithing, Glassmaking, Pottery, and Siege Engineering labors. You will likely want to specialize your Smiths to focus on either weapons or armor to maximize equipment quality. -Unskilled 0 10-12 All labors that don't improve quality with skill, +Laborer 0 10-12 All labors that don't improve quality with skill, such as furnace labors, Soapmaking, and Pump Operating. ============= ======== ===== ================================================= + +A note on autohauler +~~~~~~~~~~~~~~~~~~~~ + +These profession definitions are designed to work well with or without the +`autohauler` plugin. If you do want to use autohauler, adding the following +lines to your ``onMapLoad.init`` file will configure it to let the professions +manage the "Feed water to civilians" and "Recover wounded" labors instead of +enabling those labors for all hauling dwarves:: + + on-new-fortress enable autohauler + on-new-fortress autohauler FEED_WATER_CIVILIANS allow + on-new-fortress autohauler RECOVER_WOUNDED allow From 64185e544999dcd76729d66bac637338421f8b5e Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 18:52:17 -0700 Subject: [PATCH 02/23] automatically prioritize fish cleaning --- data/examples/init/onMapLoad_dreamfort.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init index 79476c48e4..78adf73817 100644 --- a/data/examples/init/onMapLoad_dreamfort.init +++ b/data/examples/init/onMapLoad_dreamfort.init @@ -41,7 +41,7 @@ seedwatch start # ensures important tasks get assigned to workers. # otherwise these job types can get ignored in busy forts. -prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever DestroyBuilding RemoveConstruction RecoverWounded FillPond DumpItem SlaughterAnimal +prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever DestroyBuilding RemoveConstruction RecoverWounded FillPond DumpItem SlaughterAnimal PrepareRawFish ExtractFromRawFish # autobutcher settings are saved in the savegame, so we only need to set them once. # this way, any custom settings you set during gameplay are not overwritten From 9e0a4ba571e005baa064fdab97d2563f1da0f9d1 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 18:52:55 -0700 Subject: [PATCH 03/23] add "restock" orders for rock, glass, and wood also adjust bags and collect sand orders to support glasstock.json --- data/examples/orders/basic.json | 8 +- data/examples/orders/furnace.json | 12 +- data/examples/orders/glassstock.json | 688 +++++++++++++++++++++++++++ data/examples/orders/rockstock.json | 531 +++++++++++++++++++++ data/examples/orders/woodstock.json | 54 +++ 5 files changed, 1283 insertions(+), 10 deletions(-) create mode 100644 data/examples/orders/glassstock.json create mode 100644 data/examples/orders/rockstock.json create mode 100644 data/examples/orders/woodstock.json diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json index 8474e486bd..ff165db6ae 100644 --- a/data/examples/orders/basic.json +++ b/data/examples/orders/basic.json @@ -709,7 +709,7 @@ "sewn_imageless" ], "item_type" : "BOX", - "value" : 20 + "value" : 30 } ], "job" : "ConstructChest", @@ -745,7 +745,7 @@ "sewn_imageless" ], "item_type" : "BOX", - "value" : 20 + "value" : 30 } ], "job" : "ConstructChest", @@ -781,7 +781,7 @@ "sewn_imageless" ], "item_type" : "BOX", - "value" : 20 + "value" : 30 } ], "job" : "ConstructChest", @@ -817,7 +817,7 @@ "sewn_imageless" ], "item_type" : "BOX", - "value" : 20 + "value" : 30 } ], "job" : "ConstructChest", diff --git a/data/examples/orders/furnace.json b/data/examples/orders/furnace.json index f7fb6133cb..1bb7e6641b 100644 --- a/data/examples/orders/furnace.json +++ b/data/examples/orders/furnace.json @@ -17,7 +17,7 @@ "condition" : "AtMost", "item_type" : "BAR", "material" : "COAL", - "value" : 100 + "value" : 150 }, { "condition" : "AtMost", @@ -183,8 +183,8 @@ "reaction" : "MAKE_PEARLASH" }, { - "amount_left" : 1, - "amount_total" : 1, + "amount_left" : 4, + "amount_total" : 4, "frequency" : "Daily", "id" : 40, "is_active" : false, @@ -199,7 +199,7 @@ "bag" ], "item_type" : "BOX", - "value" : 5 + "value" : 10 }, { "condition" : "AtMost", @@ -207,7 +207,7 @@ [ "sand_bearing" ], - "value" : 10 + "value" : 30 } ], "job" : "CollectSand" @@ -396,7 +396,7 @@ "condition" : "AtLeast", "item_type" : "BAR", "material" : "COAL", - "value" : 150 + "value" : 100 } ], "job" : "MeltMetalObject" diff --git a/data/examples/orders/glassstock.json b/data/examples/orders/glassstock.json new file mode 100644 index 0000000000..bb80cf9f63 --- /dev/null +++ b/data/examples/orders/glassstock.json @@ -0,0 +1,688 @@ +[ + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 187, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "ARMORSTAND", + "value" : 2 + } + ], + "job" : "ConstructArmorStand", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 188, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "BLOCKS", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "job" : "ConstructBlocks", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 189, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "BOX", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "job" : "ConstructChest", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 190, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "CABINET", + "value" : 2 + } + ], + "job" : "ConstructCabinet", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 191, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "COFFIN", + "value" : 2 + } + ], + "job" : "ConstructCoffin", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 192, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "FLOODGATE", + "value" : 2 + } + ], + "job" : "ConstructFloodgate", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 193, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "GRATE", + "value" : 2 + } + ], + "job" : "ConstructGrate", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 194, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "HATCH_COVER", + "value" : 2 + } + ], + "job" : "ConstructHatchCover", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 195, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "DOOR", + "value" : 2 + } + ], + "job" : "ConstructDoor", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 196, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "STATUE", + "value" : 2 + } + ], + "job" : "ConstructStatue", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 197, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "TABLE", + "value" : 2 + } + ], + "job" : "ConstructTable", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 198, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "CHAIR", + "value" : 2 + } + ], + "job" : "ConstructThrone", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 199, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "WEAPONRACK", + "value" : 2 + } + ], + "job" : "ConstructWeaponRack", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 200, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TRAPCOMP_ENORMOUSCORKSCREW", + "item_type" : "TRAPCOMP", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TRAPCOMP_ENORMOUSCORKSCREW", + "job" : "MakeTrapComponent", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 201, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_ALTAR", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_ALTAR", + "job" : "MakeTool", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 202, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_BOOKCASE", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_BOOKCASE", + "job" : "MakeTool", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 203, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_PEDESTAL", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_PEDESTAL", + "job" : "MakeTool", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 204, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "CAGE", + "value" : 2 + } + ], + "job" : "MakeCage", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 205, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "PIPE_SECTION", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "job" : "MakePipeSection", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 206, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "WINDOW", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "job" : "MakeWindow", + "material" : "GLASS_GREEN" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 207, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "sand_bearing" + ], + "value" : 15 + }, + { + "condition" : "AtLeast", + "item_type" : "BAR", + "material" : "COAL", + "value" : 100 + }, + { + "condition" : "AtMost", + "item_type" : "FLASK", + "material" : "GLASS_GREEN", + "value" : 2 + } + ], + "job" : "MakeFlask", + "material" : "GLASS_GREEN" + } +] diff --git a/data/examples/orders/rockstock.json b/data/examples/orders/rockstock.json new file mode 100644 index 0000000000..cd7f354c9d --- /dev/null +++ b/data/examples/orders/rockstock.json @@ -0,0 +1,531 @@ +[ + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 169, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "ARMORSTAND", + "value" : 2 + } + ], + "job" : "ConstructArmorStand", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 170, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "BLOCKS", + "value" : 20 + } + ], + "job" : "ConstructBlocks", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 171, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "CABINET", + "value" : 2 + } + ], + "job" : "ConstructCabinet", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 172, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "BOX", + "material" : "INORGANIC", + "value" : 2 + } + ], + "job" : "ConstructChest", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 173, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "COFFIN", + "value" : 2 + } + ], + "job" : "ConstructCoffin", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 174, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "DOOR", + "value" : 2 + } + ], + "job" : "ConstructDoor", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 175, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "FLOODGATE", + "value" : 2 + } + ], + "job" : "ConstructFloodgate", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 176, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "GRATE", + "value" : 2 + } + ], + "job" : "ConstructGrate", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 177, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "HATCH_COVER", + "value" : 2 + } + ], + "job" : "ConstructHatchCover", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 178, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "TRAPPARTS", + "value" : 10 + } + ], + "job" : "ConstructMechanisms", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 179, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "SLAB", + "value" : 2 + } + ], + "job" : "ConstructSlab", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 180, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "STATUE", + "value" : 2 + } + ], + "job" : "ConstructStatue", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 181, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "TABLE", + "value" : 2 + } + ], + "job" : "ConstructTable", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 182, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "CHAIR", + "value" : 2 + } + ], + "job" : "ConstructThrone", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 183, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "WEAPONRACK", + "value" : 2 + } + ], + "job" : "ConstructWeaponRack", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 184, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_ALTAR", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_ALTAR", + "job" : "MakeTool", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 185, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_BOOKCASE", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_BOOKCASE", + "job" : "MakeTool", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 186, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_PEDESTAL", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_PEDESTAL", + "job" : "MakeTool", + "material" : "INORGANIC" + } +] diff --git a/data/examples/orders/woodstock.json b/data/examples/orders/woodstock.json new file mode 100644 index 0000000000..ce8865f060 --- /dev/null +++ b/data/examples/orders/woodstock.json @@ -0,0 +1,54 @@ +[ + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 208, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_type" : "BED", + "value" : 2 + } + ], + "job" : "ConstructBed", + "material_category" : + [ + "wood" + ] + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 209, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_type" : "CAGE", + "value" : 2 + } + ], + "job" : "MakeCage", + "material_category" : + [ + "wood" + ] + } +] From aaad7782b19f2c0482a9da2da0c26f0638ea1eb8 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 20:09:02 -0700 Subject: [PATCH 04/23] fix doc typo --- docs/guides/examples-guide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst index 8e99160df5..f5d8242c17 100644 --- a/docs/guides/examples-guide.rst +++ b/docs/guides/examples-guide.rst @@ -185,8 +185,8 @@ Farmer 0 5 Food- and animal product-related labors. Fisherdwarf 0 0 Fishing and fish cleaning. If you assign this profession to any dwarf, be prepared to be inundated with fish. Fisherdwarves *never stop - fishing*. Be sure to also run `prioritize -a - PrepareRawFish ExtractFromRawFish` (or use the + fishing*. Be sure to also run ``prioritize -a + PrepareRawFish ExtractFromRawFish`` (or use the ``onMapLoad_dreamfort.init`` file above) or else caught fish will just be left to rot. Hauler 0 >20 All hauling labors plus Mechanic (so haulers can From 3ea5cd79e149f2581625bf565b01dc5f60711ee3 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 20:19:49 -0700 Subject: [PATCH 05/23] refresh dreamfort blueprints - move the first apartments level up in the checklist. it's usually needed before some of the "frills" blueprints - remove unreliable `addcloak` alias from the `/setup` blueprint and replace it with a message that suggests manually adding leather cloaks to uniforms. We'll find a way to automate this someday. - add instructions for expanding the `Inside` burrow as the fort is built - add two craftsdwarf's workshops to the industry level, for a total of three. add suggestions for setting their profiles to restrict them individually to wood, stone, and bones - add suggestion for restricting the mechanic's workshop to only be used by skilled dwarves - widen the 1-wide corridor in the apartments level to 2-wide. the blueprint still fits within the footprint of the suites level, so we still fit fine in a 1x1 embark. --- data/blueprints/library/dreamfort.csv | 113 ++++++++++++++------------ 1 file changed, 61 insertions(+), 52 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index e0bd385ce4..4b4d5ea981 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -80,12 +80,14 @@ prioritize ConstructBuilding,# Run when you see the bridges ready to be built so "" -- Plumbing -- "This is a good time to fill your well cisterns, either with a bucket brigade or by routing water from an aquifer or freshwater stream." -"Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that setting up a powered pump stack is a tricky process and can take a long time. Don't forget to continue making progress through the checklist as you prepare to pump your magma! If you are going to pump magma, I suggest doing it before importing the military and smelting automation orders since they make heavy use of smelters and forges." +"Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that setting up a powered pump stack is a tricky process and can take a long time. Don't forget to continue making progress through the checklist as you prepare to pump your magma! If you are going to pump magma, I suggest doing it before importing the military and smelting automation orders since they make heavy use of furnaces and forges." "" -- Mature fort (third migration wave onward) -- orders import furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand). "quickfort run,orders library/dreamfort.csv -n /suites2",# Run when the suites level has been dug out. "quickfort run,orders library/dreamfort.csv -n /surface8","# Run if/when you need longer trap corridors on the surface for larger sieges, anytime after you run /surface7." +"quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the first apartment level has been dug out. +"quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed on the first apartments level. "quickfort run,orders library/dreamfort.csv -n /services3","# Run after the dining table and chair, weapon rack, and archery targets have been constructed. Also wait until after you complete /surface7, though, because surface defenses are more important than a grand dining hall." "quickfort run,orders library/dreamfort.csv -n /guildhall2",# Run when the guildhall level has been dug out. "quickfort run,orders library/dreamfort.csv -n /farming4",# Run once you have a cache of potash. @@ -93,7 +95,7 @@ orders import military,# Automated production of military equipment. Turn on aut orders import smelting,# Automated production of all types of metal bars. "quickfort run,orders library/dreamfort.csv -n /services4","# Run when you need a jail and/or fancy statues in the dining room, anytime after the restraints are placed from /services3." "" --- Repeat for each apartments level -- +-- Repeat for each remaining apartments level as needed -- "quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out. "quickfort run,orders library/dreamfort.csv -n /apartments3",# Run when all beds have been constructed. burial -pets,# Run once the coffins are placed to set them to allow for burial. This is handled for you if you are using the provided onMapLoad.init file. @@ -112,14 +114,15 @@ The following settings are changed: - gather refuse from outside (incl. vermin) - no autoloom (we'll be managing cloth production with automated orders) "" -"- A burrow named ""Inside"" is created (it's up to the player to define the area, though). An alert named ""Siege"" is also created and associated with the ""Inside"" burrow, intended for use in getting your civilians to safety during sieges." +"- A burrow named ""Inside"" is created (it's up to the player to define the area). It is intended for use in getting your civilians to safety during sieges. An alert named ""Siege"" is also created and associated with the ""Inside"" burrow." "" - Military uniforms get the following modifications: - all default uniforms set to replace clothing - - all default uniforms get a leather cloak " - in the ""Metal armor"" uniform, the ""metal armor"" item is removed and replaced by ""metal breastplate"" and ""metal mail shirt""" " - in the ""Metal armor"" uniform, the ""metal legwear"" item is removed and replaced by ""metal greaves""" "" +"All default uniforms should also have a leather cloak added, but the position of the cloak in the equipment list changes for every embark. We suggest manually adding a leather cloak to your uniforms after running the /setup blueprint." +"" - Hotkeys are created for the 8 most interesting levels. Only the names are set -- it's up to the player to adjust them to actual locations in the (H) menu since the blueprint can't know where the levels will eventually be built. Feel free to replace any hotkeys with locations that *you* think are interesting : ) "" These are all set for your convenience. Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference. @@ -128,13 +131,14 @@ These are all set for your convenience. Nothing in Dreamfort depends on these se startnobles: ^n{Down 4}{togglesequence 8}{Up}s{Up}&^^q startorders: ^ohrov^Wl^^q startburrows: ^wa&nInside&^^q -addcloak: A{Right 2}{Down 8}&{Left}{Down}M{Right}{Down 4}&{Left 2} -metalarmorsetup: {addcloak}A{Right 2}{Down 2}&{Down}&{Left}&{Down}M{Right}{Down}&{Left}{Down}{Right}{Down}&{Left}{Down 2}L{Right}{Down 2}&{Left}{Down 4}&M{Right}{Down}&{Left 2} -startmilitary: ^mnr{addcloak}{Down}r{metalarmorsetup}{Down}r{addcloak}acNSiege&{Right}&^q +metalarmorsetup: A{Right 2}{Down 2}&{Down}&{Left}&M{Right}{Down}&{Left}{Down}{Right}{Down}&{Left}{Down 2}L{Right}{Down 2}&{Left}{Down 3}&M{Right}{Down}&{Left 2} +startmilitary: ^mnr{Down}r{metalarmorsetup}{Down}racNSiege&{Right}&^q sethotkey: {fkey}n{name}& starthotkeys: ^H{sethotkey fkey={F2} name=Farming}{sethotkey fkey={F3} name=Industry}{sethotkey fkey={F4} name=Services}{sethotkey fkey={F5} name=Guildhall}{sethotkey fkey={F6} name=Quarry}{sethotkey fkey={F7} name=Cavern}{sethotkey fkey={F8} name=Magma}^q "" "#query label(setup) start(on the wagon) message(Please set the zoom targets of the hotkeys (the 'H' menu) according to where you actually end up digging the levels. +As you build your fort, expand the Inside burrow to include new civilian-safe areas. +Optionally, add a leather cloak to your military uniforms to enhance the protection of the uniforms. Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference.) assign nobles, set standing orders, create burrows, make adjustments to military uniforms, and set hotkey names" {startnobles}{startorders}{startburrows}{startmilitary}{starthotkeys}{F1} "#meta label(dig_all) start(central stairs on industry level) dig industry, services, guildhall, suites, and apartments levels. does not include farming." @@ -1806,8 +1810,8 @@ with separate stockpiles for: - Meltable weapons and armor "" Workshops: -- 3x Mason -- 1x Craftsdwarf +- 2x Mason +- 3x Craftsdwarf - 1x Jeweler - 1x Mechanic - 4x Smelter @@ -1828,9 +1832,13 @@ Workshops: Manual steps you have to take: - Assign minecarts to your quantum stockpile hauling routes "- Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level" -"- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure you're in a heavily forested area, enable auto-chop, and keep your coal stocks high." - Copy the fort automation manager orders (the .json files) from hack/examples/orders/ and put them in your dfhack-config/orders/ directory. "" +Optional manual steps you can take: +- Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms. +"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workship near the Mason's workshops, and Bonecrafting for the Craftsdwarf's workshop near the Clothier's workshop." +"- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high." +"" Industry Walkthrough: "1) Start digging out /industry1 as soon as you find a stone layer at least two layers beneath the surface so the boulders can be used by your starting workshops. The services level is intended to be dug beneath this one, and there is space on that level to route magma underneath your furnaces so you can replace the furnaces on this level with magma-powered equivalents." "" @@ -1894,12 +1902,12 @@ query/industry_query ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,wr,`,`,`,`,`,`,`,wt,`,`,`,`,`,`,`,`,` -,,,,`,`,`,`,ws,`,`,`,`,`,`,`,`,trackstopN,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,trackstopN,`,`,`,`,`,`,`,`,ws,`,`,`,` +,,,,`,`,`,`,`,wr,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` -,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,`,`,` +,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,wr,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,` @@ -1961,7 +1969,8 @@ query/industry_query - assign minecarts to to your quantum stockpile hauling routes - if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level - if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt -- once you have enough dwarves, run ""orders import basic"" to automate your fort's basic needs (download the automation orders from https://drive.google.com/drive/folders/196RS9d-tis7AoOw1t2EzLF6eRWqYwnEm and put it in your dfhack-config/orders/ directory))" +- once you have enough dwarves, run ""orders import basic"" to automate your fort's basic needs (see /industry_help for more info on this file) +- optionally, restrict the labors for your Craftsdwarf's and Mechanic's workshops as per the guidance in /industry_help)" ,,,,,,,,,,,roughgems,,,,nocontainers,"{givename name=""rough gems for moods""}",t{Down 5}&,,,,,~,~ @@ -1970,8 +1979,8 @@ query/industry_query ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,"{quantum name=""stoneworker quantum""}g{Up 3}&",`,`,`,~,`,`,`,`,`,`,`,`,` -,,,,`,`,`,`,~,`,`,`,`,`,`,`,`,"{quantumstop name=""Stoneworker quantum"" sp_links=""{sp_link move={Down} move_back={Up}}{sp_link move=""""{Down 5}"""" move_back=""""{Up 5}""""}""}{givename name=""stoneworker dumper""}",`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,`,`,`,`,`,`,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,` +,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstop name=""Stoneworker quantum"" sp_links=""{sp_link move={Down} move_back={Up}}{sp_link move=""""{Down 5}"""" move_back=""""{Up 5}""""}""}{givename name=""stoneworker dumper""}",`,`,`,`,`,`,`,`,~,`,`,`,` +,,,,`,`,`,`,`,~,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,~,`,"{givename name=""stone feeder""}",~,~,~,~,`,~,`,`,`,`,`,`,`,`,` ,,"{givename name=""wood""}",`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` @@ -2755,11 +2764,11 @@ Apartments Walkthrough: "#dig label(apartments1) start(18; 18; central ramp) message(This would be a good time to enqueue manager orders for /apartments2 and /apartments3. Once the area is dug out, continue with /apartments2.) apartment complex" -,,,,,,,,,,,,,,,,d,d,d ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d -,,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,d,d,,d,d,d,,d,d,d -,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d +,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d +,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d +,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d ,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d ,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d @@ -2783,19 +2792,19 @@ Apartments Walkthrough: ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d ,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d ,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d -,,,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d -,,,,d,d,d,,d,d,d,,d,d,d,,,d,,,d,d,d,,d,d,d,,d,d,d +,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d +,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d +,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d ,,,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d -,,,,,,,,,,,,,,,,d,d,d "#build label(apartments2) start(18; 18; central ramp) message(Once beds have been placed, continue with /apartments3.) build beds" -,,,,,,,,,,,,,,,,`,`,` -,,,,`,`,`,,`,`,`,,`,`,`,,`,b,`,,`,`,`,,`,`,`,,`,`,` -,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,` -,,,,`,`,`,,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,,`,`,` -,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,` +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` ,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` @@ -2819,22 +2828,22 @@ Apartments Walkthrough: ,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` ,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` -,,,,`,`,`,,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,,`,`,` -,,,,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,b,`,,`,b,`,,`,b,` -,,,,`,`,`,,`,`,`,,`,`,`,,`,b,`,,`,`,`,,`,`,`,,`,`,` -,,,,,,,,,,,,,,,,`,`,` +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,`,,`,b,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` #meta label(apartments3) start(central ramp) configure rooms and build remaining furniture query_apartments/apartments_rooms build2_apartments/apartments_build2 #query label(apartments_rooms) start(18; 18) hidden() configure rooms -,,,,,,,,,,,,,,,,`,`,` -,,,,`,`,`,,`,`,`,,`,`,`,,`,r-&,`,,`,`,`,,`,`,`,,`,`,` -,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,` -,,,,`,`,`,,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,,`,`,` -,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,` +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` ,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` @@ -2858,19 +2867,19 @@ build2_apartments/apartments_build2 ,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` ,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,` -,,,,`,`,`,,`,`,`,,`,`,`,,,`,,,`,`,`,,`,`,`,,`,`,` -,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,`,`,,`,r-&,`,,`,r-&,`,,`,r-&,` -,,,,`,`,`,,`,`,`,,`,`,`,,`,r-&,`,,`,`,`,,`,`,`,,`,`,` -,,,,,,,,,,,,,,,,`,`,` +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` +,,,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,`,,`,r-&,` +,,,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,` #build label(apartments_build2) start(18; 18) hidden() message(Coffins should be configured with DFHack burial script) build remaining furniture -,,,,,,,,,,,,,,,,n,`,h -,,,,n,`,h,,n,`,h,,n,`,h,,`,~,`,,n,`,h,,n,`,h,,n,`,h -,,,,`,~,`,,`,~,`,,`,~,`,,n,`,f,,`,~,`,,`,~,`,,`,~,` -,,,,n,`,f,,n,`,f,,n,`,f,,,d,,,n,`,f,,n,`,f,,n,`,f -,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d +,,,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h +,,,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,` +,,,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f +,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,,d,,,,d,,,,d,,,`,s,`,,,d,,,,d,,,,d ,,,,n,`,h,,n,`,h,,n,`,h,,`,`,`,,n,`,h,,n,`,h,,n,`,h @@ -2894,9 +2903,9 @@ build2_apartments/apartments_build2 ,,,,n,`,f,,n,`,f,,n,`,f,,`,`,`,,n,`,f,,n,`,f,,n,`,f ,,,,,d,,,,d,,,,d,,,`,s,`,,,d,,,,d,,,,d ,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d -,,,,n,`,h,,n,`,h,,n,`,h,,,d,,,n,`,h,,n,`,h,,n,`,h -,,,,`,~,`,,`,~,`,,`,~,`,,n,`,h,,`,~,`,,`,~,`,,`,~,` -,,,,n,`,f,,n,`,f,,n,`,f,,`,~,`,,n,`,f,,n,`,f,,n,`,f -,,,,,,,,,,,,,,,,n,`,f +,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d,,,,d +,,,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h,,n,`,h +,,,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,`,,`,~,` +,,,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f,,n,`,f From 1e0d54b6e224b6a13f773e81652fa9dae52bb9b9 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 21 Aug 2021 20:34:06 -0700 Subject: [PATCH 06/23] remove blocks from starting misc pile --- data/blueprints/library/dreamfort.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 4b4d5ea981..4c1f53d4a4 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -581,7 +581,7 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway ,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` -,,,`,,`,f(8x4),,,,,,,,w(4x4),,,,s2(5x4),,,,,gunbzSpd(4x4),,,,hlr(4x4),,,,`,,` +,,,`,,`,f(8x4),,,,,,,,w(4x4),,,,s2(5x4),,,,,gunzSpd(4x4),,,,hlr(4x4),,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` From 3bd446db90cf9907eaf7d083f8840bf9eca15746 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 22 Aug 2021 23:45:28 -0700 Subject: [PATCH 07/23] add goblet-related aliases --- data/quickfort/aliases-common.txt | 11 +++++++---- docs/guides/quickfort-alias-guide.rst | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index ff9aa334b7..8fe0acc747 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -349,12 +349,15 @@ finishedgoodsprefix: {enter_sp_config}{Down 10} enablefinishedgoods: {finishedgoodsprefix}e^ disablefinishedgoods: {finishedgoodsprefix}d^ -crafts: {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^ -jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^ +crafts: {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^ +goblets: {finishedgoodsprefix}{Right}f{Right}{Down 2}&^ +jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^ -forbidcrafts: {finishedgoodsprefix}{Right 2}{Down 9}{togglesequence 9}^ +forbidcrafts: {finishedgoodsprefix}{Right 2}{Down 9}{togglesequence 9}^ +forbidgoblets: {finishedgoodsprefix}{Right 2}{Down 2}&^ -permitcrafts: {forbidcrafts} +permitcrafts: {forbidcrafts} +permitgoblets: {forbidgoblets} masterworkfinishedgoods: {masterworkonly prefix={finishedgoodsprefix}} artifactfinishedgoods: {artifactonly prefix={finishedgoodsprefix}} diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst index 4e089f193b..9fc09ce4dd 100644 --- a/docs/guides/quickfort-alias-guide.rst +++ b/docs/guides/quickfort-alias-guide.rst @@ -803,6 +803,7 @@ Exclusive Forbid Permit ======================= ============================= ============================= jugs crafts forbidcrafts permitcrafts +goblets forbidgoblets permitgoblets masterworkfinishedgoods forbidmasterworkfinishedgoods permitmasterworkfinishedgoods artifactfinishedgoods forbidartifactfinishedgoods permitartifactfinishedgoods ======================= ============================= ============================= From 0c20ce3997a5cf0be90e8ee23e775006f00671a1 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 22 Aug 2021 23:46:29 -0700 Subject: [PATCH 08/23] use "lye" as counter instead of "lye-containing" --- data/examples/orders/basic.json | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json index ff165db6ae..aca5a2037c 100644 --- a/data/examples/orders/basic.json +++ b/data/examples/orders/basic.json @@ -945,12 +945,9 @@ }, { "condition" : "AtMost", - "contains" : - [ - "lye" - ], - "reaction_id" : "MAKE_SOAP_FROM_TALLOW", - "value" : 3 + "item_type" : "LIQUID_MISC", + "material" : "LYE", + "value" : 5 } ], "job" : "MakeLye" @@ -977,12 +974,9 @@ }, { "condition" : "AtLeast", - "contains" : - [ - "lye" - ], - "reaction_id" : "MAKE_SOAP_FROM_TALLOW", - "value" : 2 + "item_type" : "LIQUID_MISC", + "material" : "LYE", + "value" : 3 }, { "condition" : "AtMost", @@ -1014,12 +1008,9 @@ }, { "condition" : "AtLeast", - "contains" : - [ - "lye" - ], - "reaction_id" : "MAKE_SOAP_FROM_OIL", - "value" : 2 + "item_type" : "LIQUID_MISC", + "material" : "LYE", + "value" : 3 }, { "condition" : "AtMost", From 544db1c69f888135d6d9164ee9051a5699ad9f87 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 22 Aug 2021 23:47:11 -0700 Subject: [PATCH 09/23] remove FillPond from priority list, add CleanSelf and food hauling --- data/examples/init/onMapLoad_dreamfort.init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init index 78adf73817..11948c0100 100644 --- a/data/examples/init/onMapLoad_dreamfort.init +++ b/data/examples/init/onMapLoad_dreamfort.init @@ -41,7 +41,10 @@ seedwatch start # ensures important tasks get assigned to workers. # otherwise these job types can get ignored in busy forts. -prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever DestroyBuilding RemoveConstruction RecoverWounded FillPond DumpItem SlaughterAnimal PrepareRawFish ExtractFromRawFish +prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever +prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem +prioritize -a CleanSelf SlaughterAnimal PrepareRawFish ExtractFromRawFish +prioritize -a --hauler-type=Food StoreItemInStockpile # autobutcher settings are saved in the savegame, so we only need to set them once. # this way, any custom settings you set during gameplay are not overwritten From 6e18c37b4ecc742465e2a3c8822396296cb70bcc Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 22 Aug 2021 23:52:36 -0700 Subject: [PATCH 10/23] update dreamfort blueprints - move orders for /services2 down to where we run /services2 - plan the roof over the surface barracks before the surface flooring to encourage the easily-missed-but-important-for-the-next-blueprint roof to get built first - add a fourth craftsdwarf's workshop to the industry level, move some workshops around to compensate - add tip for how to configure mason's workshops - forbid goblets in the goods feeder stockpile - use dig priorities to get the guildhall tiles underneath the cistern tiles dug quickly before the cistern gets wet --- data/blueprints/library/dreamfort.csv | 122 +++++++++++++------------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 4c1f53d4a4..288aedcd40 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -43,16 +43,16 @@ You are welcome to copy the Dreamfort spreadsheets and make your own modificatio "# dreamfort.csv is generated with the following command: for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' ""$fname""; done | sed 's/,*$//'" #notes label(checklist) command checklist -Here is the recommended order for Dreamfort commands. You can copy/paste the quickfort commands directly into the DFHack terminal. See the level walkthroughs for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps. +Here is the recommended order for Dreamfort commands. You can copy/paste the command lines directly into the DFHack terminal. You can run the quickfort commands from gui/quickfort if you prefer. See the level walkthroughs for context and details. Also remember to read the messages the blueprints print out after you run them so you don't miss any important manual steps. "" -- Preparation (before you embark!) -- -copy hack/examples/init/onMapLoad_dreamfort.init to your DF directory -copy the fort automation orders from hack/examples/orders/*.json to the dfhack-config/orders/ directory -copy the premade profession definitions from hack/examples/professions/ to the professions/ directory +Copy hack/examples/init/onMapLoad_dreamfort.init to your DF directory +Copy the fort automation orders from hack/examples/orders/*.json to the dfhack-config/orders/ directory +Optionally copy the premade profession definitions from hack/examples/professions/ to the professions/ directory "" -- Set settings and preload initial orders -- -quickfort run library/dreamfort.csv -n /setup,# Cursor on your starting wagon. Run before making any manual adjustments to settings! Run the /setup_help blueprint for details on what settings are set. -"quickfort orders library/dreamfort.csv -n ""/surface2, /farming2, /surface3, /farming3, /industry2, /surface4, /services2""",# Queue up orders required to get the fort minimally functional and secure. Feel free to remove the orders for the anvil and the ropes if you already brought them with you. +quickfort run library/dreamfort.csv -n /setup,# Cursor on the center of your starting wagon. Run before making any manual adjustments to settings! Run the /setup_help blueprint for details on what this blueprint does. +"quickfort orders library/dreamfort.csv -n ""/surface2, /farming2, /surface3, /farming3, /industry2, /surface4""","# Queue up orders required to get the fort minimally functional and secure. You can remove the order for the anvil (you brought one with you, right?)." "" -- Find a good starting spot on the surface -- quickfort run library/dreamfort.csv -n /perimeter,# Run at embark. @@ -60,7 +60,7 @@ quickfort undo library/dreamfort.csv -n /perimeter,# Clean up after you find you "" -- Dig -- quickfort run library/dreamfort.csv -n /surface1,# Run when you find your center tile. -quickfort run library/dreamfort.csv -n /dig_all,"# Run when you find a suitable rock layer for the industry level. It designates digging for industry, services, guildhall, suites, and apartments all in one go. This list does not include the farming level, which we'll dig in the uppermost soil layer a bit later. Note that it is more efficient for your miners if you designate your digging before they dig the central stairs past that level since the stairs are dug at a low priority, keeping your miners focused on one level at a time. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, and /apartments1_stack) instead of running /dig_all." +quickfort run library/dreamfort.csv -n /dig_all,"# Run when you find a suitable rock layer for the industry level. It designates digging for industry, services, guildhall, suites, and apartments all in one go. This list does not include the farming level, which we'll dig in the uppermost soil layer a bit later. Note that it is more efficient for your miners if you designate your digging before they dig the central stairs past that level since the stairs are dug at a low priority. This keeps your miners focused on one level at a time. If you need to designate your levels individually due to caverns interrupting the sequence or just because it is your preference, run the level-specific dig blueprints (i.e. /industry1, /services1, /guildhall1, /suites1, and /apartments1_stack) instead of running /dig_all." "" -- Core fort (should finish at about the third migration wave) -- quickfort run library/dreamfort.csv -n /surface2,# Run after initial trees are cleared. @@ -69,9 +69,9 @@ quickfort run library/dreamfort.csv -n /farming2,# Run when the farming level ha quickfort run library/dreamfort.csv -n /surface3,# Run right after /farming2. quickfort run library/dreamfort.csv -n /farming3,# Run when furniture has been placed. quickfort run library/dreamfort.csv -n /industry2,# Run when the industry level has been dug out. -prioritize ConstructBuilding,# To get those workshops up and running ASAP. You may have to run this several times as the building construction jobs become ready. +prioritize ConstructBuilding,# To get those workshops up and running ASAP. You may have to run this several times as the materials for the building construction jobs become ready. quickfort run library/dreamfort.csv -n /surface4,"# Run after the walls and floors are built on the surface. Even if /surface3 is finished before you run /industry2, though, wait until after /industry2 so that surface walls, floors, and roofing don't prevent your workshops from being built (due to lack of blocks)." -quickfort run library/dreamfort.csv -n /services2,# Run when the services level has been dug out. +"quickfort run,orders library/dreamfort.csv -n /services2",# Run when the services level has been dug out. Feel free to remove the orders for the ropes if you already brought them with you. orders import basic,"# Run after the first migration wave, so you have dorfs to do all the basic tasks. Note that this is the ""orders"" plugin, not the ""quickfort orders"" command." "quickfort run,orders library/dreamfort.csv -n /surface5","# Run when all marked trees on the surface are chopped down and walls and floors have been constructed, including the roof section over the future barracks." prioritize ConstructBuilding,# Run when you see the bridges ready to be built so the masons come and actually build them. @@ -847,6 +847,7 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway #build label(surface_pre_building) start(19; 19) hidden() flooring and anchoring walls for future buildings/doors +#< @@ -861,26 +862,26 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` -,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` -,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,` -,,,`,,`,,`,,,,,,,,`,Cf,,Cf,,Cf,`,,,,,,,,,,`,,` -,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` -,,,`,,`,,Cf,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,` -,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` -,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,` -,,,`,,`,`,`,`,`,`,Cw,Cf,Cw,`,`,`,,`,,`,`,`,Cw,Cf,Cw,`,`,`,`,`,`,,` -,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,,,,,,~,`,,,,,,,Cf,Cf,`,,` -,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,Cf,Cf,Cf,Cf,Cf,~,~,,,,,,,,Cf,`,,` -,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,,~,~,~,,~,~,,,,,Cf,Cf,,Cf,`,,` -,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,,Cf,,~,~,~,,Cf,,,,,,,,,Cf,`,,` -,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,`,,,~,~,~,,,`,,,,,,,Cf,Cf,`,,` +,,,`,,`,,,,,,,,,,,,,~,,,,,,,,,,,,,`,,` +,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,` +,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,` +,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,` +,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,` +,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,Cf,Cf,Cf,,,,,,,`,,` +,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,Cf,,,,,,,`,,` +,,,`,,`,`,`,`,`,`,`,,`,`,`,`,~,`,~,`,`,`,`,Cf,`,`,`,`,`,`,`,,` +,,,`,,`,,,,,,,,,`,,,,,,,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,` +,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` +,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` +,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` +,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,Cf,`,,` ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,` -,,,`,Cf,,,,,,,,,Cf,,,,,~,,,,,Cf,,,,,,,,,Cf,` +,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,` ,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,` -#< +#> @@ -895,21 +896,21 @@ Feel free to assign an unimportant animal to the pasture in the main entranceway ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` -,,,`,,`,,,,,,,,,,,,,~,,,,,,,,,,,,,`,,` -,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,~,`,~,`,`,`,`,`,`,`,`,`,`,`,`,,` -,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,` -,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,,,,,,,,,,`,,` -,,,`,,`,,,,,,,,,,`,~,~,~,~,~,`,,,,,,,,,,`,,` -,,,`,,`,,`,,,,,,,,~,~,~,~,~,~,~,Cf,Cf,Cf,,,,,,,`,,` -,,,`,,`,,`,,,,,,,,`,~,~,~,~,~,`,,,Cf,,,,,,,`,,` -,,,`,,`,`,`,`,`,`,`,,`,`,`,`,~,`,~,`,`,`,`,Cf,`,`,`,`,`,`,`,,` -,,,`,,`,,,,,,,,,`,,,,,,,,`,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,,` -,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` -,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` -,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,Cf,`,,` -,,,`,,`,,,,,,,,,`,,,,,,,,`,,,,,,,,Cf,`,,` +,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` +,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,` +,,,`,,`,,`,,,,,,,,`,Cf,,Cf,,Cf,`,,,,,,,,,,`,,` +,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` +,,,`,,`,,Cf,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,` +,,,`,,`,,Cw,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` +,,,`,,`,,`,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,`,,` +,,,`,,`,`,`,`,`,`,Cw,Cf,Cw,`,`,`,,`,,`,`,`,Cw,Cf,Cw,`,`,`,`,`,`,,` +,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,~,,,,,,~,`,,,,,,,Cf,Cf,`,,` +,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,Cf,Cf,Cf,Cf,Cf,~,~,,,,,,,,Cf,`,,` +,,,`,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,~,~,,~,~,~,,~,~,,,,,Cf,Cf,,Cf,`,,` +,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,,Cf,,~,~,~,,Cf,,,,,,,,,Cf,`,,` +,,,`,,`,,Cf,,Cf,Cf,Cf,Cf,Cf,`,,,~,~,~,,,`,,,,,,,Cf,Cf,`,,` ,,,`,,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,,` -,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,` +,,,`,Cf,,,,,,,,,Cf,,,,,~,,,,,Cf,,,,,,,,,Cf,` ,,,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,` @@ -1811,7 +1812,7 @@ with separate stockpiles for: "" Workshops: - 2x Mason -- 3x Craftsdwarf +- 4x Craftsdwarf - 1x Jeweler - 1x Mechanic - 4x Smelter @@ -1836,7 +1837,8 @@ Manual steps you have to take: "" Optional manual steps you can take: - Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms. -"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workship near the Mason's workshops, and Bonecrafting for the Craftsdwarf's workshop near the Clothier's workshop." +"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop next to the Dyer's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on." +"- To encourage your masons to concentrate on building blocks and other high-volume orders, it helps to set one of your Mason's workshops to service a maximum of 2 manager orders at a time." "- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high." "" Industry Walkthrough: @@ -1903,11 +1905,11 @@ query/industry_query ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,wr,`,`,`,`,`,`,`,wt,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,trackstopN,`,`,`,`,`,`,`,`,ws,`,`,`,` -,,,,`,`,`,`,`,wr,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,`,`,wS,`,`,wb,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` -,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,wr,`,` +,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wk,`,`,wo,`,`,wd,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,` @@ -1915,7 +1917,7 @@ query/industry_query ,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,` -,,`,`,wS,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wb,`,`,wd,`,`,`,`,` +,,`,`,wr,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,wr,`,`,wr,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,es,`,`,`,`,`,`,`,`,` @@ -1980,17 +1982,17 @@ query/industry_query ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,"{quantum name=""stoneworker quantum""}g{Up 3}&",`,`,`,~,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstop name=""Stoneworker quantum"" sp_links=""{sp_link move={Down} move_back={Up}}{sp_link move=""""{Down 5}"""" move_back=""""{Up 5}""""}""}{givename name=""stoneworker dumper""}",`,`,`,`,`,`,`,`,~,`,`,`,` -,,,,`,`,`,`,`,~,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,` +,,,,`,`,~,`,`,~,`,`,`,`,`,otherstone,,,,~,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,~,`,"{givename name=""stone feeder""}",~,~,~,~,`,~,`,`,`,`,`,`,`,`,` ,,"{givename name=""wood""}",`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,`,`,` +,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,~,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,"{givename name=""wood feeder""}",~,"{givename name=""goods feeder""}",nocontainers,~,,`,`,`,`,`,,craftrefuse,,,,~,`,`,`,`,`,`,` ,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{cages}{permittraps},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",~,~,~,~,`,`,`,`,`,`,` ,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}""}{givename name=""goods/wood dumper""}",~,~,{tallow}{permitdye},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}",`,`,~,`,` ,,miscliquid,`,`,`,`,`,`,~,~,forbidsand,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` -,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,forbidcrafts,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` +,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,{forbidcrafts}{forbidgoblets},~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,~,`,`,~,`,`,~,`,`,`,`,forbidpotash,nocontainers,"{givename name=""bar/military feeder""}",~,~,`,`,`,`,~,`,`,~,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` @@ -2599,20 +2601,20 @@ Guildhall Walkthrough: ,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d -,,,,,,,d,,,,,,d,,d,,,,,,d -,,,,,,,d,,,,,,d,d,d,,,,,,d -,,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,d,,d,`,`,`,d,,d,,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,d,d,d,d,`,`,`,d,d,d,d,d,d,d,d,d,d,d -,,d,d,d,d,d,d,d,,,,d,d,d,d,d,,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,3,3,3,3,3,3,3,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,d,d,d,d,3,d,d,d,d,d,d,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,d,d,3,d,d,d,d,,,d,d,d,d,d,d,d +,,,,,,,d,,,,,,3,,d,,,,,,d +,,,,,,,d,,,,,,3,d,d,,,,,,d +,,d,d,d,d,d,d,d,,,,,3,,d,,,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,3,3,3,3,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,d,,3,`,`,`,3,,d,,3,3,3,3,3,d,d +,,d,d,d,d,d,d,d,d,d,d,3,`,`,`,3,d,d,d,d,d,d,d,d,d,d +,,d,d,d,d,d,d,d,,,,3,3,3,3,3,,,,d,d,d,d,d,d,d ,,d,d,d,d,d,d,d,,,,,d,,d,,,,,d,d,d,d,d,d,d ,,,,,,,d,,,,,,d,d,d,,,,,,d ,,,,,,,d,,,,,,d,,d,,,,,,d From a318ea73e9abf90ad5fee14d88bea28aa1125085 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 23 Aug 2021 00:01:52 -0700 Subject: [PATCH 11/23] fix some help text --- data/blueprints/library/dreamfort.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 288aedcd40..01814c04fe 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -1837,7 +1837,7 @@ Manual steps you have to take: "" Optional manual steps you can take: - Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms. -"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop next to the Dyer's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on." +"- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for one of the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on." "- To encourage your masons to concentrate on building blocks and other high-volume orders, it helps to set one of your Mason's workshops to service a maximum of 2 manager orders at a time." "- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high." "" From 46b3466f06166a299244ebc3b418d960e5e9718d Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 23 Aug 2021 00:18:05 -0700 Subject: [PATCH 12/23] use new prioritize param --- data/examples/init/onMapLoad_dreamfort.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init index 11948c0100..418a299f18 100644 --- a/data/examples/init/onMapLoad_dreamfort.init +++ b/data/examples/init/onMapLoad_dreamfort.init @@ -44,7 +44,7 @@ seedwatch start prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem prioritize -a CleanSelf SlaughterAnimal PrepareRawFish ExtractFromRawFish -prioritize -a --hauler-type=Food StoreItemInStockpile +prioritize -a --haul-labor=Food StoreItemInStockpile # autobutcher settings are saved in the savegame, so we only need to set them once. # this way, any custom settings you set during gameplay are not overwritten From 99db94bd39c6890b8933249cea803f80dddf91d1 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 23 Aug 2021 23:52:06 -0700 Subject: [PATCH 13/23] restrict lye stockpile to 2 barrels/pots --- data/blueprints/library/dreamfort.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 01814c04fe..8b82b9697c 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -1950,12 +1950,12 @@ query/industry_query ,,w,`,`,`,`,`,`,w(2x5),,afnguS(3x5),,`,,`,`,`,`,`,,rhl(5x5),,,~,~,`,`,`,`,`,`,` ,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` ,,`,`,`,`,`,c,`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,r,`,`,`,`,` -,,f,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` -,,f,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` -,,f,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` -,,f,`,`,`,`,`,`,`,`,`,`,`,`,bpdz(5x2),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,f,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,f,`,`,`,`,`,`,`,`,`,`,`,`,s2(5x3),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,`,bpdz(5x2),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,`,s2(5x3),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,pd(7x3),,,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,` ,,,,~,~,~,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,` ,,,,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` From f412e2d5a0d66075fe5dc1fa3516cf52c3d316ed Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 25 Aug 2021 15:54:39 -0700 Subject: [PATCH 14/23] dreamfort blueprint improvements - allow empty cages and traps on the surface animal stockpile - remove animals from the industry quantum stockpile - split furniture from the goods feeder stockpile so it can have wheelbarrows assigned to it --- data/blueprints/library/dreamfort.csv | 29 ++++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 8b82b9697c..718e4f2bf3 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -1004,8 +1004,8 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,` ,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,,` ,,,`,,`,,`,,,,,,,,`,"{givename name=""trade depo gate""}",,"{givename name=""inner main gate""}",,"{givename name=""barracks gate""}",`,"{givename name=""prison/training area""}",,,,,,,,,`,,` -,,,`,,`,,`,,,,,,,,,,`,`,`,,,forbidcages,,,,,,,,,`,,` -,,,`,,`,,,,,,,,,,`,,`,`,`,,`,forbidtraps,,,,,,,,,`,,` +,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` +,,,`,,`,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,`,,` ,,,`,,`,,`,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,` ,,,`,,`,,`,,,,,,,,`,"{givename name=""left outer gate""}","{givename name=""left inner gate""}","{givename name=""outer main gate""}","{givename name=""right inner gate""}","{givename name=""right outer gate""}",`,,,,,,,,,,`,,` ,,,`,,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,,` @@ -1839,6 +1839,7 @@ Optional manual steps you can take: - Restrict the Mechanic's workshop to only allow skilled workers so unskilled trap-resetters won't be tasked to build mechanisms. "- Restrict the Craftsdwarf's workshops to only allow labors that take from the adjacent stockpiles. That is, only allow Woodcrafting for the Craftsdwarf's workshop on the left near the wood stockpile, Stonecrafting for the Craftsdwarf's workshop near the Mason's workshops, and Bonecrafting for one of the Craftsdwarf's workshop near the Clothier's workshop. The last Craftdwarf's workshop can hold all the remaining labors, or it can be a secondary workshop for a labor that you want more dwarves working on." "- To encourage your masons to concentrate on building blocks and other high-volume orders, it helps to set one of your Mason's workshops to service a maximum of 2 manager orders at a time." +"- Once you have enough haulers, you can increase the rate of stone and ore hauling jobs by building more wheelbarrows and adding them to the stone and ore feeder stockpiles." "- If desired, set one or both stockpiles in the bottom left to auto-melt. This results in melting all weapons and armor that are inferior to masterwork. This is great for upgrading your military, but it takes a *lot* of fuel unless you have first replaced the forge and smelters with magma versions. If you enable automelt and you don't have magma forges and magma smelters, be sure to be in a heavily forested area, enable auto-chop, and keep your coal stocks high." "" Industry Walkthrough: @@ -1947,16 +1948,16 @@ query/industry_query ,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,w,`,`,`,`,`,`,`,`,`,`,`,`,e(5x1),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,w,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` -,,w,`,`,`,`,`,`,w(2x5),,afnguS(3x5),,`,,`,`,`,`,`,,rhl(5x5),,,~,~,`,`,`,`,`,`,` +,,w,`,`,`,`,`,`,w(2x5),,fngS(3x3),,`,,`,`,`,`,`,,rhl(5x5),,,~,~,`,`,`,`,`,`,` ,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` ,,`,`,`,`,`,c,`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,r,`,`,`,`,` -,,f2,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,~,~,u2(3x2),~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` ,,f2,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` ,,f2,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` -,,f2,`,`,`,`,`,`,`,`,`,`,`,`,bpdz(5x2),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,`,bpdz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,` ,,f2,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,f2,`,`,`,`,`,`,`,`,`,`,`,`,s2(5x3),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,pd(7x3),,,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,` +,,f2,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,pd(7x3),,,~,~,~,~,`,`,`,`,s2(5x2),,,~,~,`,`,`,`,`,`,`,`,`,`,` ,,,,~,~,~,~,~,~,~,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,` ,,,,~,~,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,`,`,b,`,c,`,b,`,`,`,`,`,`,`,`,`,`,` @@ -1989,16 +1990,16 @@ query/industry_query ,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,~,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,"{givename name=""wood feeder""}",~,"{givename name=""goods feeder""}",nocontainers,~,,`,`,`,`,`,,craftrefuse,,,,~,`,`,`,`,`,`,` -,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{cages}{permittraps},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",~,~,~,~,`,`,`,`,`,`,` -,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}""}{givename name=""goods/wood dumper""}",~,~,{tallow}{permitdye},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}",`,`,~,`,` -,,miscliquid,`,`,`,`,`,`,~,~,forbidsand,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` -,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,{forbidcrafts}{forbidgoblets},~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` +,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitdye},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",~,~,~,~,`,`,`,`,`,`,` +,,`,`,~,`,`,"{quantum name=""goods/wood quantum""}g{Up 13}{Right 10}&","{quantumstop name=""Goods/Wood quantum"" sp_links=""{sp_link move={Right} move_back={Left}}{sp_link move=""""{Right 5}"""" move_back=""""{Left 5}""""}{sp_link move=""""{Down}{Right 5}"""" move_back=""""{Left 5}{Up}""""}""}{givename name=""goods/wood dumper""}",~,~,{forbidcrafts}{forbidgoblets},~,~,,`,,`,,`,,nocontainers,~,~,~,~,"{quantumstopfromwest name=""Clothier/Bones quantum""}{givename name=""cloth/bones dumper""}","{quantum name=""cloth/bones quantum""}",`,`,~,`,` +,,miscliquid,`,`,`,`,`,`,~,~,"{givename name=""furniture feeder""}",~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,` +,,"{givename name=""miscliquid""}",`,`,`,`,`,`,~,~,forbidsand,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,` ,,~,`,~,`,`,~,`,`,~,`,`,`,`,forbidpotash,nocontainers,"{givename name=""bar/military feeder""}",~,~,`,`,`,`,~,`,`,~,`,`,`,`,` ,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` -,,~,`,`,`,`,`,`,`,`,`,`,`,`,forbidotherstone,,,,,`,`,`,`,`,`,`,`,`,`,`,`,` -,,,,nocontainers,t{Right 12}{Up 3}&,t{Right 11}{Down 3}&,"{givename name=""meltable steel/brnze""}",,,,`,`,~,`,"{givename name=""ore/clay feeder""}",~,~,~,~,`,~,`,`,`,`,`,`,`,`,` -,,,,{bronzeweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons},,,,,,,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,` +,,~,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,` +,,,,nocontainers,t{Right 12}{Up 3}&,t{Right 11}{Down 3}&,"{givename name=""meltable steel/brnze""}",,,,`,`,~,`,forbidotherstone,,,,,`,~,`,`,`,`,`,`,`,`,` +,,,,{bronzeweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons},,,,,,,`,`,`,`,"{givename name=""ore/clay feeder""}",~,~,~,~,`,`,`,`,`,`,`,`,`,`,` ,,,,{bronzearmor}{permitsteelarmor}{forbidmasterworkarmor}{forbidartifactarmor},,,,,,,`,`,`,`,`,`,"{quantumstop name=""Metalworker quantum"" sp_links=""{sp_link move={Up} move_back={Down}}{sp_link move=""""{Up 5}"""" move_back=""""{Down 5}""""}""}{givename name=""metalworker dumper""}",`,`,`,`,`,`,`,`,`,`,`,`,` ,,,,`,`,`,`,`,`,`,`,`,~,`,`,`,"{quantum name=""metalworker quantum""}",`,`,`,~,`,`,`,`,`,`,`,`,` ,,,,nocontainers,t{Right 12}{Up 7}&,t{Right 11}{Up 1}&,"{givename name=""other meltables""}",,,,`,`,`,`,coal,"{givename name=""coal""}",t{Up}&,nocontainers,`,`,`,`,`,`,`,`,`,`,`,` From d5246dae52f250902a3ea56f2d6455c6d966a9ba Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 25 Aug 2021 23:19:27 -0700 Subject: [PATCH 15/23] incorporate ldog's rebalanced professions --- data/examples/professions/Chef | 2 ++ data/examples/professions/Craftsdwarf | 8 ++++---- data/examples/professions/Farmer | 4 ---- data/examples/professions/Hauler | 2 ++ data/examples/professions/Laborer | 2 -- data/examples/professions/Marksdwarf | 3 +++ data/examples/professions/Mason | 2 ++ data/examples/professions/Outdoorsdwarf | 5 ++++- data/examples/professions/Smith | 4 ---- data/examples/professions/StartManager | 7 ------- data/examples/professions/Tailor | 13 +++++++++++++ 11 files changed, 30 insertions(+), 22 deletions(-) diff --git a/data/examples/professions/Chef b/data/examples/professions/Chef index a0d3062462..1f777c81a2 100644 --- a/data/examples/professions/Chef +++ b/data/examples/professions/Chef @@ -1,4 +1,6 @@ NAME Chef +BUTCHER +TANNER COOK HAUL_STONE HAUL_WOOD diff --git a/data/examples/professions/Craftsdwarf b/data/examples/professions/Craftsdwarf index b0c4bd77fb..29ed1ad0d5 100644 --- a/data/examples/professions/Craftsdwarf +++ b/data/examples/professions/Craftsdwarf @@ -1,13 +1,13 @@ NAME Craftsdwarf -CARPENTER -BOWYER -CUT_GEM -ENCRUST_GEM WOOD_CRAFT STONE_CRAFT BONE_CARVE +GLASSMAKER EXTRACT_STRAND +POTTERY +GLAZING WAX_WORKING +PAPERMAKING BOOKBINDING HAUL_STONE HAUL_WOOD diff --git a/data/examples/professions/Farmer b/data/examples/professions/Farmer index e3be2a3bb7..149b3c3689 100644 --- a/data/examples/professions/Farmer +++ b/data/examples/professions/Farmer @@ -1,7 +1,4 @@ NAME Farmer -DISSECT_VERMIN -BUTCHER -TANNER PLANT MILLER BREWER @@ -12,6 +9,5 @@ SHEARER SPINNER PRESSING GELD -PAPERMAKING HAUL_FOOD ALCHEMIST diff --git a/data/examples/professions/Hauler b/data/examples/professions/Hauler index dbf5bf3bbf..a108b1bfd0 100644 --- a/data/examples/professions/Hauler +++ b/data/examples/professions/Hauler @@ -1,6 +1,8 @@ NAME Hauler FEED_WATER_CIVILIANS +SIEGEOPERATE MECHANIC +OPERATE_PUMP HAUL_STONE HAUL_WOOD HAUL_ITEM diff --git a/data/examples/professions/Laborer b/data/examples/professions/Laborer index 82d26c4a72..bca22a302a 100644 --- a/data/examples/professions/Laborer +++ b/data/examples/professions/Laborer @@ -4,8 +4,6 @@ BURN_WOOD POTASH_MAKING LYE_MAKING SMELT -SIEGEOPERATE -OPERATE_PUMP HAUL_STONE HAUL_WOOD HAUL_ITEM diff --git a/data/examples/professions/Marksdwarf b/data/examples/professions/Marksdwarf index 583afd08e2..ce6771cbb9 100644 --- a/data/examples/professions/Marksdwarf +++ b/data/examples/professions/Marksdwarf @@ -1,5 +1,7 @@ NAME Marksdwarf +SIEGEOPERATE MECHANIC +OPERATE_PUMP HAUL_STONE HAUL_WOOD HAUL_ITEM @@ -11,6 +13,7 @@ HAUL_ANIMALS HANDLE_VEHICLES HAUL_TRADE HAUL_WATER +ARCHITECT CLEAN PULL_LEVER BUILD_ROAD diff --git a/data/examples/professions/Mason b/data/examples/professions/Mason index 47ff9d1c42..ca3792c81e 100644 --- a/data/examples/professions/Mason +++ b/data/examples/professions/Mason @@ -1,5 +1,7 @@ NAME Mason MASON +CUT_GEM +ENCRUST_GEM HAUL_STONE HAUL_WOOD HAUL_ITEM diff --git a/data/examples/professions/Outdoorsdwarf b/data/examples/professions/Outdoorsdwarf index 8fbec93a1c..a3f696419c 100644 --- a/data/examples/professions/Outdoorsdwarf +++ b/data/examples/professions/Outdoorsdwarf @@ -1,12 +1,15 @@ NAME Outdoorsdwarf +CARPENTER +BOWYER CUTWOOD ANIMALTRAIN TRAPPER +DISSECT_VERMIN FEED_WATER_CIVILIANS RECOVER_WOUNDED HERBALIST BEEKEEPING -MECHANIC +SIEGECRAFT HAUL_STONE HAUL_WOOD HAUL_ITEM diff --git a/data/examples/professions/Smith b/data/examples/professions/Smith index 226337195f..f5fe0f9822 100644 --- a/data/examples/professions/Smith +++ b/data/examples/professions/Smith @@ -3,10 +3,6 @@ FORGE_WEAPON FORGE_ARMOR FORGE_FURNITURE METAL_CRAFT -GLASSMAKER -POTTERY -GLAZING -SIEGECRAFT HAUL_STONE HAUL_WOOD HAUL_ITEM diff --git a/data/examples/professions/StartManager b/data/examples/professions/StartManager index e05e4f7da7..c9201c80d6 100644 --- a/data/examples/professions/StartManager +++ b/data/examples/professions/StartManager @@ -1,8 +1,6 @@ NAME StartManager CUTWOOD -ANIMALTRAIN ANIMALCARE -DISSECT_VERMIN DIAGNOSE SURGERY BONE_SETTING @@ -37,13 +35,8 @@ FORGE_FURNITURE METAL_CRAFT LEATHER STONE_CRAFT -GLASSMAKER WEAVER CLOTHESMAKER -POTTERY -GLAZING -PAPERMAKING -SIEGECRAFT SIEGEOPERATE MECHANIC OPERATE_PUMP diff --git a/data/examples/professions/Tailor b/data/examples/professions/Tailor index d90527ccdf..74ac03a93d 100644 --- a/data/examples/professions/Tailor +++ b/data/examples/professions/Tailor @@ -3,6 +3,19 @@ DYER LEATHER WEAVER CLOTHESMAKER +HAUL_STONE +HAUL_WOOD +HAUL_ITEM +HAUL_BODY +HAUL_FOOD +HAUL_REFUSE +HAUL_FURNITURE +HAUL_ANIMALS HANDLE_VEHICLES +HAUL_TRADE +HAUL_WATER +CLEAN PULL_LEVER +BUILD_ROAD +BUILD_CONSTRUCTION REMOVE_CONSTRUCTION From 3ce075876ca3a3ede3dad383b05abf62c9ca8e16 Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Aug 2021 22:16:28 -0700 Subject: [PATCH 16/23] move cages to basic, reindex each file from 0 --- data/examples/orders/basic.json | 54 ++++++-- data/examples/orders/furnace.json | 26 ++-- data/examples/orders/glassstock.json | 42 +++---- data/examples/orders/military.json | 182 +++++++++++++-------------- data/examples/orders/otherstock.json | 28 +++++ data/examples/orders/rockstock.json | 36 +++--- data/examples/orders/smelting.json | 62 ++++----- data/examples/orders/woodstock.json | 54 -------- 8 files changed, 244 insertions(+), 240 deletions(-) create mode 100644 data/examples/orders/otherstock.json delete mode 100644 data/examples/orders/woodstock.json diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json index aca5a2037c..1338bb7fcb 100644 --- a/data/examples/orders/basic.json +++ b/data/examples/orders/basic.json @@ -695,6 +695,36 @@ "is_active" : false, "is_validated" : false, "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "flags" : + [ + "empty" + ], + "item_type" : "CAGE", + "value" : 30 + } + ], + "job" : "MakeCage", + "material_category" : + [ + "wood" + ] + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 22, + "is_active" : false, + "is_validated" : false, + "item_conditions" : [ { "condition" : "AtLeast", @@ -722,7 +752,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 22, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -758,7 +788,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 23, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -794,7 +824,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 24, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -830,7 +860,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 25, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -849,7 +879,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 26, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -871,7 +901,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 27, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -897,7 +927,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 28, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -923,7 +953,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 29, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -956,7 +986,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 30, + "id" : 31, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -995,7 +1025,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 31, + "id" : 32, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1029,7 +1059,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 32, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1052,7 +1082,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 33, + "id" : 34, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/furnace.json b/data/examples/orders/furnace.json index 1bb7e6641b..39a05bdc30 100644 --- a/data/examples/orders/furnace.json +++ b/data/examples/orders/furnace.json @@ -3,7 +3,7 @@ "amount_left" : 20, "amount_total" : 20, "frequency" : "Daily", - "id" : 34, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -38,7 +38,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 35, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -61,7 +61,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 36, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -86,7 +86,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 37, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -111,7 +111,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 38, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -154,7 +154,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 39, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -186,7 +186,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 40, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -216,7 +216,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 41, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -249,7 +249,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 42, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -288,7 +288,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 43, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -328,7 +328,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 44, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -347,7 +347,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 45, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -378,7 +378,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 46, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/glassstock.json b/data/examples/orders/glassstock.json index bb80cf9f63..ec5ad5ec6f 100644 --- a/data/examples/orders/glassstock.json +++ b/data/examples/orders/glassstock.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 187, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -35,7 +35,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 188, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -68,7 +68,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 189, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -101,7 +101,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 190, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -133,7 +133,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 191, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -165,7 +165,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 192, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -197,7 +197,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 193, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -229,7 +229,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 194, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -261,7 +261,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 195, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -293,7 +293,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 196, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -325,7 +325,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 197, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -357,7 +357,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 198, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -389,7 +389,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 199, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -421,7 +421,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 200, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -456,7 +456,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 201, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -490,7 +490,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 202, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -524,7 +524,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 203, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -558,7 +558,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 204, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -590,7 +590,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 205, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -623,7 +623,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 206, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -656,7 +656,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 207, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/military.json b/data/examples/orders/military.json index 8d682fc520..f5e02ca009 100644 --- a/data/examples/orders/military.json +++ b/data/examples/orders/military.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 47, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -29,7 +29,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 48, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -59,7 +59,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 49, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -85,7 +85,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 50, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -117,7 +117,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 51, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -145,7 +145,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 52, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -177,7 +177,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 53, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -205,7 +205,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 54, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -237,7 +237,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 55, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -269,7 +269,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 56, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -301,7 +301,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 57, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -333,7 +333,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 58, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -370,7 +370,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 59, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -412,7 +412,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 60, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -443,7 +443,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 61, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -474,7 +474,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 62, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -505,7 +505,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 63, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -536,7 +536,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 64, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -567,7 +567,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 65, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -598,7 +598,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 66, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -629,7 +629,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 67, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -660,7 +660,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 68, + "id" : 21, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -691,7 +691,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 69, + "id" : 22, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -722,7 +722,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 70, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -759,7 +759,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 71, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -808,7 +808,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 72, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -845,7 +845,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 73, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -888,7 +888,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 74, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -924,7 +924,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 75, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -967,7 +967,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 76, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1000,7 +1000,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 77, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1033,7 +1033,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1066,7 +1066,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 80, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1105,7 +1105,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 80, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1144,7 +1144,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1183,7 +1183,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 82, + "id" : 35, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1228,7 +1228,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 83, + "id" : 36, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1261,7 +1261,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 84, + "id" : 37, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1294,7 +1294,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 85, + "id" : 38, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1327,7 +1327,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 86, + "id" : 39, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1360,7 +1360,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 87, + "id" : 40, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1400,7 +1400,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 88, + "id" : 41, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1433,7 +1433,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 89, + "id" : 42, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1473,7 +1473,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 90, + "id" : 43, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1506,7 +1506,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 91, + "id" : 44, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1539,7 +1539,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 92, + "id" : 45, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1572,7 +1572,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 93, + "id" : 46, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1617,7 +1617,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 94, + "id" : 47, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1650,7 +1650,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 95, + "id" : 48, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1695,7 +1695,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 96, + "id" : 49, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1746,7 +1746,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 97, + "id" : 50, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1785,7 +1785,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 98, + "id" : 51, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1824,7 +1824,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 99, + "id" : 52, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1863,7 +1863,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 100, + "id" : 53, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1902,7 +1902,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 101, + "id" : 54, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1948,7 +1948,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 102, + "id" : 55, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1987,7 +1987,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 103, + "id" : 56, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2033,7 +2033,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 104, + "id" : 57, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2072,7 +2072,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 105, + "id" : 58, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2111,7 +2111,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 106, + "id" : 59, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2150,7 +2150,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 107, + "id" : 60, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2201,7 +2201,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 108, + "id" : 61, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2240,7 +2240,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2291,7 +2291,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 110, + "id" : 63, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2348,7 +2348,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 111, + "id" : 64, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2393,7 +2393,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 112, + "id" : 65, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2438,7 +2438,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 113, + "id" : 66, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2483,7 +2483,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 114, + "id" : 67, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2528,7 +2528,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 115, + "id" : 68, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2580,7 +2580,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 116, + "id" : 69, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2625,7 +2625,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 117, + "id" : 70, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2677,7 +2677,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 118, + "id" : 71, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2722,7 +2722,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 119, + "id" : 72, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2767,7 +2767,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 120, + "id" : 73, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2812,7 +2812,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 121, + "id" : 74, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2869,7 +2869,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 122, + "id" : 75, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2914,7 +2914,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 123, + "id" : 76, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -2971,7 +2971,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 124, + "id" : 77, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3034,7 +3034,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 125, + "id" : 78, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3085,7 +3085,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 126, + "id" : 79, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3136,7 +3136,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 127, + "id" : 80, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3187,7 +3187,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 128, + "id" : 81, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3238,7 +3238,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 129, + "id" : 82, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3296,7 +3296,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 130, + "id" : 83, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3347,7 +3347,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 131, + "id" : 84, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3405,7 +3405,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 132, + "id" : 85, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3456,7 +3456,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 133, + "id" : 86, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3507,7 +3507,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 134, + "id" : 87, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3558,7 +3558,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 135, + "id" : 88, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3621,7 +3621,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 136, + "id" : 89, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -3672,7 +3672,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 137, + "id" : 90, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/otherstock.json b/data/examples/orders/otherstock.json new file mode 100644 index 0000000000..a15835159b --- /dev/null +++ b/data/examples/orders/otherstock.json @@ -0,0 +1,28 @@ +[ + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 0, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_type" : "BED", + "value" : 2 + } + ], + "job" : "ConstructBed", + "material_category" : + [ + "wood" + ] + } +] diff --git a/data/examples/orders/rockstock.json b/data/examples/orders/rockstock.json index cd7f354c9d..c09b9b436c 100644 --- a/data/examples/orders/rockstock.json +++ b/data/examples/orders/rockstock.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 169, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -32,7 +32,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 170, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -61,7 +61,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 171, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -90,7 +90,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 172, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -120,7 +120,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 173, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -149,7 +149,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 174, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -178,7 +178,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 175, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -207,7 +207,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 176, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -236,7 +236,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 177, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -265,7 +265,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 178, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -294,7 +294,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 179, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -323,7 +323,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 180, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -352,7 +352,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 181, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -381,7 +381,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 182, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -410,7 +410,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 183, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -439,7 +439,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 184, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -470,7 +470,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 185, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -501,7 +501,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 186, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/smelting.json b/data/examples/orders/smelting.json index 67d102dcd9..fec6693243 100644 --- a/data/examples/orders/smelting.json +++ b/data/examples/orders/smelting.json @@ -3,7 +3,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 138, + "id" : 0, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -34,7 +34,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 139, + "id" : 1, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -65,7 +65,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 140, + "id" : 2, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -96,7 +96,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 141, + "id" : 3, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -127,7 +127,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 142, + "id" : 4, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -158,7 +158,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 143, + "id" : 5, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -189,7 +189,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 144, + "id" : 6, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -220,7 +220,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 145, + "id" : 7, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -251,7 +251,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 146, + "id" : 8, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -282,7 +282,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 147, + "id" : 9, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -313,7 +313,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 148, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -344,7 +344,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 149, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -375,7 +375,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 150, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -406,7 +406,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 151, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -437,7 +437,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 152, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -468,7 +468,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 153, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -499,7 +499,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 154, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -536,7 +536,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 155, + "id" : 17, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -579,7 +579,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 156, + "id" : 18, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -622,7 +622,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 157, + "id" : 19, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -659,7 +659,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 158, + "id" : 20, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -696,7 +696,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 159, + "id" : 21, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -745,7 +745,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 160, + "id" : 22, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -782,7 +782,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 161, + "id" : 23, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -819,7 +819,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 162, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -862,7 +862,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 163, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -905,7 +905,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 164, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -942,7 +942,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 165, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -979,7 +979,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 166, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1022,7 +1022,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 167, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1059,7 +1059,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 168, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/woodstock.json b/data/examples/orders/woodstock.json deleted file mode 100644 index ce8865f060..0000000000 --- a/data/examples/orders/woodstock.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "amount_left" : 1, - "amount_total" : 1, - "frequency" : "Daily", - "id" : 208, - "is_active" : false, - "is_validated" : false, - "item_conditions" : - [ - { - "condition" : "AtLeast", - "item_type" : "WOOD", - "value" : 150 - }, - { - "condition" : "AtMost", - "item_type" : "BED", - "value" : 2 - } - ], - "job" : "ConstructBed", - "material_category" : - [ - "wood" - ] - }, - { - "amount_left" : 1, - "amount_total" : 1, - "frequency" : "Daily", - "id" : 209, - "is_active" : false, - "is_validated" : false, - "item_conditions" : - [ - { - "condition" : "AtLeast", - "item_type" : "WOOD", - "value" : 150 - }, - { - "condition" : "AtMost", - "item_type" : "CAGE", - "value" : 2 - } - ], - "job" : "MakeCage", - "material_category" : - [ - "wood" - ] - } -] From 5c94e3443e63408ea29c4d1b7a0b54609eea6ba8 Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Aug 2021 22:17:08 -0700 Subject: [PATCH 17/23] remove stonecrafting from startmanager --- data/examples/professions/StartManager | 1 - 1 file changed, 1 deletion(-) diff --git a/data/examples/professions/StartManager b/data/examples/professions/StartManager index c9201c80d6..3138dbb91b 100644 --- a/data/examples/professions/StartManager +++ b/data/examples/professions/StartManager @@ -34,7 +34,6 @@ FORGE_ARMOR FORGE_FURNITURE METAL_CRAFT LEATHER -STONE_CRAFT WEAVER CLOTHESMAKER SIEGEOPERATE From 6a263b893df9eb199331733c1dad1eafa9022b85 Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Aug 2021 22:17:32 -0700 Subject: [PATCH 18/23] modify embark guidance based on new professions --- data/blueprints/library/dreamfort.csv | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 718e4f2bf3..8d2eb4b5d3 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -160,15 +160,11 @@ Nothing in Dreamfort depends on these settings staying as they are. Feel free to "Here are the minimal skills needed for essential tasks in getting Dreamfort up and running, along with suggestions for which dwarves to assign them to. You can enable additional skills as you wish. Skills with an asterisk (*) are especially worth putting points into on the embark preparation screen." "" Manager / Bookkeeper / Broker,Miner,Miner,Mason,Mason,Outdoorsdwarf,Craftsdwarf -Cook (*),Miner (*),Miner (*),Mason (*),Mason (*),Wood Cutter (*),Carpenter (*) -Brewer,Engraver,Engraver,Architect/Building Designer (*),Architect/Building Designer (*),Mechanic (*),Mechanic -Grower/Farmer,,,,,Bee Keeper,Bee Keeper -Wood Cutter,,,Stone Crafter,Stone Crafter -Judge of Intent (*) -All other labors until you can assign them to a migrant +Mechanic (*),Miner (*),Miner (*),Mason (*),Mason (*),Carpenter (*),Stonecrafter (*) +Wood Cutter,,,Architect/Building Designer,Architect/Building Designer,Wood Cutter (*) +Misc. labors needed for constructing workshops,,,,,Bee Keeper "" "The most time-consuming tasks in early Dreamfort are: mining, chopping down trees, and making blocks. Starting with at least two miners, two woodcutters (assuming your embark has trees), and two masons helps in keeping the fort from stalling." -"Moreover, it is important to always have one more mason than you have Mason's Workshops (at least in the beginning of the game) so other buildings that require masonry can get built (like furnaces and bridges/gates). Alternately, run DFHack's tweak do-job-now and manually boost the priority in the jobs list when these kinds of tasks come up." "" We suggest bringing at least: 2 picks,for the two miners @@ -179,16 +175,16 @@ food and seeds,as per usual 7 blocks,for starting workshops and the temporary trade depot. necessary if you have buildingplan configured for blocks only. many boulders,for quickly turning into more blocks. blocks are the limiting factor in the early stages. dogs and cats,for protection and vermin control -geese,"for bones and leather. bring at least 1 male and 2 females for the 2 early nestboxes. autobutcher settings in the included onMapLoad.init file are optimized for raising geese. if you prefer another bird, be sure to adjust the autobutcher settings." +geese,"for bones and leather. bring at least 1 male and 2 females for the 2 early nestboxes. autobutcher settings in the included onMapLoad_dreamfort.init file are optimized for raising geese. if you prefer another bird, be sure to adjust the autobutcher settings." "" Also bring logs for beds if embarking in an area without many trees. "" -See ldog's Dreamfort embark profile for a more advanced (and more thoroughly explained!) approach +See ldog's Dreamfort embark profile for a more advanced (and more thoroughly explained!) approach: https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=sharing "#ignore Add these lines to the bottom of your ""data/init/embark_profiles.txt"" file to make the ""Dreamfort"" profile available in-game. Also see ldog's dreamfort embark profile for a more advanced, dwarfy approach." [PROFILE] [TITLE:Dreamfort] -[SKILL:1:COOK:5] +[SKILL:1:MECHANICS:5] [SKILL:1:JUDGING_INTENT:1] [SKILL:1:APPRAISAL:1] [SKILL:1:ORGANIZATION:1] @@ -202,8 +198,8 @@ https://drive.google.com/file/d/1Et42JTzeYK23iI5wrPMsFJ7lUXwVBQob/view?usp=shari [SKILL:5:MASONRY:5] [SKILL:5:DESIGNBUILDING:1] [SKILL:6:WOODCUTTING:5] -[SKILL:6:MECHANICS:5] -[SKILL:7:CARPENTRY:5] +[SKILL:6:CARPENTRY:5] +[SKILL:7:STONECRAFT:5] [ITEM:2:WEAPON:ITEM_WEAPON_PICK:INORGANIC:COPPER] [ITEM:2:WEAPON:ITEM_WEAPON_AXE_BATTLE:INORGANIC:COPPER] [ITEM:1:ANVIL:NONE:INORGANIC:IRON] From 8e2f6e40091e99d1b3b3f30716a892c11973edd3 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 28 Aug 2021 07:26:13 -0700 Subject: [PATCH 19/23] move mechanisms to basic add wheelbarrow, minecart --- data/examples/orders/basic.json | 53 ++++++++++++++++++++------ data/examples/orders/otherstock.json | 56 ++++++++++++++++++++++++++++ data/examples/orders/rockstock.json | 43 ++++----------------- 3 files changed, 104 insertions(+), 48 deletions(-) diff --git a/data/examples/orders/basic.json b/data/examples/orders/basic.json index 1338bb7fcb..b3d7dac457 100644 --- a/data/examples/orders/basic.json +++ b/data/examples/orders/basic.json @@ -725,6 +725,35 @@ "is_active" : false, "is_validated" : false, "item_conditions" : + [ + { + "condition" : "AtLeast", + "flags" : + [ + "non_economic", + "hard" + ], + "item_type" : "BOULDER", + "material" : "INORGANIC", + "value" : 50 + }, + { + "condition" : "AtMost", + "item_type" : "TRAPPARTS", + "value" : 20 + } + ], + "job" : "ConstructMechanisms", + "material" : "INORGANIC" + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 23, + "is_active" : false, + "is_validated" : false, + "item_conditions" : [ { "condition" : "AtLeast", @@ -752,7 +781,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 23, + "id" : 24, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -788,7 +817,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 24, + "id" : 25, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -824,7 +853,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 25, + "id" : 26, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -860,7 +889,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 26, + "id" : 27, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -879,7 +908,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 27, + "id" : 28, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -901,7 +930,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 28, + "id" : 29, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -927,7 +956,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 29, + "id" : 30, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -953,7 +982,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 30, + "id" : 31, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -986,7 +1015,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 31, + "id" : 32, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1025,7 +1054,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 32, + "id" : 33, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1059,7 +1088,7 @@ "amount_left" : 4, "amount_total" : 4, "frequency" : "Daily", - "id" : 33, + "id" : 34, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -1082,7 +1111,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 34, + "id" : 35, "is_active" : false, "is_validated" : false, "item_conditions" : diff --git a/data/examples/orders/otherstock.json b/data/examples/orders/otherstock.json index a15835159b..672a61ec5f 100644 --- a/data/examples/orders/otherstock.json +++ b/data/examples/orders/otherstock.json @@ -24,5 +24,61 @@ [ "wood" ] + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 1, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_WHEELBARROW", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_WHEELBARROW", + "job" : "MakeTool", + "material_category" : + [ + "wood" + ] + }, + { + "amount_left" : 1, + "amount_total" : 1, + "frequency" : "Daily", + "id" : 2, + "is_active" : false, + "is_validated" : false, + "item_conditions" : + [ + { + "condition" : "AtLeast", + "item_type" : "WOOD", + "value" : 150 + }, + { + "condition" : "AtMost", + "item_subtype" : "ITEM_TOOL_MINECART", + "item_type" : "TOOL", + "value" : 2 + } + ], + "item_subtype" : "ITEM_TOOL_MINECART", + "job" : "MakeTool", + "material_category" : + [ + "wood" + ] } ] diff --git a/data/examples/orders/rockstock.json b/data/examples/orders/rockstock.json index c09b9b436c..db469ba398 100644 --- a/data/examples/orders/rockstock.json +++ b/data/examples/orders/rockstock.json @@ -269,35 +269,6 @@ "is_active" : false, "is_validated" : false, "item_conditions" : - [ - { - "condition" : "AtLeast", - "flags" : - [ - "non_economic", - "hard" - ], - "item_type" : "BOULDER", - "material" : "INORGANIC", - "value" : 50 - }, - { - "condition" : "AtMost", - "item_type" : "TRAPPARTS", - "value" : 10 - } - ], - "job" : "ConstructMechanisms", - "material" : "INORGANIC" - }, - { - "amount_left" : 1, - "amount_total" : 1, - "frequency" : "Daily", - "id" : 10, - "is_active" : false, - "is_validated" : false, - "item_conditions" : [ { "condition" : "AtLeast", @@ -323,7 +294,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 11, + "id" : 10, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -352,7 +323,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 12, + "id" : 11, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -381,7 +352,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 13, + "id" : 12, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -410,7 +381,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 14, + "id" : 13, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -439,7 +410,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 15, + "id" : 14, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -470,7 +441,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 16, + "id" : 15, "is_active" : false, "is_validated" : false, "item_conditions" : @@ -501,7 +472,7 @@ "amount_left" : 1, "amount_total" : 1, "frequency" : "Daily", - "id" : 17, + "id" : 16, "is_active" : false, "is_validated" : false, "item_conditions" : From e7c4fe0cae69b4af7a9d0119843d1be760b8100e Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 30 Aug 2021 22:14:31 -0700 Subject: [PATCH 20/23] add checklist items for *stock orders import --- data/blueprints/library/dreamfort.csv | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv index 8d2eb4b5d3..bc03553995 100644 --- a/data/blueprints/library/dreamfort.csv +++ b/data/blueprints/library/dreamfort.csv @@ -80,7 +80,7 @@ prioritize ConstructBuilding,# Run when you see the bridges ready to be built so "" -- Plumbing -- "This is a good time to fill your well cisterns, either with a bucket brigade or by routing water from an aquifer or freshwater stream." -"Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that setting up a powered pump stack is a tricky process and can take a long time. Don't forget to continue making progress through the checklist as you prepare to pump your magma! If you are going to pump magma, I suggest doing it before importing the military and smelting automation orders since they make heavy use of furnaces and forges." +"Also consider bringing magma up to your services level so you can replace the forge and furnaces on your industry level with more powerful magma versions. This is especially important if your embark has insufficient trees to convert into charcoal. Keep in mind that moving magma is a tricky process and can take a long time. Don't forget to continue making progress through the checklist! If you choose to use magma, I suggest getting it in place before importing the military and smelting automation orders since they make heavy use of furnaces and forges." "" -- Mature fort (third migration wave onward) -- orders import furnace,# Automated production of basic furnace-related items. Don't forget to create a sand collection zone (or remove the sand- and glass-related orders if you have no sand). @@ -94,6 +94,9 @@ orders import furnace,# Automated production of basic furnace-related items. Don orders import military,# Automated production of military equipment. Turn on automelt in the meltables piles on the industry level to automatically upgrade all metal military equipment to masterwork quality. These orders are optional if you are not using a military. orders import smelting,# Automated production of all types of metal bars. "quickfort run,orders library/dreamfort.csv -n /services4","# Run when you need a jail and/or fancy statues in the dining room, anytime after the restraints are placed from /services3." +orders import rockstock,# Maintains a small stock of all types of rock furniture. +orders import glassstock,# Maintains a small stock of all types of glass furniture and parts. +orders import otherstock,# Maintains a small stock of other types of items (like beds). "" -- Repeat for each remaining apartments level as needed -- "quickfort run,orders library/dreamfort.csv -n /apartments2",# Run when the apartment level has been dug out. @@ -136,7 +139,7 @@ startmilitary: ^mnr{Down}r{metalarmorsetup}{Down}racNSiege&{Right}&^q sethotkey: {fkey}n{name}& starthotkeys: ^H{sethotkey fkey={F2} name=Farming}{sethotkey fkey={F3} name=Industry}{sethotkey fkey={F4} name=Services}{sethotkey fkey={F5} name=Guildhall}{sethotkey fkey={F6} name=Quarry}{sethotkey fkey={F7} name=Cavern}{sethotkey fkey={F8} name=Magma}^q "" -"#query label(setup) start(on the wagon) message(Please set the zoom targets of the hotkeys (the 'H' menu) according to where you actually end up digging the levels. +"#query label(setup) start(center tile of the wagon) message(Please set the zoom targets of the hotkeys (the 'H' menu) according to where you actually end up digging the levels. As you build your fort, expand the Inside burrow to include new civilian-safe areas. Optionally, add a leather cloak to your military uniforms to enhance the protection of the uniforms. Nothing in Dreamfort depends on these settings staying as they are. Feel free to change any setting to your personal preference.) assign nobles, set standing orders, create burrows, make adjustments to military uniforms, and set hotkey names" From 4aba34b040e06c2c9ca85a0d92ff85bb9ab1beb2 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 30 Aug 2021 22:15:24 -0700 Subject: [PATCH 21/23] add prioritization for hide tanning --- data/examples/init/onMapLoad_dreamfort.init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/examples/init/onMapLoad_dreamfort.init b/data/examples/init/onMapLoad_dreamfort.init index 418a299f18..7bd280357c 100644 --- a/data/examples/init/onMapLoad_dreamfort.init +++ b/data/examples/init/onMapLoad_dreamfort.init @@ -44,7 +44,9 @@ seedwatch start prioritize -a StoreItemInVehicle StoreItemInBag StoreItemInBarrel PullLever prioritize -a DestroyBuilding RemoveConstruction RecoverWounded DumpItem prioritize -a CleanSelf SlaughterAnimal PrepareRawFish ExtractFromRawFish -prioritize -a --haul-labor=Food StoreItemInStockpile +prioritize -a TradeAtDepot BringItemToDepot CleanTrap ManageWorkOrders +prioritize -a --haul-labor=Food,Body StoreItemInStockpile +prioritize -a --reaction-name=TAN_A_HIDE CustomReaction # autobutcher settings are saved in the savegame, so we only need to set them once. # this way, any custom settings you set during gameplay are not overwritten From 8de11c3e27ebc1d0cf4ac85b3144832c9250a71f Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 30 Aug 2021 22:59:15 -0700 Subject: [PATCH 22/23] update examples documentation --- data/examples/professions/Meleedwarf | 3 + docs/guides/examples-guide.rst | 133 +++++++++++++++++---------- 2 files changed, 88 insertions(+), 48 deletions(-) diff --git a/data/examples/professions/Meleedwarf b/data/examples/professions/Meleedwarf index 8eac5ffd6b..fdcd030c45 100644 --- a/data/examples/professions/Meleedwarf +++ b/data/examples/professions/Meleedwarf @@ -1,6 +1,8 @@ NAME Meleedwarf RECOVER_WOUNDED +SIEGEOPERATE MECHANIC +OPERATE_PUMP HAUL_STONE HAUL_WOOD HAUL_ITEM @@ -12,6 +14,7 @@ HAUL_ANIMALS HANDLE_VEHICLES HAUL_TRADE HAUL_WATER +ARCHITECT CLEAN PULL_LEVER BUILD_ROAD diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst index f5d8242c17..df3107962d 100644 --- a/docs/guides/examples-guide.rst +++ b/docs/guides/examples-guide.rst @@ -16,6 +16,8 @@ The :source:`init/ ` subfolder contains useful DFHack `init-files` that you can copy into your main Dwarf Fortress folder -- the same directory as ``dfhack.init``. +.. _onMapLoad-dreamfort-init + :source:`onMapLoad_dreamfort.init ` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -31,9 +33,10 @@ it is useful (and customizable) for any fort. It includes the following config: - Sets up `autofarm` to grow 30 units of every crop, except for pig tails, which is set to 150 units to support the textile industry. - Sets up `seedwatch` to keep 30 of every type of seed. -- Configures `prioritize` to automatically boost the priority of important tasks - that could otherwise get ignored in busy forts, like storing items in - vehicles, pulling levers, and removing constructions. +- Configures `prioritize` to automatically boost the priority of important and + time-sensitive tasks that could otherwise get ignored in busy forts, like + hauling food, tanning hides, storing items in vehicles, pulling levers, and + removing constructions. - Optimizes `autobutcher` settings for raising geese, alpacas, sheep, llamas, and pigs. Adds sensible defaults for all other animals, including dogs and cats. There are instructions in the file for customizing the settings for @@ -60,6 +63,7 @@ This collection of orders handles basic fort necessities: - thread/cloth/dye - pots/jugs/buckets/bags (of leather, cloth, silk, and yarn) - crafts and totems from otherwise unusable by-products +- mechanisms/cages - splints/crutches - lye/soap - ash/potash @@ -112,6 +116,36 @@ already managed by ``military.json``, but has lower limits. This ensures all ores will be covered if a player imports smelting but not military, but the higher-volume military orders will take priority if both are imported. +:source:`rockstock.json ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This collection of orders keeps a small stock of all types of rock furniture. +This allows you to do ad-hoc furnishings of guildhalls, libraries, temples, or +other rooms with `buildingplan` and your masons will make sure there is always +stock on hand to fulfill the plans. + +:source:`glassstock.json ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Similar to ``rockstock`` above, this collection keeps a small stock of all types +of glass furniture. If you have a functioning glass industry, this is more +sustainable than ``rockstock`` since you can never run out of sand. If you have +plenty of rock and just want the variety, you can import both ``rockstock`` and +``glassstock`` to get a mixture of rock and glass furnishings in your fort. + +There are a few items that ``glassstock`` produces that ``rockstock`` does not, +since there are some items that can not be made out of rock, for example: + +- tubes and corkscrews for building magma-safe screw pumps +- windows +- terrariums (as an alternative to wooden cages) + +:source:`otherstock.json ` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This last collection keeps a small stock of other commonly needed items, like +beds, wheelbarrows, and minecarts. + The ``professions/`` subfolder ------------------------------ @@ -134,7 +168,7 @@ want to import to a dwarf. Once you have assigned a profession to at least one dwarf, you can select "Import Professions from DF" in the DT "File" menu. The professions will then be available for use in DT. -In the charts below the "At Start" and "Max" columns indicate the approximate +In the charts below, the "At Start" and "Max" columns indicate the approximate number of dwarves of each profession that you are likely to need at the start of the game and how many you are likely to need in a mature fort. @@ -148,9 +182,8 @@ StartManager 1 0 All skills not covered by the other starting game. Individual labors should be turned off as migrants are assigned more specialized professions that cover them, and the StartManager - dwarf convert to some other profession once there - are enough dwarves to cover all the specialized - professions. + dwarf can eventually convert to some other + profession. Miner 2 2-10 Mining and Engraving. This profession also has the ``Alchemist`` labor enabled, which disables hauling for those using the `autohauler` plugin. @@ -158,69 +191,73 @@ Miner 2 2-10 Mining and Engraving. This profession also has game, dwarves with this profession make good military dwarves, wielding their picks as weapons. -Mason 2 2-4 Masonry and Architecture. In the early game, you - may need to run "`prioritize` ConstructBuilding" - to get your masons to build wells and bridges if - they are too busy crafting stone furniture. Late - game, you can turn off their Architcture labors - since that will be better handled by your - Haulers. -Outdoorsdwarf 1 2-3 Woodcutting, Animal Training, Trapping, Plant - Gathering, Beekeeping, and Mechanics. This - profession is also the only non-military - profession to have Recover wounded enabled (since - Outdoorsdwarves will have a battleaxe to defend - themselves with). -Craftsdwarf 1 3-4 All labors used at Carpenter's workshops, - Jeweler's workshops, and Craftsdwarf's workshops. -Chef 0 2 Cooking. It is important to focus just a few - dwarves on cooking since well-crafted meals make - dwarves very happy. They are also an excellent - trade good. +Mason 2 2-4 Masonry, Gem Cutting/Encrusting, and + Architecture. In the early game, you may need to + run "`prioritize` ConstructBuilding" to get your + masons to build wells and bridges if they are too + busy crafting stone furniture. Late game, you can + turn off their Architecture labor since that will + be better handled by your Haulers. +Outdoorsdwarf 1 2-4 Carpentry, Bowyery, Woodcutting, Animal Training, + Trapping, Plant Gathering, Beekeeping, and Siege + Engineering. +Craftsdwarf 1 4-6 All labors used at Craftsdwarf's workshops, + Glassmaker's workshops, and kilns. +Chef 0 2 Buchery, Tanning, and Cooking. It is important to + focus just a few dwarves on cooking since + well-crafted meals make dwarves very happy. They + are also an excellent trade good. Tailor 0 2 Textile industry labors: Dying, Leatherworking, Weaving, and Clothesmaking. Doctor 0 2-4 The full suite of medical labors, plus Animal Caretaking for those using the dwarfvet plugin. -Farmer 0 5 Food- and animal product-related labors. -Fisherdwarf 0 0 Fishing and fish cleaning. If you assign this +Farmer 0 5 Food- and animal product-related labors. This + profession also has the ``Alchemist`` labor + enabled since they need to focus on food-related + jobs. +Fisherdwarf 0 0-1 Fishing and fish cleaning. If you assign this profession to any dwarf, be prepared to be inundated with fish. Fisherdwarves *never stop fishing*. Be sure to also run ``prioritize -a PrepareRawFish ExtractFromRawFish`` (or use the ``onMapLoad_dreamfort.init`` file above) or else caught fish will just be left to rot. -Hauler 0 >20 All hauling labors plus Mechanic (so haulers can - assist in reloading traps) and Architecture (so - haulers can help build massive windmill farms and - pump stacks). As you accumulate enough Haulers, - you can turn off hauling labors for other dwarves - so they can focus on their skilled tasks. You may - also want to restrict your Mechanic's workshops - to only skilled mechanics so your haulers don't - make low-quality mechanisms. +Hauler 0 >20 All hauling labors plus Siege Operating, Mechanic + (so haulers can assist in reloading traps) and + Architecture (so haulers can help build massive + windmill farms and pump stacks). As you + accumulate enough Haulers, you can turn off + hauling labors for other dwarves so they can + focus on their skilled tasks. You may also want + to restrict your Mechanic's workshops to only + skilled mechanics so your haulers don't make + low-quality mechanisms. Marksdwarf 0 10 Same as Hauler, but with a different name so you can find your military dwarves more easily. Meleedwarf 0 50 Mostly the same as Hauler, but with a different name so you can find your military dwarves more easily. This profession also has the Recover - Wounded labor enabled. -Smith 0 4 Smithing, Glassmaking, Pottery, and Siege - Engineering labors. You will likely want to - specialize your Smiths to focus on either weapons - or armor to maximize equipment quality. + Wounded labor enabled. Meleedwarves and + Marksdwarves are similar to Haulers so you can + temporarily deactivate your military after sieges + to allow your military dwarves to help clean up. +Smith 0 4 Smithing labors. You may want to specialize your + Smiths to focus on a single smithing skill to + maximize equipment quality. Laborer 0 10-12 All labors that don't improve quality with skill, - such as furnace labors, Soapmaking, and Pump - Operating. + such as Soapmaking or furnace labors. ============= ======== ===== ================================================= A note on autohauler ~~~~~~~~~~~~~~~~~~~~ These profession definitions are designed to work well with or without the -`autohauler` plugin. If you do want to use autohauler, adding the following -lines to your ``onMapLoad.init`` file will configure it to let the professions -manage the "Feed water to civilians" and "Recover wounded" labors instead of -enabling those labors for all hauling dwarves:: +`autohauler` plugin (which helps to keep your dwarves focused on skilled labors +instead of constantly being distracted by hauling). If you do want to use +autohauler, adding the following lines to your ``onMapLoad.init`` file will +configure it to let the professions manage the "Feed water to civilians" and +"Recover wounded" labors instead of enabling those labors for all hauling +dwarves:: on-new-fortress enable autohauler on-new-fortress autohauler FEED_WATER_CIVILIANS allow From 37e795bc64155bb9aacb0285abb7c854fd49c71b Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 30 Aug 2021 23:02:34 -0700 Subject: [PATCH 23/23] fix doc link typo --- docs/guides/examples-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/examples-guide.rst b/docs/guides/examples-guide.rst index df3107962d..6a52af8ae6 100644 --- a/docs/guides/examples-guide.rst +++ b/docs/guides/examples-guide.rst @@ -16,7 +16,7 @@ The :source:`init/ ` subfolder contains useful DFHack `init-files` that you can copy into your main Dwarf Fortress folder -- the same directory as ``dfhack.init``. -.. _onMapLoad-dreamfort-init +.. _onMapLoad-dreamfort-init: :source:`onMapLoad_dreamfort.init ` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~