Texture changes by several people.

Cliff decals by Jorzi, sand support by Mysteryem, new rocky ground texture by MaNGusT, minor tweaks by NoQ. Cliffs should now be visible.
Warzone2100 · Jun 9, 2012 · 4a53a0e · 4a53a0e
1 parent ea7b191
commit 4a53a0e
Show file tree

Hide file tree

Showing 111 changed files with 52 additions and 21 deletions.
diff --git a/data/base/texpages/page-100-rock-earth-rockies.png b/data/base/texpages/page-100-rock-earth-rockies.png
diff --git a/data/base/texpages/page-109-sand-arizona.png b/data/base/texpages/page-109-sand-arizona.png
diff --git a/data/base/texpages/tertilesc1hw-128/tile-18.png b/data/base/texpages/tertilesc1hw-128/tile-18.png
diff --git a/data/base/texpages/tertilesc1hw-128/tile-45.png b/data/base/texpages/tertilesc1hw-128/tile-45.png
diff --git a/data/base/texpages/tertilesc1hw-128/tile-46.png b/data/base/texpages/tertilesc1hw-128/tile-46.png
diff --git a/data/base/texpages/tertilesc1hw-128/tile-71.png b/data/base/texpages/tertilesc1hw-128/tile-71.png
diff --git a/data/base/texpages/tertilesc1hw-128/tile-75.png b/data/base/texpages/tertilesc1hw-128/tile-75.png
diff --git a/data/base/texpages/tertilesc1hw-16/tile-18.png b/data/base/texpages/tertilesc1hw-16/tile-18.png
diff --git a/data/base/texpages/tertilesc1hw-16/tile-45.png b/data/base/texpages/tertilesc1hw-16/tile-45.png
diff --git a/data/base/texpages/tertilesc1hw-16/tile-46.png b/data/base/texpages/tertilesc1hw-16/tile-46.png
diff --git a/data/base/texpages/tertilesc1hw-16/tile-71.png b/data/base/texpages/tertilesc1hw-16/tile-71.png
diff --git a/data/base/texpages/tertilesc1hw-16/tile-75.png b/data/base/texpages/tertilesc1hw-16/tile-75.png
diff --git a/data/base/texpages/tertilesc1hw-32/tile-18.png b/data/base/texpages/tertilesc1hw-32/tile-18.png
diff --git a/data/base/texpages/tertilesc1hw-32/tile-45.png b/data/base/texpages/tertilesc1hw-32/tile-45.png
diff --git a/data/base/texpages/tertilesc1hw-32/tile-46.png b/data/base/texpages/tertilesc1hw-32/tile-46.png
diff --git a/data/base/texpages/tertilesc1hw-32/tile-71.png b/data/base/texpages/tertilesc1hw-32/tile-71.png
diff --git a/data/base/texpages/tertilesc1hw-32/tile-75.png b/data/base/texpages/tertilesc1hw-32/tile-75.png
diff --git a/data/base/texpages/tertilesc1hw-64/tile-18.png b/data/base/texpages/tertilesc1hw-64/tile-18.png
diff --git a/data/base/texpages/tertilesc1hw-64/tile-45.png b/data/base/texpages/tertilesc1hw-64/tile-45.png
diff --git a/data/base/texpages/tertilesc1hw-64/tile-46.png b/data/base/texpages/tertilesc1hw-64/tile-46.png
diff --git a/data/base/texpages/tertilesc1hw-64/tile-71.png b/data/base/texpages/tertilesc1hw-64/tile-71.png
diff --git a/data/base/texpages/tertilesc1hw-64/tile-75.png b/data/base/texpages/tertilesc1hw-64/tile-75.png
diff --git a/data/base/texpages/tertilesc2hw-128/tile-68.png b/data/base/texpages/tertilesc2hw-128/tile-68.png
diff --git a/data/base/texpages/tertilesc2hw-128/tile-69.png b/data/base/texpages/tertilesc2hw-128/tile-69.png
diff --git a/data/base/texpages/tertilesc2hw-128/tile-70.png b/data/base/texpages/tertilesc2hw-128/tile-70.png
diff --git a/data/base/texpages/tertilesc2hw-16/tile-68.png b/data/base/texpages/tertilesc2hw-16/tile-68.png
diff --git a/data/base/texpages/tertilesc2hw-16/tile-69.png b/data/base/texpages/tertilesc2hw-16/tile-69.png
diff --git a/data/base/texpages/tertilesc2hw-16/tile-70.png b/data/base/texpages/tertilesc2hw-16/tile-70.png
diff --git a/data/base/texpages/tertilesc2hw-32/tile-68.png b/data/base/texpages/tertilesc2hw-32/tile-68.png
diff --git a/data/base/texpages/tertilesc2hw-32/tile-69.png b/data/base/texpages/tertilesc2hw-32/tile-69.png
diff --git a/data/base/texpages/tertilesc2hw-32/tile-70.png b/data/base/texpages/tertilesc2hw-32/tile-70.png
diff --git a/data/base/texpages/tertilesc2hw-64/tile-68.png b/data/base/texpages/tertilesc2hw-64/tile-68.png
diff --git a/data/base/texpages/tertilesc2hw-64/tile-69.png b/data/base/texpages/tertilesc2hw-64/tile-69.png
diff --git a/data/base/texpages/tertilesc2hw-64/tile-70.png b/data/base/texpages/tertilesc2hw-64/tile-70.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-09.png b/data/base/texpages/tertilesc3hw-128/tile-09.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-18.png b/data/base/texpages/tertilesc3hw-128/tile-18.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-29.png b/data/base/texpages/tertilesc3hw-128/tile-29.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-30.png b/data/base/texpages/tertilesc3hw-128/tile-30.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-42.png b/data/base/texpages/tertilesc3hw-128/tile-42.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-44.png b/data/base/texpages/tertilesc3hw-128/tile-44.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-45.png b/data/base/texpages/tertilesc3hw-128/tile-45.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-46.png b/data/base/texpages/tertilesc3hw-128/tile-46.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-54.png b/data/base/texpages/tertilesc3hw-128/tile-54.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-61.png b/data/base/texpages/tertilesc3hw-128/tile-61.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-63.png b/data/base/texpages/tertilesc3hw-128/tile-63.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-68.png b/data/base/texpages/tertilesc3hw-128/tile-68.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-69.png b/data/base/texpages/tertilesc3hw-128/tile-69.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-71.png b/data/base/texpages/tertilesc3hw-128/tile-71.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-76.png b/data/base/texpages/tertilesc3hw-128/tile-76.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-77.png b/data/base/texpages/tertilesc3hw-128/tile-77.png
diff --git a/data/base/texpages/tertilesc3hw-128/tile-78.png b/data/base/texpages/tertilesc3hw-128/tile-78.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-09.png b/data/base/texpages/tertilesc3hw-16/tile-09.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-18.png b/data/base/texpages/tertilesc3hw-16/tile-18.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-29.png b/data/base/texpages/tertilesc3hw-16/tile-29.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-30.png b/data/base/texpages/tertilesc3hw-16/tile-30.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-42.png b/data/base/texpages/tertilesc3hw-16/tile-42.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-44.png b/data/base/texpages/tertilesc3hw-16/tile-44.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-45.png b/data/base/texpages/tertilesc3hw-16/tile-45.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-46.png b/data/base/texpages/tertilesc3hw-16/tile-46.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-54.png b/data/base/texpages/tertilesc3hw-16/tile-54.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-61.png b/data/base/texpages/tertilesc3hw-16/tile-61.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-63.png b/data/base/texpages/tertilesc3hw-16/tile-63.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-68.png b/data/base/texpages/tertilesc3hw-16/tile-68.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-69.png b/data/base/texpages/tertilesc3hw-16/tile-69.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-71.png b/data/base/texpages/tertilesc3hw-16/tile-71.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-76.png b/data/base/texpages/tertilesc3hw-16/tile-76.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-77.png b/data/base/texpages/tertilesc3hw-16/tile-77.png
diff --git a/data/base/texpages/tertilesc3hw-16/tile-78.png b/data/base/texpages/tertilesc3hw-16/tile-78.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-09.png b/data/base/texpages/tertilesc3hw-32/tile-09.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-18.png b/data/base/texpages/tertilesc3hw-32/tile-18.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-29.png b/data/base/texpages/tertilesc3hw-32/tile-29.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-30.png b/data/base/texpages/tertilesc3hw-32/tile-30.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-42.png b/data/base/texpages/tertilesc3hw-32/tile-42.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-44.png b/data/base/texpages/tertilesc3hw-32/tile-44.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-45.png b/data/base/texpages/tertilesc3hw-32/tile-45.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-46.png b/data/base/texpages/tertilesc3hw-32/tile-46.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-54.png b/data/base/texpages/tertilesc3hw-32/tile-54.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-61.png b/data/base/texpages/tertilesc3hw-32/tile-61.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-63.png b/data/base/texpages/tertilesc3hw-32/tile-63.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-68.png b/data/base/texpages/tertilesc3hw-32/tile-68.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-69.png b/data/base/texpages/tertilesc3hw-32/tile-69.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-71.png b/data/base/texpages/tertilesc3hw-32/tile-71.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-76.png b/data/base/texpages/tertilesc3hw-32/tile-76.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-77.png b/data/base/texpages/tertilesc3hw-32/tile-77.png
diff --git a/data/base/texpages/tertilesc3hw-32/tile-78.png b/data/base/texpages/tertilesc3hw-32/tile-78.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-09.png b/data/base/texpages/tertilesc3hw-64/tile-09.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-18.png b/data/base/texpages/tertilesc3hw-64/tile-18.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-29.png b/data/base/texpages/tertilesc3hw-64/tile-29.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-30.png b/data/base/texpages/tertilesc3hw-64/tile-30.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-42.png b/data/base/texpages/tertilesc3hw-64/tile-42.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-44.png b/data/base/texpages/tertilesc3hw-64/tile-44.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-45.png b/data/base/texpages/tertilesc3hw-64/tile-45.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-46.png b/data/base/texpages/tertilesc3hw-64/tile-46.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-54.png b/data/base/texpages/tertilesc3hw-64/tile-54.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-61.png b/data/base/texpages/tertilesc3hw-64/tile-61.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-63.png b/data/base/texpages/tertilesc3hw-64/tile-63.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-68.png b/data/base/texpages/tertilesc3hw-64/tile-68.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-69.png b/data/base/texpages/tertilesc3hw-64/tile-69.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-71.png b/data/base/texpages/tertilesc3hw-64/tile-71.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-76.png b/data/base/texpages/tertilesc3hw-64/tile-76.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-77.png b/data/base/texpages/tertilesc3hw-64/tile-77.png
diff --git a/data/base/texpages/tertilesc3hw-64/tile-78.png b/data/base/texpages/tertilesc3hw-64/tile-78.png
diff --git a/data/base/tileset/arizona_enum.txt b/data/base/tileset/arizona_enum.txt
@@ -1,8 +1,9 @@
-arizona_enum,7
+arizona_enum,8
 a_red
 a_cliff
 a_yellow
 a_concrete
 a_mud
 a_green
 a_water
