Skip to content

Commit

Permalink
More tileset harmonizations.
Browse files Browse the repository at this point in the history
Automatically generated. All should be safe. Everything uses
the Masterwork tiles as intended behaviour.
  • Loading branch information
pjf committed Nov 29, 2013
1 parent f26a1c4 commit d21c328
Show file tree
Hide file tree
Showing 78 changed files with 351 additions and 432 deletions.
Expand Up @@ -1571,7 +1571,7 @@ Squids were sponsored by the generous contributions of the Bay 12 community.

[CREATURE:GIGANTIC SQUID]
[COPY_TAGS_FROM:SQUID]
[APPLY_CREATURE_VARIATION:GIANT]
[APPLY_CREATURE_VARIATION:GIANT][FREQUENCY:75]
[CV_REMOVE_TAG:CHANGE_BODY_SIZE_PERC]
[APPLY_CURRENT_CREATURE_VARIATION]
[GO_TO_END]
Expand Down
Expand Up @@ -8431,7 +8431,7 @@ YESBATTLECRY[CAN_DO_INTERACTION:BATTLECRY_HUMAN]
[BIOME:TUNDRA]
[LARGE_ROAMING][DIFFICULTY:2][FREQUENCY:100]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-5:10]
[CLUSTER_NUMBER:3:2]
[CLUSTER_NUMBER:3:3]
[LIKES_FIGHTING]
[LARGE_PREDATOR][MEANDERER]
[CAN_LEARN][SLOW_LEARNER]
Expand Down
Expand Up @@ -990,7 +990,7 @@ creature_subterrenean



[CREATURE:CROCODILE_CAVE][TRAINABLE_WAR]
[CREATURE:CROCODILE_CAVE]
[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:(Size 600, quadruped) A huge predatory reptile with pale, colorless scales and red eyes. It lives in caves and ambushes its prey.]
[NAME:cave croc:cave crocs:cave croc]
[CASTE_NAME:cave croc:cave crocs:cave croc]
Expand Down Expand Up @@ -2604,7 +2604,7 @@ creature_subterrenean
[NATURAL]

[BIOME:SUBTERRANEAN_CHASM]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:2]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:1:2]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-3:5]
[CLUSTER_NUMBER:3:8]

Expand Down Expand Up @@ -2787,7 +2787,7 @@ creature_subterrenean
[LARGE_ROAMING]
[SPEED:1020]
[BIOME:SUBTERRANEAN_CHASM]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:3]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:3]
[FREQUENCY:100]1][DIFFICULTY:2]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
[NOPAIN][EXTRAVISION][NOBREATHE][NOSTUN][NONAUSEA][NOEMOTION]
Expand Down Expand Up @@ -2868,7 +2868,7 @@ creature_subterrenean
[LARGE_ROAMING]
[SPEED:1120]
[BIOME:SUBTERRANEAN_WATER]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:3]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:3]
[FREQUENCY:100]1]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
[NOPAIN][EXTRAVISION][NOBREATHE][NOSTUN][NONAUSEA][NOEMOTION]
Expand Down
Expand Up @@ -16,7 +16,7 @@ YESARCHEOLOGIST[OBJECT:INORGANIC]
[ENVIRONMENT:IGNEOUS_EXTRUSIVE:CLUSTER_SMALL:15]
[MAT_FIXED_TEMP:10000]
[MELTING_POINT:9000]
[BOILING_POINT:9500]
[BOILING_POINT:9500] [SPECIAL]

// fossils for archologist, give random item
[INORGANIC:FOSSIL]
Expand All @@ -33,7 +33,7 @@ YESARCHEOLOGIST[OBJECT:INORGANIC]
[IS_GEM:relic:STP:OVERWRITE_SOLID]
[ENVIRONMENT_SPEC:RUINS:CLUSTER_ONE:100]
[ENVIRONMENT:ALL_STONE:CLUSTER_ONE:25]
[REACTION_CLASS:FOSSILS]
[REACTION_CLASS:FOSSILS] [SPECIAL]

// treasure for archologist, give, bars, coins, gems
[INORGANIC:TREASURE]
Expand Down
Expand Up @@ -239,7 +239,7 @@ YESWARP[INORGANIC:SOGGOTH]
[MATERIAL_VALUE:8]
[BOILING_POINT:0]
[SYNDROME]
[SYN_NAME:warpstone exposure]
[SYN_NAME:warpstone exposure]
[SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_IMMUNE_CREATURE:DWARF:MASON_MALE]
[SYN_IMMUNE_CREATURE:DWARF:MASON_FEMALE]
Expand Down
Expand Up @@ -2,8 +2,8 @@ plant_grasses

