Skip to content

Commit

Permalink
Fountains require tears of armok and provide water.
Browse files Browse the repository at this point in the history
Fountains are no longer decorative places only useful for swimming.
Using a tear of armok, a pipe section, and a mechanism, a fountain
can be created which allows for buckets and bottles to be filled.

This means that Orcs and Kobolds now have a use for the tear
of armok, as they don't normally have access to the alchemist.
This also provides an alternative way for dwarves to generate
water from a tear.
  • Loading branch information
pjf committed Oct 27, 2013
1 parent 9623fd8 commit 4be6068
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
5 changes: 4 additions & 1 deletion Dwarf Fortress/raw/objects/building_z_decoration.txt
Expand Up @@ -75,6 +75,9 @@ building_z_decoration
[COLOR:3:2:7:2:0:3:1:1:7:2:0]
[COLOR:3:3:2:4:1:7:2:0:2:4:1]
[BUILD_ITEM:4:BLOCKS:NONE:NONE:NONE][BUILDMAT][CAN_USE_ARTIFACT][WORTHLESS_STONE_ONLY]
[BUILD_ITEM:1:ROUGH:NONE:INORGANIC:TEARS_OF_ARMOK]
[BUILD_ITEM:1:PIPE_SECTION:NONE:NONE:NONE][CAN_USE_ARTIFACT]
[BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE[CAN_USE_ARTIFACT]


[BUILDING_FURNACE:LOO]
Expand Down Expand Up @@ -605,4 +608,4 @@ abacus, if I ever need one
[TILE:2:1:135]
[COLOR:2:1:7:0:1]
[TILE:3:1:148]
[COLOR:3:1:7:7:1]
[COLOR:3:1:7:7:1]
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/entity_default.txt
Expand Up @@ -2496,6 +2496,7 @@ title
fountain
YESFOUNTAIN[PERMITTED_BUILDING:FOUNTAIN]
[PERMITTED_REACTION:TRAIN_SWIMMING]
[PERMITTED_REACTION:FILL_BUCKET]
displaycase
YESDECORATION[PERMITTED_BUILDING:DISPLAY_CASE]
[PERMITTED_REACTION:DECO_CASE]
Expand Down Expand Up @@ -6462,4 +6463,4 @@ YESKOBOLD[POSITION:MASTERTHIEF]
YESKOBOLD[REQUIRED_OFFICE:2500]
YESKOBOLD[REQUIRED_BEDROOM:2500]
YESKOBOLD[REQUIRED_DINING:2500]
YESKOBOLD[REQUIRED_TOMB:2500]
YESKOBOLD[REQUIRED_TOMB:2500]
5 changes: 3 additions & 2 deletions Dwarf Fortress/raw/objects/entity_kobold_camp.txt
Expand Up @@ -2394,6 +2394,8 @@ PERMITTED_BUILDING:BONEFURNACE

[PERMITTED_BUILDING:DECORATION]
YESFOUNTAIN[PERMITTED_BUILDING:FOUNTAIN]
[PERMITTED_REACTION:TRAIN_SWIMMING]
[PERMITTED_REACTION:FILL_BUCKET]
YESDECORATION[PERMITTED_BUILDING:DISPLAY_CASE]
YESPOTTEDPLANT[PERMITTED_BUILDING:POTTED_PLANT]
YESPOTTEDPLANT[PERMITTED_BUILDING:POTTED_TREE]
Expand All @@ -2403,7 +2405,6 @@ YESTOTEM[PERMITTED_BUILDING:RUG]
YESTOTEM[PERMITTED_BUILDING:CHANDELIER]
YESTOTEM[PERMITTED_BUILDING:BRAZIER]
YESTOTEM[PERMITTED_BUILDING:SIGN]
[PERMITTED_REACTION:TRAIN_SWIMMING]

YESTOTEM[PERMITTED_BUILDING:TOTEM2]
YESTOTEM[PERMITTED_BUILDING:SWORDS]
Expand Down Expand Up @@ -2741,4 +2742,4 @@ YESTOTEM[PERMITTED_BUILDING:RUG5]
[REQUIRED_STANDS:1]
[REQUIRED_BEDROOM:100]
[REQUIRED_DINING:250]

23 changes: 11 additions & 12 deletions Dwarf Fortress/raw/objects/reaction_masterwork.txt
Expand Up @@ -1503,6 +1503,17 @@ less xp now
[PRODUCT:100:1:BOULDER:NONE:GET_MATERIAL_FROM_REAGENT:INORGANIC:WATER_SPLASH3]
[SKILL:SWIMMING]

[REACTION:FILL_BUCKET]
[NAME:fill bucket with water]
[BUILDING:FOUNTAIN:CUSTOM_F]
[REAGENT:A:1:BUCKET:NONE:NONE:NONE]
[EMPTY]
[NOT_IMPROVED]
[PRESERVE_REAGENT]
[DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
[DOES_NOT_ABSORB]
[PRODUCT:100:7:LIQUID_MISC:NONE:WATER:NONE][PRODUCT_DIMENSION:150][PRODUCT_TO_CONTAINER:A]

##############################################################################
################## CRUCIBLE AKA STEEL MAKING #############################
##############################################################################
Expand Down Expand Up @@ -12373,18 +12384,6 @@ YESSTORAGE[PRODUCT:100:1:BAR:NONE:CREATURE_MAT:BONE_IRON_CRATE:SOAP]YESSTORAGE[P
############################## CURRENTLY NOT IN USE ##############################
#########################################################################################

[REACTION:FILL_BUCKET]
[NAME:fill bucket with water]
[BUILDING:FOUNTAIN:CUSTOM_F]
[REAGENT:A:1:BUCKET:NONE:NONE:NONE]
[EMPTY]
[NOT_IMPROVED]
[PRESERVE_REAGENT]
[DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
[DOES_NOT_ABSORB]
[PRODUCT:100:7:LIQUID_MISC:NONE:WATER:NONE][PRODUCT_DIMENSION:150][PRODUCT_TO_CONTAINER:A]




[REACTION:MECHANISMS_WOOD]
Expand Down

0 comments on commit 4be6068

Please sign in to comment.