diff --git a/Effects/transition-base-grass-inverse.eff b/Effects/transition-base-grass-inverse.eff index 8a4994232..0e2005d3b 100644 --- a/Effects/transition-base-grass-inverse.eff +++ b/Effects/transition-base-grass-inverse.eff @@ -4,7 +4,7 @@ Effects/transition - Textures.high/Terrain/grass12.dds + Textures.high/Terrain/herbtundra.dds linear-mipmap-linear repeat repeat diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml index d89faeff7..03b59ef51 100644 --- a/Materials/dds/materials.xml +++ b/Materials/dds/materials.xml @@ -836,9 +836,9 @@ Sclerophyllous Heath Terrain/shrub.dds - Terrain/shrub1.dds + 2000 2000 @@ -1158,7 +1158,7 @@ Cemetery Effects/transition-base-rock Terrain/grass10c.dds - Terrain/grass10b.dds + 500 500 4000000.0 @@ -1193,8 +1193,8 @@ HerbTundra Effects/transition-base-rock Terrain/herbtundra.dds - Terrain/herbtundra2.dds - Terrain/herbtundra3.dds + 2000 2000 4000000.0 @@ -1251,7 +1251,7 @@ Greenspace Effects/transition-base-dirt Terrain/grass10b.dds - Terrain/grass10c.dds + 250 250 4000000.0 @@ -1286,12 +1286,14 @@ MixedCropPastureCover MixedCrop ComplexCrop - Terrain/mixedcrop1.dds + Terrain/countryside1.green.dds + + Terrain/countryside1.green.mask.png + 2000 2000 2000000.0 @@ -1301,7 +1303,7 @@ 0.7 1e30 - 10000.0 + 2000.0 Trees/mixed-summer.dds 8 @@ -1323,12 +1325,14 @@ Olives Vineyard Rice - Terrain/irrcrop1.dds + Terrain/irrcrop.dds + + Terrain/irrcrop-dds.mask.png + 2000 2000 2000000.0 @@ -1338,7 +1342,7 @@ 0.6 1e30 - 10000.0 + 2000.0 Trees/mixed-summer.dds 8 @@ -1357,7 +1361,7 @@ DryCropPastureCover DryCrop - Terrain/countryside1.green.dds + Terrain/uk_countryside1.dds Terrain.winter/countryside1.winter.dds Terrain/countryside1.green.mask.png - Terrain/countryside2.green.mask.png + 1800 1800 1 @@ -1385,7 +1389,7 @@ 1e30 2000000.0 - 4000.0 + 2000.0 Trees/deciduous-summer.dds 8 @@ -1432,10 +1436,12 @@ CropGrassCover CropGrass Grassland - Terrain/cropgrass1.dds - Terrain/cropgrass2.dds - 1500 - 1500 + Terrain/cropgrass.dds + + Terrain/cropgrass-dds.mask.png + 1399 + 1399 2000000.0 0.93 @@ -1455,7 +1461,7 @@ 0.1 0.3 1e30 - 500000.0 + 2000.0 Trees/deciduous-summer.dds 8 @@ -1515,7 +1521,7 @@ AgroForest Effects/transition-base-dirt Terrain/cropwood.dds - Terrain/cropwood.mask.png + Terrain/cropwood-dds.mask.png 1500 1500 2000000.0 @@ -1524,7 +1530,7 @@ 0.6 0.7 10 - 4000.0 + 2000.0 Trees/mixed-summer.dds 8 diff --git a/Textures/Terrain/crop.dds b/Textures/Terrain/crop.dds deleted file mode 100644 index 48a5d29d4..000000000 Binary files a/Textures/Terrain/crop.dds and /dev/null differ diff --git a/Textures/Terrain/cropgrass-dds.mask.png b/Textures/Terrain/cropgrass-dds.mask.png new file mode 100644 index 000000000..638bd4752 Binary files /dev/null and b/Textures/Terrain/cropgrass-dds.mask.png differ diff --git a/Textures/Terrain/cropgrass.dds b/Textures/Terrain/cropgrass.dds deleted file mode 100644 index 9af3296b3..000000000 Binary files a/Textures/Terrain/cropgrass.dds and /dev/null differ diff --git a/Textures/Terrain/cropwood-dds.mask.png b/Textures/Terrain/cropwood-dds.mask.png new file mode 100644 index 000000000..b357d3c56 Binary files /dev/null and b/Textures/Terrain/cropwood-dds.mask.png differ diff --git a/Textures/Terrain/forest.dds b/Textures/Terrain/forest.dds deleted file mode 100644 index 92a223239..000000000 Binary files a/Textures/Terrain/forest.dds and /dev/null differ diff --git a/Textures/Terrain/irrcrop-dds.mask.png b/Textures/Terrain/irrcrop-dds.mask.png new file mode 100644 index 000000000..e16cce5ac Binary files /dev/null and b/Textures/Terrain/irrcrop-dds.mask.png differ