+a_sand
diff --git a/data/base/tileset/arizonadecals.txt b/data/base/tileset/arizonadecals.txt
@@ -1,5 +1,8 @@
-arizona_decals,24
+arizona_decals,29
+18
 37
+45
+46
 47
 49
 50
@@ -21,5 +24,7 @@ arizona_decals,24
 68
 69
 70
+71
 72
 73
+75
diff --git a/data/base/tileset/arizonaground.txt b/data/base/tileset/arizonaground.txt
@@ -1,21 +1,21 @@
 arizona_ground,78
-a_yellow,a_yellow,a_yellow,a_yellow
-a_yellow,a_yellow,a_yellow,a_yellow
-a_yellow,a_mud,a_yellow,a_mud
-a_mud,a_mud,a_mud,a_yellow
-a_mud,a_yellow,a_yellow,a_yellow
+a_yellow,a_yellow,a_yellow,a_sand
+a_yellow,a_sand,a_sand,a_sand
+a_sand,a_mud,a_sand,a_mud
+a_mud,a_mud,a_mud,a_sand
+a_mud,a_sand,a_sand,a_sand
 a_mud,a_mud,a_mud,a_mud
 a_mud,a_mud,a_mud,a_mud
 a_mud,a_mud,a_mud,a_mud
 a_mud,a_mud,a_mud,a_mud
 a_yellow,a_yellow,a_yellow,a_yellow
