Skip to content

Commit

Permalink
creature_birds.txt and creature_subterranean.txt files now use APPLY_…
Browse files Browse the repository at this point in the history 
…CREATURE_VARIATION.

There were differences between how masterwork and other tilesets
constructured birds. This patch brings all of these into line with
each other, and is important in getting BillyJack's less leather
patch to apply.

No other changes are made. In particular it was noted that
ostriches are trainable in some tilesets, but not others.
  • Loading branch information
@pjf
pjf committed Nov 9, 2013
1 parent 4375296 commit 2a95d8e
Show file tree
Hide file tree
Showing 24 changed files with 360 additions and 1,248 deletions.
114 changes: 26 additions & 88 deletions MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_birds.txt
View file
Expand Up @@ -32,14 +32,10 @@ YESBIRD[OBJECT:CREATURE]
[PREFSTRING:gull-like scream]
[PREFSTRING:fanciful colour]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]

[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]

[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -134,14 +130,10 @@ YESBIRD[OBJECT:CREATURE]
[PREFSTRING:song-learning ability]
[PREFSTRING:bonding-behaviour]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]

[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]

[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -233,14 +225,8 @@ YESBIRD[OBJECT:CREATURE]
[PREFSTRING:whistling notes]
[PREFSTRING:gregarious consumption]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -330,14 +316,8 @@ YESBIRD[OBJECT:CREATURE]
[PREFSTRING:mimicry]
[PREFSTRING:arboreal nature]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -428,14 +408,8 @@ YESBIRD[OBJECT:CREATURE]
[PREFSTRING:vigilance]
[PREFSTRING:melodious songs]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:COMMON_ANIMAL_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -531,14 +505,8 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
[BODY:HUMANOID_ARMLESS:SIDE_FLIPPERS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[RELSIZE:BY_CATEGORY:LEG_UPPER:100] short legs!
[RELSIZE:BY_CATEGORY:LEG_LOWER:100]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -623,14 +591,8 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
[BODY:HUMANOID_ARMLESS:SIDE_FLIPPERS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[RELSIZE:BY_CATEGORY:LEG_UPPER:100]
[RELSIZE:BY_CATEGORY:LEG_LOWER:100]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -715,14 +677,8 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
[BODY:HUMANOID_ARMLESS:SIDE_FLIPPERS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[RELSIZE:BY_CATEGORY:LEG_UPPER:100]
[RELSIZE:BY_CATEGORY:LEG_LOWER:100]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -874,14 +830,8 @@ Peregrine falcons were sponsored by the generous contributions of the Bay 12 com
[SWIMS_INNATE][SWIM_SPEED:2500]
[PREFSTRING:ability to dive through the air]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -1027,14 +977,8 @@ Kiwis were sponsored by the generous contributions of the Bay 12 community.
[SWIMS_INNATE][SWIM_SPEED:2500]
[PREFSTRING:long beaks]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:2TOES:BEAK:TONGUE:RIBCAGE]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -1175,14 +1119,8 @@ Ostriches were sponsored by the generous contributions of the Bay 12 community.
[PREFSTRING:long necks]
[PREFSTRING:giant eggs]
[BODY:HUMANOID_ARMLESS_NECK:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:GIZZARD:HUMANOID_JOINTS:THROAT:NECK:NECK_SPINE:SPINE:OUTERBRAIN:BRAIN:SKULL:2TOES:BEAK:TONGUE:RIBCAGE:TAIL]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_FEATHER_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down
20 changes: 4 additions & 16 deletions MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_subterranean.txt
View file
Expand Up @@ -34,14 +34,8 @@ creature_subterrenean
[PREFSTRING:waddling gait]
[PREFSTRING:aerial feeding ability]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:RIBCAGE]
[BODY_DETAIL_PLAN:THINSKIN_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_HAIR_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down Expand Up @@ -1259,14 +1253,8 @@ creature_subterrenean
[NATURAL_SKILL:GRASP_STRIKE:1]
[NATURAL_SKILL:SITUATIONAL_AWARENESS:4]
[BODY:HUMANOID_ARMLESS:2WINGS:2EYES:2LUNGS:HEART:GUTS:ORGANS:HUMANOID_JOINTS:THROAT:NECK:SPINE:OUTERBRAIN:BRAIN:SKULL:4TOES:BEAK:RIBCAGE]
[BODY_DETAIL_PLAN:THINSKIN_MATERIALS]
[REMOVE_MATERIAL:HAIR]
[USE_MATERIAL_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:STANDARD_TISSUES]
[REMOVE_TISSUE:HAIR]
[USE_TISSUE_TEMPLATE:FEATHER:FEATHER_TEMPLATE]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS:SKIN:FAT:MUSCLE:BONE:CARTILAGE]
[BODY_DETAIL_PLAN:BODY_HAIR_TISSUE_LAYERS:FEATHER]
[APPLY_CREATURE_VARIATION:FEATHERED]
[APPLY_CURRENT_CREATURE_VARIATION]
[USE_MATERIAL_TEMPLATE:TALON:NAIL_TEMPLATE]
[USE_TISSUE_TEMPLATE:TALON:TALON_TEMPLATE]
[TISSUE_LAYER:BY_CATEGORY:TOE:TALON:FRONT]
Expand Down

0 comments on commit 2a95d8e

Please sign in to comment.