[OBJECT:PLANT]

[PLANT:MEADOW-GRASS]
[ALL_NAMES:meadow-grass]
[PLANT:GRASS1]
[ALL_NAMES:grass]
[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
[GRASS]
Expand Down Expand Up @@ -543,8 +543,9 @@ YESCAVERNFLAVOR[PLANT:CAVE MOSS]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:1:1]

YESCAVERNFLAVOR[PLANT:FLOOR FUNGI]
YESCAVERNFLAVOR[NAME:fungus]YESCAVERNFLAVOR[NAME_PLURAL:floor fungi]YESCAVERNFLAVOR[ADJ:floor fungus]

YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[ALL_NAMES:crystal moss]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -554,10 +555,10 @@ YESCAVERNFLAVOR[PLANT:FLOOR FUNGI]
YESCAVERNFLAVOR[WET]
YESCAVERNFLAVOR[DRY]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:1:1]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[ALL_NAMES:cave moss]
YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[NAME:glass fungus]YESCAVERNFLAVOR[NAME_PLURAL:glass fungi]YESCAVERNFLAVOR[ADJ:fungus]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -569,8 +570,9 @@ YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[NAME:cave fungus]YESCAVERNFLAVOR[NAME_PLURAL:fungi]YESCAVERNFLAVOR[ADJ:fungus]

YESCAVERNFLAVOR[PLANT:FLOOR]
YESCAVERNFLAVOR[NAME:floor tiles]YESCAVERNFLAVOR[NAME_PLURAL:floor tiles]YESCAVERNFLAVOR[ADJ:floor tiles]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -580,10 +582,9 @@ YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[WET]
YESCAVERNFLAVOR[DRY]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[UNDERGROUND_DEPTH:3:3]

YESCAVERNFLAVOR[PLANT:FLOOR]
YESCAVERNFLAVOR[PLANT:FLOOR1]
YESCAVERNFLAVOR[NAME:floor tiles]YESCAVERNFLAVOR[NAME_PLURAL:floor tiles]YESCAVERNFLAVOR[ADJ:floor tiles]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
Expand Down
Expand Up @@ -437,11 +437,6 @@ YESTREE[PLANT:CHESTNUT]
[PREFSTRING:sad appearance]
[PREFSTRING:fluffy catkins]
[WET]
[BIOME:ANY_TEMPERATE]
[BIOME:ANY_TROPICAL_FOREST]
[BIOME:GRASSLAND_TROPICAL]
[BIOME:SAVANNA_TROPICAL]
[BIOME:SHRUBLAND_TROPICAL]
[BIOME:SWAMP_TROPICAL_FRESHWATER]
[BIOME:SWAMP_TROPICAL_SALTWATER]
[BIOME:MARSH_TROPICAL_FRESHWATER]
Expand Down Expand Up @@ -661,7 +656,7 @@ YESTREE[PLANT:CHESTNUT]

[PLANT:FLOWER_ZOMBIE_R]
[NAME:zombie flower][NAME_PLURAL:zombie flower][ADJ:zombie flower]
[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE][REACTION_CLASS:CAN_MILL]
[MATERIAL_VALUE:3]
[STATE_COLOR:ALL_SOLID:GRAY]
[DISPLAY_COLOR:0:0:1]
Expand Down Expand Up @@ -693,7 +688,7 @@ YESTREE[PLANT:CHESTNUT]
[SPRING][SUMMER][AUTUMN][WINTER]
[GROWDUR:4032]

[FREQUENCY:0]
[FREQUENCY:1]
[CLUSTERSIZE:10]
[PREFSTRING:rotting smell]
[WET][DRY]
Expand Down Expand Up @@ -781,11 +776,9 @@ YESTREE[PLANT:CHESTNUT]
[EXTRACT_STORAGE:FLASK]
[PREFIX:NONE]
[EXTRACT_VIAL:LOCAL_PLANT_MAT:EXTRACT]

[SPRING][SUMMER][AUTUMN]
[GROWDUR:1008]

[LEAVES]
[LEAVES]
[FREQUENCY:25]
[CLUSTERSIZE:1]
[PREFSTRING:tiny leaves]
Expand Down Expand Up @@ -932,7 +925,7 @@ YESTREE[PLANT:CHESTNUT]
[SPRING][SUMMER][AUTUMN][WINTER]
[GROWDUR:4032]

