Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dreamfort cleanup #1966

Merged
merged 11 commits into from Sep 20, 2021
119 changes: 64 additions & 55 deletions data/blueprints/library/dreamfort.csv

Large diffs are not rendered by default.

277 changes: 229 additions & 48 deletions data/examples/orders/basic.json

Large diffs are not rendered by default.

2,288 changes: 1,686 additions & 602 deletions data/examples/orders/military.json

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions data/examples/professions/Marksdwarf
@@ -1,7 +1,5 @@
NAME Marksdwarf
SIEGEOPERATE
MECHANIC
OPERATE_PUMP
HAUL_STONE
HAUL_WOOD
HAUL_ITEM
Expand All @@ -13,7 +11,6 @@ HAUL_ANIMALS
HANDLE_VEHICLES
HAUL_TRADE
HAUL_WATER
ARCHITECT
CLEAN
PULL_LEVER
BUILD_ROAD
Expand Down
1 change: 0 additions & 1 deletion data/examples/professions/Mason
Expand Up @@ -13,7 +13,6 @@ HAUL_ANIMALS
HANDLE_VEHICLES
HAUL_TRADE
HAUL_WATER
ARCHITECT
CLEAN
PULL_LEVER
BUILD_ROAD
Expand Down
3 changes: 0 additions & 3 deletions data/examples/professions/Meleedwarf
@@ -1,8 +1,6 @@
NAME Meleedwarf
RECOVER_WOUNDED
SIEGEOPERATE
MECHANIC
OPERATE_PUMP
HAUL_STONE
HAUL_WOOD
HAUL_ITEM
Expand All @@ -14,7 +12,6 @@ HAUL_ANIMALS
HANDLE_VEHICLES
HAUL_TRADE
HAUL_WATER
ARCHITECT
CLEAN
PULL_LEVER
BUILD_ROAD
Expand Down
21 changes: 11 additions & 10 deletions data/examples/professions/StartManager
Expand Up @@ -9,23 +9,13 @@ DRESSING_WOUNDS
FEED_WATER_CIVILIANS
BUTCHER
TANNER
PLANT
DYER
SOAP_MAKER
BURN_WOOD
POTASH_MAKING
LYE_MAKING
MILLER
BREWER
PROCESS_PLANT
MAKE_CHEESE
MILK
SHEARER
SPINNER
COOK
PRESSING
BEEKEEPING
GELD
CLEAN_FISH
DISSECT_FISH
SMELT
Expand All @@ -34,8 +24,18 @@ FORGE_ARMOR
FORGE_FURNITURE
METAL_CRAFT
LEATHER
WOOD_CRAFT
STONE_CRAFT
BONE_CARVE
GLASSMAKER
WEAVER
CLOTHESMAKER
EXTRACT_STRAND
POTTERY
GLAZING
WAX_WORKING
PAPERMAKING
BOOKBINDING
SIEGEOPERATE
MECHANIC
OPERATE_PUMP
Expand All @@ -50,6 +50,7 @@ HAUL_ANIMALS
HANDLE_VEHICLES
HAUL_TRADE
HAUL_WATER
ARCHITECT
CLEAN
PULL_LEVER
BUILD_ROAD
Expand Down
3 changes: 3 additions & 0 deletions data/quickfort/aliases-common.txt
Expand Up @@ -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^
Expand All @@ -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^
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions docs/guides/quickfort-alias-guide.rst
Expand Up @@ -682,6 +682,7 @@ seeds forbidseeds permitseeds
dye forbiddye permitdye
tallow forbidtallow permittallow
miscliquid forbidmiscliquid permitmiscliquid
wax forbidwax permitwax
=============== ==================== ====================

Furniture stockpile adjustments
Expand Down
13 changes: 8 additions & 5 deletions docs/guides/quickfort-library-guide.rst
Expand Up @@ -35,13 +35,16 @@ high-level walkthrough by running ``quickfort run library/dreamfort.csv`` and
list the walkthroughs for the individual levels by running ``quickfort list -l
dreamfort -m notes`` or ``quickfort gui -l dreamfort notes``.

Dreamfort blueprints are also available for easy viewing and copying `online
Dreamfort blueprints are available for easy viewing and copying `online
<https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP>`__.

The online spreadsheets also include `embark profile suggestions
<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=149144025>`__
and a complete `example embark profile
<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1727884387>`__.
<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=149144025>`__,
a complete `example embark profile
<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1727884387>`__,
and a convenient `checklist
<https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__
from which you can copy the ``quickfort`` commands.

You can download a fully built Dreamfort-based fort from `dffd
<https://dffd.bay12games.com/file.php?id=15434>`__, load it, and explore it
Expand All @@ -52,7 +55,7 @@ Visual overview

Here are some annotated screenshots of the major levels (or click `here
<https://drive.google.com/drive/folders/14KdE2E2wQKj4F_E-NAe3G3E4x1wiWtrc>`__
for the slideshow interface).
for a slideshow).

Surface level
\\\\\\\\\\\\\
Expand Down