dreamfort improvements

- shift seventh dwarf from craftsdwarf to farmer
- give starting miners some skill in engraving to make smoothing the
  cistern go faster
- update embark suggestions and sample profile accordingly
- widen clearcutting area for surface fort so trees don't overhang the
  roof
- move wax from the cookables stockpile to the industry goods pile
- move coins from goods to metal
- move sheets from goods to textiles

data/blueprints/library/dreamfort.csv

@@ -164,10 +164,11 @@ Nothing in Dreamfort depends on these settings staying as they are. Feel free to
 #ignore
 "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
-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
+Manager / Bookkeeper / Broker,Miner,Miner,Mason,Mason,Outdoorsdwarf,Farmer
+Mechanic (*),Miner (*),Miner (*),Mason (*),Mason (*),Carpenter (*),Grower (*)
+Wood Cutter,,,,,Wood Cutter (*)
+Architect,,,,,Bee Keeper
+Misc. labors needed for constructing workshops
 ""
 "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."
 ""
@@ -187,24 +188,24 @@ 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:
 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:STONECRAFT:1]
 [SKILL:1:MECHANICS:5]
 [SKILL:1:JUDGING_INTENT:1]
 [SKILL:1:APPRAISAL:1]
 [SKILL:1:ORGANIZATION:1]
 [SKILL:1:RECORD_KEEPING:1]
 [SKILL:2:MINING:5]
+[SKILL:2:DETAILSTONE:2]
 [SKILL:2:SWIMMING:1]
 [SKILL:3:MINING:5]
+[SKILL:3:DETAILSTONE:2]
 [SKILL:3:SWIMMING:1]
 [SKILL:4:MASONRY:5]
-[SKILL:4:DESIGNBUILDING:1]
 [SKILL:5:MASONRY:5]
-[SKILL:5:DESIGNBUILDING:1]
 [SKILL:6:WOODCUTTING:5]
 [SKILL:6:CARPENTRY:5]
-[SKILL:7:STONECRAFT:5]
+[SKILL:7:PLANT:3]
 [ITEM:2:WEAPON:ITEM_WEAPON_PICK:INORGANIC:COPPER]
 [ITEM:2:WEAPON:ITEM_WEAPON_AXE_BATTLE:INORGANIC:COPPER]
 [ITEM:1:ANVIL:NONE:INORGANIC:IRON]
@@ -1022,8 +1023,8 @@ You might also want to set the ""trade goods quantum"" stockpile to Auto Trade i
 
 
 #dig label(surface_clear_large) start(19; 19) hidden() clear wider area of trees
+t1(37x33)
 
-,t1(35x31)
 
 ,,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`
 ,,,`,,`,,,,,,,,,,,,,,,,,,,,,,,,,,`,,`
@@ -1637,7 +1638,7 @@ build3/farming_build3
 ,,`,`,`,`,`,`,`,,,`,"{givename name=""unprepared fish""}",,forbidcraftrefuse,"{givename name=""refuse feeder""}",corpses,,t{Left 3}{Down 4}&,`,,,forbidpreparedfood,,,,,,`
 ,,`,`,`,`,`,`,`,,`,`,`,,forbidcorpses,"{give move=""{Right 3}{Up}""}","{givename name=""corpse feeder""}",,`,`,`,,forbidbooze,,,,,`,`
 ,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`,,forbidseeds,,,,,`,`
-,,`,`,`,`,`,`,`,,`,`,`,,,"{quantumstop name=""Refuse/Corpse quantum"" sp_links=""{sp_link move={Up} move_back={Down}}{sp_link move=""""{Right}{Up}"""" move_back=""""{Down}{Left}""""}""}{givename name=""refuse/corpse dumper""}",,,`,`,`,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,`,`,`,,,"{quantumstop name=""Refuse/Corpse quantum"" sp_links=""{sp_link move={Up} move_back={Down}}{sp_link move=""""{Right}{Up}"""" move_back=""""{Down}{Left}""""}""}{givename name=""refuse/corpse dumper""}",,,`,`,`,,forbidwax,,,,`,`,`
 ,,,,,,,,,,,,,,,"{quantum name=""refuse/corpse quantum""}"
 
 
@@ -1949,13 +1950,13 @@ query/industry_query
 ,,w,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,`,`,`,`,`,`,e(5x1),,,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,w,`,`,`,`,`,`,w(2x5),,fngS(3x3),,`,,`,`,`,`,`,,rhl(5x5),,,~,~,`,`,`,`,`,`,`