[FREQUENCY:50]
[FREQUENCY:25]
[CLUSTERSIZE:5]
[PREFSTRING:round shape]
[WET][DRY]
Expand Down Expand Up @@ -1051,7 +1044,7 @@ YESTREE[PLANT:CHESTNUT]
[SPRING][SUMMER][AUTUMN][WINTER]
[GROWDUR:4032]

[FREQUENCY:5]
[FREQUENCY:1]
[CLUSTERSIZE:1]
[SOLID_DENSITY:1500]
[PICKED_TILE:23][DEAD_PICKED_TILE:255]
Expand Down Expand Up @@ -1949,7 +1942,7 @@ YESTREE[PLANT:CHESTNUT]
[SPRING][SUMMER][AUTUMN][WINTER]
[GROWDUR:4032]

[FREQUENCY:0]
[FREQUENCY:1]
[CLUSTERSIZE:5]
[PREFSTRING:hand shape]
[WET][DRY]
Expand Down Expand Up @@ -2520,7 +2513,7 @@ YESTREE[PLANT:CHESTNUT]
[SPRING][SUMMER][AUTUMN][WINTER]
[GROWDUR:4032]

[FREQUENCY:0]
[FREQUENCY:1]
[CLUSTERSIZE:2]
[PREFSTRING:appearance of bloated tongues]
[WET][DRY]
Expand Down Expand Up @@ -2615,8 +2608,6 @@ YESTREE[PLANT:CHESTNUT]

[SPRING][SUMMER][AUTUMN]
[GROWDUR:1008]

[WET][DRY]
[FREQUENCY:25]
[CLUSTERSIZE:5]
[PREFSTRING:stout shape]
Expand Down
Expand Up @@ -1571,7 +1571,7 @@ Squids were sponsored by the generous contributions of the Bay 12 community.

[CREATURE:GIGANTIC SQUID]
[COPY_TAGS_FROM:SQUID]
[APPLY_CREATURE_VARIATION:GIANT]
[APPLY_CREATURE_VARIATION:GIANT][FREQUENCY:75]
[CV_REMOVE_TAG:CHANGE_BODY_SIZE_PERC]
[APPLY_CURRENT_CREATURE_VARIATION]
[GO_TO_END]
Expand Down
Expand Up @@ -8431,7 +8431,7 @@ YESBATTLECRY[CAN_DO_INTERACTION:BATTLECRY_HUMAN]
[BIOME:TUNDRA]
[LARGE_ROAMING][DIFFICULTY:2][FREQUENCY:100]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-5:10]
[CLUSTER_NUMBER:3:2]
[CLUSTER_NUMBER:3:3]
[LIKES_FIGHTING]
[LARGE_PREDATOR][MEANDERER]
[CAN_LEARN][SLOW_LEARNER]
Expand Down
Expand Up @@ -990,7 +990,7 @@ creature_subterrenean



[CREATURE:CROCODILE_CAVE][TRAINABLE_WAR]
[CREATURE:CROCODILE_CAVE]
[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:(Size 600, quadruped) A huge predatory reptile with pale, colorless scales and red eyes. It lives in caves and ambushes its prey.]
[NAME:cave croc:cave crocs:cave croc]
[CASTE_NAME:cave croc:cave crocs:cave croc]
Expand Down Expand Up @@ -2604,7 +2604,7 @@ creature_subterrenean
[NATURAL]

[BIOME:SUBTERRANEAN_CHASM]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:2]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:1:2]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-3:5]
[CLUSTER_NUMBER:3:8]