+a_yellow,a_sand,a_yellow,a_sand
 a_yellow,a_yellow,a_yellow,a_yellow
-a_yellow,a_yellow,a_yellow,a_yellow
-a_yellow,a_yellow,a_yellow,a_yellow
-a_water,a_yellow,a_mud,a_yellow
-a_water,a_water,a_yellow,a_yellow
-a_yellow,a_water,a_yellow,a_yellow
-a_water,a_water,a_yellow,a_water
+a_sand,a_sand,a_sand,a_sand
+a_water,a_sand,a_mud,a_sand
+a_water,a_water,a_sand,a_sand
+a_sand,a_water,a_sand,a_sand
+a_water,a_water,a_sand,a_water
 a_water,a_water,a_water,a_water
 a_cliff,a_cliff,a_cliff,a_cliff
 a_concrete,a_concrete,a_concrete,a_red
@@ -40,9 +40,9 @@ a_red,a_red,a_red,a_red
 a_yellow,a_mud,a_yellow,a_mud
 a_mud,a_mud,a_mud,a_yellow
 a_mud,a_yellow,a_yellow,a_yellow
-a_red,a_red,a_red,a_yellow
-a_red,a_yellow,a_yellow,a_yellow
-a_red,a_yellow,a_red,a_yellow
+a_red,a_red,a_red,a_sand
+a_red,a_sand,a_sand,a_sand
+a_red,a_sand,a_red,a_sand
 a_red,a_red,a_red,a_red
 a_cliff,a_cliff,a_red,a_cliff
 a_cliff,a_cliff,a_cliff,a_cliff