+,,w,`,`,`,`,`,`,w(2x5),,fg(3x3),,`,,`,`,`,`,`,,rhlS(5x5),,,~,~,`,`,`,`,`,`,`
 ,,w,`,`,`,`,`,`,~,~,~,~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
 ,,`,`,`,`,`,c,`,~,~,~,~,~,,`,,`,,`,,~,~,~,~,~,`,r,`,`,`,`,`
 ,,f2,`,`,`,`,`,`,~,~,u2(3x2),~,~,`,`,,,,`,`,~,~,~,~,~,`,`,`,`,`,`,`
 ,,f2,`,`,`,`,`,`,~,~,~,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,`
 ,,f2,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
-,,f2,`,`,`,`,`,`,`,`,`,`,`,`,bpdz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f2,`,`,`,`,`,`,`,`,`,`,`,`,bnpdz(5x3),,,,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,f2,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,f2,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,pd(7x3),,,~,~,~,~,`,`,`,`,s2(5x2),,,~,~,`,`,`,`,`,`,`,`,`,`,`
@@ -1991,7 +1992,7 @@ query/industry_query
 ,,~,`,~,`,`,~,`,`,~,`,`,`,`,nocontainers,"{givename name=""gem feeder""}",~,~,~,`,`,`,`,~,`,`,~,`,`,~,`,`
 ,,~,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,~,`,`,`,`,`,`,"{givename name=""wood feeder""}",~,"{givename name=""goods feeder""}",nocontainers,~,,`,`,`,`,`,,craftrefuse,,,,~,`,`,`,`,`,`,`
-,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitdye},~,~,`,`,,,,`,`,"{givename name=""cloth/bones feeder""}",~,~,~,~,`,`,`,`,`,`,`
+,,t{Right 5}{Down}&,`,`,`,`,`,`,~,~,{tallow}{permitdye}{permitwax},~,~,`,`,,,,`,`,"{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,~,~,,`,`,`,`,`,,~,~,~,~,~,`,`,`,`,`,`,`

data/quickfort/aliases-common.txt

@@ -118,6 +118,7 @@ seeds:          {foodprefix}b{Right}{Down 9}p^
 dye:            {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
 tallow:         {foodprefix}b{Right}{Down 13}{Right}stallow&p^
 miscliquid:     {foodprefix}b{Right}{Down 18}p^
+wax:            {foodprefix}b{Right}{Down 15}{Right}{Down 6}&^
 
 forbidpreparedfood:   {foodprefix}u^
 forbidunpreparedfish: {foodprefix}{Right}{Down 2}f^
@@ -127,6 +128,7 @@ forbidseeds:          {foodprefix}{Right}{Down 9}f^
 forbiddye:            {foodprefix}{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
 forbidtallow:         {foodprefix}{Right}{Down 13}{Right}stallow&f^
 forbidmiscliquid:     {foodprefix}{Right}{Down 18}f^
+forbidwax:            {foodprefix}{Right}{Down 15}{Right}{Down 6}&^
 
 permitpreparedfood:   {forbidpreparedfood}
 permitunpreparedfish: {foodprefix}{Right}{Down 2}p^
@@ -136,6 +138,7 @@ permitseeds:          {foodprefix}{Right}{Down 9}p^
 permitdye:            {forbiddye}
 permittallow:         {foodprefix}{Right}{Down 13}{Right}stallow&p^
 permitmiscliquid:     {foodprefix}{Right}{Down 18}p^
+permitwax:            {forbidwax}
 
 # the next two aliases are for compatibility with previous implementations of
 # Quickfort and are not documented.

docs/guides/quickfort-alias-guide.rst

@@ -682,6 +682,7 @@ seeds            forbidseeds           permitseeds
 dye              forbiddye             permitdye
 tallow           forbidtallow          permittallow
 miscliquid       forbidmiscliquid      permitmiscliquid
+wax              forbidwax             permitwax
 ===============  ====================  ====================
 
 Furniture stockpile adjustments