Expand Down Expand Up @@ -2787,7 +2787,7 @@ creature_subterrenean
[LARGE_ROAMING]
[SPEED:1020]
[BIOME:SUBTERRANEAN_CHASM]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:3]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:3]
[FREQUENCY:100]1][DIFFICULTY:2]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
[NOPAIN][EXTRAVISION][NOBREATHE][NOSTUN][NONAUSEA][NOEMOTION]
Expand Down Expand Up @@ -2868,7 +2868,7 @@ creature_subterrenean
[LARGE_ROAMING]
[SPEED:1120]
[BIOME:SUBTERRANEAN_WATER]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:3]
[CREATURE_CLASS:UNDERGROUND_CREATURE][UNDERGROUND_DEPTH:2:3]
[FREQUENCY:100]1]
[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
[NOPAIN][EXTRAVISION][NOBREATHE][NOSTUN][NONAUSEA][NOEMOTION]
Expand Down
Expand Up @@ -16,7 +16,7 @@ YESARCHEOLOGIST[OBJECT:INORGANIC]
[ENVIRONMENT:IGNEOUS_EXTRUSIVE:CLUSTER_SMALL:15]
[MAT_FIXED_TEMP:10000]
[MELTING_POINT:9000]
[BOILING_POINT:9500]
[BOILING_POINT:9500] [SPECIAL]

// fossils for archologist, give random item
[INORGANIC:FOSSIL]
Expand All @@ -33,7 +33,7 @@ YESARCHEOLOGIST[OBJECT:INORGANIC]
[IS_GEM:relic:STP:OVERWRITE_SOLID]
[ENVIRONMENT_SPEC:RUINS:CLUSTER_ONE:100]
[ENVIRONMENT:ALL_STONE:CLUSTER_ONE:25]
[REACTION_CLASS:FOSSILS]
[REACTION_CLASS:FOSSILS] [SPECIAL]

// treasure for archologist, give, bars, coins, gems
[INORGANIC:TREASURE]
Expand Down
Expand Up @@ -239,7 +239,7 @@ YESWARP[INORGANIC:SOGGOTH]
[MATERIAL_VALUE:8]
[BOILING_POINT:0]
[SYNDROME]
[SYN_NAME:warpstone exposure]
[SYN_NAME:warpstone exposure]
[SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_IMMUNE_CREATURE:DWARF:MASON_MALE]
[SYN_IMMUNE_CREATURE:DWARF:MASON_FEMALE]
Expand Down
25 changes: 13 additions & 12 deletions MasterworkDwarfFortress/graphics/CLA/raw/objects/plant_grasses.txt
Expand Up @@ -2,8 +2,8 @@ plant_grasses

[OBJECT:PLANT]

[PLANT:MEADOW-GRASS]
[ALL_NAMES:meadow-grass]
[PLANT:GRASS1]
[ALL_NAMES:grass]
[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
[GRASS]
Expand Down Expand Up @@ -543,8 +543,9 @@ YESCAVERNFLAVOR[PLANT:CAVE MOSS]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:1:1]

YESCAVERNFLAVOR[PLANT:FLOOR FUNGI]
YESCAVERNFLAVOR[NAME:fungus]YESCAVERNFLAVOR[NAME_PLURAL:floor fungi]YESCAVERNFLAVOR[ADJ:floor fungus]

YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[ALL_NAMES:crystal moss]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -554,10 +555,10 @@ YESCAVERNFLAVOR[PLANT:FLOOR FUNGI]
YESCAVERNFLAVOR[WET]
YESCAVERNFLAVOR[DRY]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:1:1]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[ALL_NAMES:cave moss]
YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[NAME:glass fungus]YESCAVERNFLAVOR[NAME_PLURAL:glass fungi]YESCAVERNFLAVOR[ADJ:fungus]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -569,8 +570,9 @@ YESCAVERNFLAVOR[PLANT:BLUE MOSS]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[NAME:cave fungus]YESCAVERNFLAVOR[NAME_PLURAL:fungi]YESCAVERNFLAVOR[ADJ:fungus]

YESCAVERNFLAVOR[PLANT:FLOOR]
YESCAVERNFLAVOR[NAME:floor tiles]YESCAVERNFLAVOR[NAME_PLURAL:floor tiles]YESCAVERNFLAVOR[ADJ:floor tiles]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESCAVERNFLAVOR[GRASS]
Expand All @@ -580,10 +582,9 @@ YESCAVERNFLAVOR[PLANT:BLUE FUNGUS]
YESCAVERNFLAVOR[WET]
YESCAVERNFLAVOR[DRY]
YESCAVERNFLAVOR[BIOME:SUBTERRANEAN_WATER]
YESCAVERNFLAVOR[UNDERGROUND_DEPTH:2:2]

YESCAVERNFLAVOR[UNDERGROUND_DEPTH:3:3]

YESCAVERNFLAVOR[PLANT:FLOOR]
YESCAVERNFLAVOR[PLANT:FLOOR1]
YESCAVERNFLAVOR[NAME:floor tiles]YESCAVERNFLAVOR[NAME_PLURAL:floor tiles]YESCAVERNFLAVOR[ADJ:floor tiles]
YESCAVERNFLAVOR[USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESCAVERNFLAVOR[BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
Expand Down

0 comments on commit d21c328

Please sign in to comment.