Skip to content

Commit

Permalink
Restored all tileset grasses to Masterwork 4c settings.
Browse files Browse the repository at this point in the history
See http://www.bay12forums.com/smf/index.php?topic=133174.msg4868199#msg4868199
Apparently the extra grasses are supposed to exist on a
per-tileset basis.  This commit changes them back to
as they were for the 4c release.
  • Loading branch information
pjf committed Dec 30, 2013
1 parent d3f449e commit 4c87c62
Show file tree
Hide file tree
Showing 15 changed files with 5,177 additions and 902 deletions.
543 changes: 472 additions & 71 deletions MasterworkDwarfFortress/graphics/ASCII/raw/objects/plant_grasses.txt

Large diffs are not rendered by default.

543 changes: 472 additions & 71 deletions MasterworkDwarfFortress/graphics/CLA/raw/objects/plant_grasses.txt

Large diffs are not rendered by default.

543 changes: 472 additions & 71 deletions MasterworkDwarfFortress/graphics/Ironhand/raw/objects/plant_grasses.txt

Large diffs are not rendered by default.

Large diffs are not rendered by default.

543 changes: 472 additions & 71 deletions MasterworkDwarfFortress/graphics/Jolly/raw/objects/plant_grasses.txt

Large diffs are not rendered by default.

Expand Up @@ -109,31 +109,31 @@ plant_grasses
[GRASS_COLORS:0:2:1:0:2:1:6:0:0:6:0:0]
[WET][DRY][EVIL][BIOME:ALL_MAIN]

NOSTANDARTCAVERN!PLANT:MOSS]
NOSTANDARTCAVERN!ALL_NAMES:moss]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNPLANT:MOSS]
YESSTANDARTCAVERNALL_NAMES:moss]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:3:0:1:3:0:0:3:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]

NOSTANDARTCAVERN!PLANT:FUNGI]
NOSTANDARTCAVERN!NAME:fungus]NOSTANDARTCAVERN!NAME_PLURAL:floor fungi]NOSTANDARTCAVERN!ADJ:floor fungus]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]

YESSTANDARTCAVERNPLANT:FUNGI]
YESSTANDARTCAVERNNAME:fungus]YESSTANDARTCAVERNNAME_PLURAL:floor fungi]YESSTANDARTCAVERNADJ:floor fungus]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:7:0:1:6:0:1:7:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]


YESCAVERNFLAVOR[PLANT:CAVE MOSS]
Expand Down
Expand Up @@ -109,31 +109,31 @@ plant_grasses
[GRASS_COLORS:0:2:1:0:2:1:6:0:0:6:0:0]
[WET][DRY][EVIL][BIOME:ALL_MAIN]

NOSTANDARTCAVERN!PLANT:MOSS]
NOSTANDARTCAVERN!ALL_NAMES:moss]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNPLANT:MOSS]
YESSTANDARTCAVERNALL_NAMES:moss]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:3:0:1:3:0:0:3:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]

NOSTANDARTCAVERN!PLANT:FUNGI]
NOSTANDARTCAVERN!NAME:fungus]NOSTANDARTCAVERN!NAME_PLURAL:floor fungi]NOSTANDARTCAVERN!ADJ:floor fungus]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]

YESSTANDARTCAVERNPLANT:FUNGI]
YESSTANDARTCAVERNNAME:fungus]YESSTANDARTCAVERNNAME_PLURAL:floor fungi]YESSTANDARTCAVERNADJ:floor fungus]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:7:0:1:6:0:1:7:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]


YESCAVERNFLAVOR[PLANT:CAVE MOSS]
Expand Down
Expand Up @@ -109,31 +109,31 @@ plant_grasses
[GRASS_COLORS:0:2:1:0:2:1:6:0:0:6:0:0]
[WET][DRY][EVIL][BIOME:ALL_MAIN]

NOSTANDARTCAVERN!PLANT:MOSS]
NOSTANDARTCAVERN!ALL_NAMES:moss]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNPLANT:MOSS]
YESSTANDARTCAVERNALL_NAMES:moss]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:3:0:1:3:0:0:3:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]

NOSTANDARTCAVERN!PLANT:FUNGI]
NOSTANDARTCAVERN!NAME:fungus]NOSTANDARTCAVERN!NAME_PLURAL:floor fungi]NOSTANDARTCAVERN!ADJ:floor fungus]
NOSTANDARTCAVERN!USE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
NOSTANDARTCAVERN!BASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
NOSTANDARTCAVERN!GRASS]
NOSTANDARTCAVERN!GRASS_TILES:'.':',':'`':''']
NOSTANDARTCAVERN!GRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]

YESSTANDARTCAVERNPLANT:FUNGI]
YESSTANDARTCAVERNNAME:fungus]YESSTANDARTCAVERNNAME_PLURAL:floor fungi]YESSTANDARTCAVERNADJ:floor fungus]
YESSTANDARTCAVERNUSE_MATERIAL_TEMPLATE:STRUCTURAL:STRUCTURAL_PLANT_TEMPLATE]
YESSTANDARTCAVERNBASIC_MAT:LOCAL_PLANT_MAT:STRUCTURAL]
YESSTANDARTCAVERNGRASS]
YESSTANDARTCAVERNGRASS_TILES:'.':',':'`':''']
YESSTANDARTCAVERNGRASS_COLORS:2:0:1:2:0:0:6:0:1:6:0:0]
-GRASS_COLORS:7:0:1:6:0:1:7:0:0:0:0:1-
NOSTANDARTCAVERN!WET]
NOSTANDARTCAVERN!DRY]
NOSTANDARTCAVERN!BIOME:SUBTERRANEAN_WATER]
NOSTANDARTCAVERN!UNDERGROUND_DEPTH:1:3]
YESSTANDARTCAVERNWET]
YESSTANDARTCAVERNDRY]
YESSTANDARTCAVERNBIOME:SUBTERRANEAN_WATER]
YESSTANDARTCAVERNUNDERGROUND_DEPTH:1:3]


YESCAVERNFLAVOR[PLANT:CAVE MOSS]
Expand Down

0 comments on commit 4c87c62

Please sign in to comment.