Merged 13172 into trunk

This commit is contained in:
Isaac Clerencia Perez 2006-08-21 09:26:15 +00:00
parent f3138fd0e6
commit 20c7e442d8

View File

@ -580,7 +580,7 @@
{TERRAIN_ADJACENT -140 mHhfF? N grassland}
{TERRAIN_ADJACENT_CUSTOM -150 mb& HSJpkscZ\|/wY mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -151 mb& !mbXh mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -151 mb& !mbXhCKNnoQrW mountains transition2}
{TERRAIN_ADJACENT -160 M !MX desert-mountains}
{TERRAIN_ADJACENT -170 HA kscZ\|/wY snow-hills-to-water}
@ -602,7 +602,7 @@
# These two work in conjunction with the mountain and hill transitions to create
# a smooth coastline between grassland, hills and mountains.
{TERRAIN_ADJACENT -270 ftgvX? !ftgvX?mb&hakscZ\|/wY grassland}
{TERRAIN_ADJACENT -270 ftgvX? !ftgvX?mb&hakscZ\|/wY grassland}
{TERRAIN_ADJACENT -319 ftgvX?mb&ha kscZ\|/wY grassland-to-water}
{TERRAIN_ADJACENT -280 GTL !GTLX savanna}