The eyelids seem to be fine for me. I haven't changed the soldier stuff on my version.
I put together a patch with some of the changes. I haven't changed the weapon stuff. The TRADE_CAPACITY stuff is in there, though I'm still not too sure about it.
diff -u tmp/raw/objects/b_detail_plan_default.txt df_31_01/raw/objects/b_detail_plan_default.txt
--- tmp/raw/objects/b_detail_plan_default.txt 2010-04-07 21:26:19.000000000 -0400
+++ df_31_01/raw/objects/b_detail_plan_default.txt 2010-04-07 21:26:18.000000000 -0400
@@ -128,6 +128,7 @@
[BP_LAYERS:BY_CATEGORY:CHEEK:ARG1:1]
[BP_LAYERS:BY_CATEGORY:EYELID:ARG1:1]
[BP_LAYERS:BY_CATEGORY:THROAT:ARG1:1]
+ [BP_LAYERS:BY_CATEGORY:WING:ARG1:1]
[BODY_DETAIL_PLAN:VERTEBRATE_TISSUE_LAYERS]
This body detail plan accepts argument tokens that can fill the role of the tissue token. For instance, the dwarf sends in SKIN, FAT, MUSCLE, BONE and CARTILAGE.
@@ -273,9 +274,9 @@
[BP_RELATION:BY_CATEGORY:LIP:AROUND:BY_CATEGORY:TEETH:100]
[BP_RELATION:BY_CATEGORY:SKULL:AROUND:BY_CATEGORY:BRAIN:100]
[BP_RELATION:BY_TOKEN:R_EYELID:AROUND:R_EYE:50]
- [BP_RELATION:BY_TOKEN:L_EYELID:AROUND:R_EYE:50]
+ [BP_RELATION:BY_TOKEN:L_EYELID:AROUND:L_EYE:50]
[BP_RELATION:BY_TOKEN:EYELID:AROUND:EYE:50]
- [BP_RELATION:BY_TOKEN:R_EYELID:CLEANS:L_EYE:100]
+ [BP_RELATION:BY_TOKEN:R_EYELID:CLEANS:R_EYE:100]
[BP_RELATION:BY_TOKEN:L_EYELID:CLEANS:L_EYE:100]
[BP_RELATION:BY_TOKEN:EYELID:CLEANS:EYE:100]
diff -u tmp/raw/objects/creature_domestic.txt df_31_01/raw/objects/creature_domestic.txt
--- tmp/raw/objects/creature_domestic.txt 2010-03-29 01:20:18.000000000 -0400
+++ df_31_01/raw/objects/creature_domestic.txt 2010-04-07 21:40:26.000000000 -0400
@@ -294,7 +294,7 @@
[DIURNAL]
[HOMEOTHERM:10068]
[SWIMS_INNATE][SWIM_SPEED:2500]
- [trADE_CAPACITY:2000]
+ [trADE_CAPACITY:200]
[MUNDANE]
[MALE]
[SET_TL_GROUP:BY_CATEGORY:ALL:HAIR]
@@ -373,7 +373,7 @@
[DIURNAL]
[HOMEOTHERM:10068]
[SWIMS_INNATE][SWIM_SPEED:2500]
- [trADE_CAPACITY:1500]
+ [trADE_CAPACITY:150]
[MUNDANE]
[CASTE:FEMALE]
[FEMALE]
diff -u tmp/raw/objects/creature_large_mountain.txt df_31_01/raw/objects/creature_large_mountain.txt
--- tmp/raw/objects/creature_large_mountain.txt 2010-03-11 01:32:46.000000000 -0500
+++ df_31_01/raw/objects/creature_large_mountain.txt 2010-04-07 21:18:32.000000000 -0400
@@ -74,7 +74,7 @@
[ATTACK_FLAG_EDGE]
[ATTACK_PRIORITY:SECOND]
[ATTACK_FLAG_CANLATCH]
- [CHILD:1][GENERAL_CHILD_NAME:horse foal:horse foals]
+ [CHILD:1]
[DIURNAL]
[HOMEOTHERM:10067]
[SWIMS_INNATE][SWIM_SPEED:2500]
diff -u tmp/raw/objects/creature_large_temperate.txt df_31_01/raw/objects/creature_large_temperate.txt
--- tmp/raw/objects/creature_large_temperate.txt 2010-03-11 01:38:16.000000000 -0500
+++ df_31_01/raw/objects/creature_large_temperate.txt 2010-04-07 21:22:47.000000000 -0400
@@ -873,7 +873,7 @@
[TLCM_NOUN:scales:PLURAL]
[SET_TL_GROUP:BY_CATEGORY:EYE:EYE]
[TL_COLOR_MODIFIER:BLACK:1]
- [TLCM_NOUN:hair:SINGULAR]
+ [TLCM_NOUN:eyes:PLURAL]
[SELECT_MATERIAL:ALL]
[MULTIPLY_VALUE:3]
diff -u tmp/raw/objects/creature_large_tropical.txt df_31_01/raw/objects/creature_large_tropical.txt
--- tmp/raw/objects/creature_large_tropical.txt 2010-03-13 03:48:12.000000000 -0500
+++ df_31_01/raw/objects/creature_large_tropical.txt 2010-04-07 21:41:10.000000000 -0400
@@ -1875,7 +1875,7 @@
[POPULATION_NUMBER:15:30]
[CLUSTER_NUMBER:3:7]
[BIOME:ANY_DESERT]
- [trADE_CAPACITY:3000]
+ [trADE_CAPACITY:300]
[BENIGN][MEANDERER][NATURAL]
[BODY:QUADRUPED:TAIL:1HUMP:2EYES:2EARS:NOSE:2LUNGS:HEART:GUTS:ORGANS:THROAT:NECK:SPINE:BRAIN:SKULL:MOUTH:GENERIC_TEETH:RIBCAGE]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
@@ -1980,7 +1980,7 @@
[POPULATION_NUMBER:15:30]
[CLUSTER_NUMBER:3:7]
[BIOME:ANY_DESERT]
- [trADE_CAPACITY:3000]
+ [trADE_CAPACITY:300]
[BENIGN][MEANDERER][NATURAL]
[BODY:QUADRUPED:TAIL:2HUMPS:2EYES:2EARS:NOSE:2LUNGS:HEART:GUTS:ORGANS:THROAT:NECK:SPINE:BRAIN:SKULL:MOUTH:GENERIC_TEETH:RIBCAGE]
[BODY_DETAIL_PLAN:STANDARD_MATERIALS]
diff -u tmp/raw/objects/creature_large_tundra.txt df_31_01/raw/objects/creature_large_tundra.txt
--- tmp/raw/objects/creature_large_tundra.txt 2010-03-11 01:38:48.000000000 -0500
+++ df_31_01/raw/objects/creature_large_tundra.txt 2010-04-07 21:41:23.000000000 -0400
@@ -76,7 +76,7 @@
[DIURNAL]
[HOMEOTHERM:10067]
[SWIMS_INNATE][SWIM_SPEED:2500]
- [trADE_CAPACITY:2000]
+ [trADE_CAPACITY:200]
[MUNDANE]
[CASTE:FEMALE]
[FEMALE]
@@ -86,7 +86,7 @@
[SELECT_CASTE:ALL]
[SET_TL_GROUP:BY_CATEGORY:ALL:HAIR]
[TL_COLOR_MODIFIER:GRAY:1]
- [TLCM_NOUN:skin:SINGULAR]
+ [TLCM_NOUN:hair:SINGULAR]
[SET_TL_GROUP:BY_CATEGORY:ALL:SKIN]
[TL_COLOR_MODIFIER:BROWN:1:BURNT_UMBER:1:CINNAMON:1:COPPER:1:DARK_BROWN:1:DARK_PEACH:1:DARK_TAN:1:ECRU:1:PALE_BROWN:1:PALE_CHESTNUT:1:PALE_PINK:1:PEACH:1:PINK:1:RAW_UMBER:1:SEPIA:1:TAN:1:TAUPE_PALE:1:TAUPE_SANDY:1]
[TLCM_NOUN:skin:SINGULAR]
diff -u tmp/raw/objects/creature_savage_tropical.txt df_31_01/raw/objects/creature_savage_tropical.txt
--- tmp/raw/objects/creature_savage_tropical.txt 2010-03-20 00:43:38.000000000 -0400
+++ df_31_01/raw/objects/creature_savage_tropical.txt 2010-04-07 21:29:26.000000000 -0400
@@ -545,7 +545,7 @@
[TLCM_NOUN:chitin:SINGULAR]
[SET_TL_GROUP:BY_CATEGORY:EYE:EYE]
[TL_COLOR_MODIFIER:BLACK:1]
- [TLCM_NOUN:eyes:SINGULAR]
+ [TLCM_NOUN:eyes:PLURAL]
[SELECT_MATERIAL:ALL]
[MULTIPLY_VALUE:4]
diff -u tmp/raw/objects/creature_standard.txt df_31_01/raw/objects/creature_standard.txt
--- tmp/raw/objects/creature_standard.txt 2010-03-30 03:49:20.000000000 -0400
+++ df_31_01/raw/objects/creature_standard.txt 2010-04-07 21:30:08.000000000 -0400
@@ -1725,7 +1725,7 @@
[ATTACK_FLAG_EDGE]
[ATTACK_PRIORITY:SECOND]
[ATTACK_FLAG_CANLATCH]
- [CHILD:1][GENERAL_CHILD_NAME:elk fawn:elk fawns]
+ [CHILD:1][GENERAL_CHILD_NAME:unicorn foal:unicorn foals]
[DIURNAL]
[HOMEOTHERM:10067]
[SWIMS_INNATE][SWIM_SPEED:2500]
@@ -2240,11 +2240,11 @@
[CASTE:FEMALE]
[FEMALE]
[MULTIPLE_LITTER_RARE]
- [CASTE_NAME:giant:giants:giant]
+ [CASTE_NAME:giantess:giantesses:giantess]
[CASTE:MALE]
[MALE]
[BODY_DETAIL_PLAN:FACIAL_HAIR_TISSUE_LAYERS]
- [CASTE_NAME:giantess:giantesses:giantess]
+ [CASTE_NAME:giant:giants:giant]
[SELECT_CASTE:ALL]
[SET_TL_GROUP:BY_CATEGORY:HEAD:HAIR]
[PLUS_TL_GROUP:BY_CATEGORY:HEAD:CHEEK_WHISKERS]
@@ -2489,7 +2489,7 @@
[TLCM_NOUN:skin:SINGULAR]
[SET_TL_GROUP:BY_CATEGORY:EYE:EYE]
[TL_COLOR_MODIFIER:IRIS_EYE_AMBER:1:IRIS_EYE_AQUA:1:IRIS_EYE_AQUAMARINE:1:IRIS_EYE_ASH_GRAY:1:IRIS_EYE_AUBURN:1:IRIS_EYE_AZURE:1:IRIS_EYE_BLUE:1:IRIS_EYE_BRASS:1:IRIS_EYE_BRONZE:1:IRIS_EYE_BROWN:1:IRIS_EYE_CERULEAN:1:IRIS_EYE_CHESTNUT:1:IRIS_EYE_CHOCOLATE:1:IRIS_EYE_CINNAMON:1:IRIS_EYE_COPPER:1:IRIS_EYE_DARK_BLUE:1:IRIS_EYE_DARK_BROWN:1:IRIS_EYE_DARK_CHESTNUT:1:IRIS_EYE_DARK_GREEN:1:IRIS_EYE_DARK_OLIVE:1:IRIS_EYE_DARK_TAN:1:IRIS_EYE_ECRU:1:IRIS_EYE_EMERALD:1:IRIS_EYE_FERN_GREEN:1:IRIS_EYE_GRAY:1:IRIS_EYE_GREEN:1:IRIS_EYE_JADE:1:IRIS_EYE_LIGHT_BLUE:1:IRIS_EYE_LIGHT_BROWN:1:IRIS_EYE_MAHOGANY:1:IRIS_EYE_MIDNIGHT_BLUE:1:IRIS_EYE_OCHRE:1:IRIS_EYE_OLIVE:1:IRIS_EYE_PALE_BLUE:1:IRIS_EYE_PALE_BROWN:1:IRIS_EYE_PALE_CHESTNUT:1:IRIS_EYE_PERIWINKLE:1:IRIS_EYE_PINE_GREEN:1:IRIS_EYE_RAW_UMBER:1:IRIS_EYE_RUSSET:1:IRIS_EYE_SEA_GREEN:1:IRIS_EYE_SEPIA:1:IRIS_EYE_SKY_BLUE:1:IRIS_EYE_SLATE_GRAY:1:IRIS_EYE_SPRING_GREEN:1:IRIS_EYE_TAN:1:IRIS_EYE_TAUPE_DARK:1:IRIS_EYE_TAUPE_GRAY:1:IRIS_EYE_TAUPE_MEDIUM:1:IRIS_EYE_TAUPE_PALE:1:IRIS_EYE_TAUPE_SANDY:1:IRIS_EYE_TEAL:1:IRIS_EYE_TURQUOISE:1]
- [TLCM_NOUN:eye:PLURAL]
+ [TLCM_NOUN:eye:SINGULAR]
[CREATURE:ETTIN]
[DESCRIPTION:A giant humanoid monster with two heads.]
diff -u tmp/raw/objects/creature_subterranean.txt df_31_01/raw/objects/creature_subterranean.txt
--- tmp/raw/objects/creature_subterranean.txt 2010-03-30 03:49:28.000000000 -0400
+++ df_31_01/raw/objects/creature_subterranean.txt 2010-04-07 21:35:16.000000000 -0400
@@ -927,7 +927,7 @@
[SYNDROME]
[SYN_NAME:giant cave spider bite]
[SYN_AFFECTED_CLASS:GENERAL_POISON]
- [SYN_IMMUNE_CREATURE:SPIDER_CAVE:ALL]
+ [SYN_IMMUNE_CREATURE:SPIDER_CAVE_GIANT:ALL]
[SYN_INJECTED]
[CE_PARALYSIS:SEV:100:PROB:100:RESISTABLE:SIZE_DILUTES:START:5:PEAK:10:END:20]
[ATTACK:STING:BODYPART:BY_CATEGORY:MOUTH]
@@ -937,6 +937,7 @@
[ATTACK_PRIORITY:MAIN]
[SPECIALATTACK_INJECT_EXTRACT:LOCAL_CREATURE_MAT:POISON:LIQUID:100:100]
[ATTACK_FLAG_CANLATCH]
+ [ATTACK_FLAG_EDGE]
[ALL_ACTIVE]
[HOMEOTHERM:10040]
[CASTE:FEMALE]
@@ -1713,7 +1714,7 @@
[DESCRIPTION:A small blue and orange bird.]
[NAME:cave swallow:cave swallows:cave swallow]
[CASTE_NAME:cave swallow:cave swallows:cave swallow]
- [GENERAL_CHILD_NAME:red-winged blackbird hatchling:red-winged blackbird hatchlings]
+ [GENERAL_CHILD_NAME:cave swallow hatchling:cave swallow hatchlings]
[CREATURE_TILE:249][COLOR:0:0:1]
[PETVALUE:30]
[PET_EXOTIC]
diff -u tmp/raw/objects/inorganic_stone_mineral.txt df_31_01/raw/objects/inorganic_stone_mineral.txt
--- tmp/raw/objects/inorganic_stone_mineral.txt 2010-03-30 06:14:06.000000000 -0400
+++ df_31_01/raw/objects/inorganic_stone_mineral.txt 2010-04-07 21:23:55.000000000 -0400
@@ -196,7 +196,7 @@
[INORGANIC:HORN_SILVER]
[USE_MATERIAL_TEMPLATE:METAL_TEMPLATE]
[STATE_NAME_ADJ:ALL_SOLID:horn silver][DISPLAY_COLOR:7:7:1][TILE:156]
-[ENVIRONMENT_SPEC:SILVER:CLUSTER_SMALL:100]
+[ENVIRONMENT_SPEC:NATIVE_SILVER:CLUSTER_SMALL:100]
[ITEM_SYMBOL:'*']
[METAL_ORE:SILVER:100]
[SOLID_DENSITY:10490]
diff -u tmp/raw/objects/material_template_default.txt df_31_01/raw/objects/material_template_default.txt
--- tmp/raw/objects/material_template_default.txt 2010-03-11 18:19:02.000000000 -0500
+++ df_31_01/raw/objects/material_template_default.txt 2010-04-04 13:59:20.000000000 -0400
@@ -297,7 +297,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:NONE:meat:meat]
@@ -707,7 +707,7 @@
[ABSORPTION:100]
[IMPLIES_ANIMAL_KILL]
[ROTS]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:eye:eye]
@@ -801,7 +801,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:brain:brain]
@@ -850,7 +850,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:lung:lung]
@@ -899,7 +899,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:heart:heart]
@@ -948,7 +948,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:chopped:liver:liver]
@@ -997,7 +997,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:intestines:intestines]
@@ -1047,7 +1047,7 @@
[ROTS]
[GENERATES_MIASMA]
[BUTCHER_SPECIAL:MEAT:NONE]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:NONE:tripe:tripe]
@@ -1096,7 +1096,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:NONE:sweetbread:sweetbread]
@@ -1145,7 +1145,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:spleen:spleen]
@@ -1194,7 +1194,7 @@
[IMPLIES_ANIMAL_KILL]
[ROTS]
[GENERATES_MIASMA]
- [MEAT]
+ [MEAT][EDIBLE_COOKED]
[BUTCHER_SPECIAL:MEAT:NONE]
[MEAT_NAME:prepared:kidney:kidney]
diff -u tmp/raw/objects/plant_standard.txt df_31_01/raw/objects/plant_standard.txt
--- tmp/raw/objects/plant_standard.txt 2010-02-24 04:38:14.000000000 -0500
+++ df_31_01/raw/objects/plant_standard.txt 2010-04-04 13:59:20.000000000 -0400
@@ -196,6 +196,7 @@
[USE_MATERIAL_TEMPLATE:LEAF:LEAF_TEMPLATE]
[MATERIAL_VALUE:5]
[LEAVES:quarry bush leaf:quarry bush leaves:7:0:0:0:0:1:6:LOCAL_PLANT_MAT:LEAF]
+ [EDIBLE_COOKED]
[USE_MATERIAL_TEMPLATE:SEED:SEED_TEMPLATE]
[MATERIAL_VALUE:1]
[SEED:rock nut:rock nuts:7:0:1:LOCAL_PLANT_MAT:SEED]
diff -u tmp/raw/objects/reaction_other.txt df_31_01/raw/objects/reaction_other.txt
--- tmp/raw/objects/reaction_other.txt 2010-03-22 19:30:20.000000000 -0400
+++ df_31_01/raw/objects/reaction_other.txt 2010-04-06 11:49:35.000000000 -0400
@@ -29,7 +29,7 @@
[REAGENT:A:1:BARREL:NONE:NONE:NONE][CONTAINS_LYE]
[REAGENT:B:1:GLOB:NONE:NONE:NONE][REACTION_CLASS:TALLOW][UNROTTEN]
[HAS_MATERIAL_REACTION_PRODUCT:SOAP_MAT]
- [PRODUCT:100:1:GLOB:NONE:GET_MATERIAL_FROM_REAGENT:B:SOAP_MAT]
+ [PRODUCT:100:1:BAR:NONE:GET_MATERIAL_FROM_REAGENT:B:SOAP_MAT][PRODUCT_DIMENSION:150]
[SKILL:SOAP_MAKING]
[REACTION:MAKE_PEARLASH]
@@ -47,4 +47,4 @@
[REAGENT:B:1:BOX:NONE:NONE:NONE][EMPTY][BAG][PRESERVE_REAGENT]
[PRODUCT:100:1:POWDER_MISC:NONE:INORGANIC:PLASTER][PRODUCT_DIMENSION:150][PRODUCT_TO_CONTAINER:B]
[FUEL]