diff --git a/data/base/tileset/rockiedecals.txt b/data/base/tileset/rockiedecals.txt
@@ -1,21 +1,38 @@
-rockie_decals,20
+rockie_decals,37
 01
+09
 13
+18
 27
 28
+29
+30
 37
+42
+44
+45
+46
 47
 49
 50
 51
 52
+54
 55
 56
 57
 58
 59
 60
+61
 62
+63
+68
+69
+71
 72
 74
+76
+77
+78
 79
diff --git a/data/base/tileset/tertilesc1hwGtype.txt b/data/base/tileset/tertilesc1hwGtype.txt
@@ -1,8 +1,9 @@
-tertilesc1hw,7
+tertilesc1hw,8
 a_yellow,page-82,6.4
 a_red,page-83,5.0
 a_concrete,page-84,5.0
 a_cliff,page-85,6.4
 a_water,page-86,6.4
 a_mud,page-87,3.2
 a_green,page-88,4.0
+a_sand,page-109,6.4
diff --git a/data/base/tileset/tertilesc3hwGtype.txt b/data/base/tileset/tertilesc3hwGtype.txt
@@ -1,7 +1,7 @@
 tertilesc3hw,10
 r_grass,page-99,3.0
-r_rock,page-100,3.0
-r_cliff,page-101,6.4
+r_rock,page-100,5.0
+r_cliff,page-101,9.6
 r_water,page-102,6.4
 r_tiles,page-103,5.0
 r_snowgrass,page-104,3.0

diff --git a/data/base/tileset/urbandecals.txt b/data/base/tileset/urbandecals.txt
@@ -1,4 +1,4 @@
-urban_decals,36
+urban_decals,39
 01
 02
 05
@@ -34,4 +34,7 @@ urban_decals,36
 65
 66
 67
+68
+69
+70
 80
diff --git a/data/base/wrf/vidmem.wrf b/data/base/wrf/vidmem.wrf
@@ -47,3 +47,5 @@ file		TEXPAGE	"page-85-cliff-arizona.png"
 file		TEXPAGE	"page-86-bottom-arizona.png"
 file		TEXPAGE	"page-87-mud-arizona.png"
 file		TEXPAGE	"page-88-grass-arizona.png"
+/* Added for Mysteryem's Sand Mod */
+file		TEXPAGE	"page-109-sand-arizona.png"
diff --git a/data/mp/wrf/vidmem.wrf b/data/mp/wrf/vidmem.wrf
@@ -42,3 +42,5 @@ file		TEXPAGE	"page-81-water-2.png"
 /* These are MP specific */
 file		TEXPAGE	"page-28-naval.png"
 file		TEXPAGE	"page-59-more-weapons.png"
+/* Added for Mysteryem's Sand Mod */
+file		TEXPAGE "page-109-sand-arizona.png"