Permalink
Browse files

New terrain textures.

Refs #2013.
(cherry picked from commit d7dcf7c)
  • Loading branch information...
1 parent b7c9a36 commit fb18403d75395e57393cea1648ef8aba703b3bc3 @cybersphinx cybersphinx committed Oct 24, 2010
Showing with 151 additions and 106 deletions.
  1. BIN data/base/texpages/page-100-rock-earth-rockies.png
  2. BIN data/base/texpages/page-101-cliff-rockies.png
  3. BIN data/base/texpages/page-102-bottom-rockies.png
  4. BIN data/base/texpages/page-103-tiles-rockies.png
  5. BIN data/base/texpages/page-104-snowgrass-rockies.png
  6. BIN data/base/texpages/page-105-snow-rockies.png
  7. BIN data/base/texpages/page-106-snowrock-rockies.png
  8. BIN data/base/texpages/page-107-brown-earth-rockies.png
  9. BIN data/base/texpages/page-108-snowcliff-rockies.png
  10. BIN data/base/texpages/page-40-ground-plants.png
  11. BIN data/base/texpages/page-41-slightly-cracked-concrete.png
  12. BIN data/base/texpages/page-42-rock.png
  13. BIN data/base/texpages/page-43-mud.png
  14. BIN data/base/texpages/page-44-mud.png
  15. BIN data/base/texpages/page-45-yellow-sand.png
  16. BIN data/base/texpages/page-46-cliff.png
  17. BIN data/base/texpages/page-47-tiles.png
  18. BIN data/base/texpages/page-48-rubble.png
  19. BIN data/base/texpages/page-49-dirt.png
  20. BIN data/base/texpages/page-50-rocks.png
  21. BIN data/base/texpages/page-51-debris.png
  22. BIN data/base/texpages/page-52-plants-on-rock.png
  23. BIN data/base/texpages/page-53-cracked-concrete.png
  24. BIN data/base/texpages/page-54-snow-grass.png
  25. BIN data/base/texpages/page-55-grass.png
  26. BIN data/base/texpages/page-56-gravel.png
  27. BIN data/base/texpages/page-57-snow.png
  28. BIN data/base/texpages/page-58-snow-gravel.png
  29. BIN data/base/texpages/page-80-water-1.png
  30. BIN data/base/texpages/page-81-water-2.png
  31. BIN data/base/texpages/page-82-yellow-sand-arizona.png
  32. BIN data/base/texpages/page-83-red-earth-arizona.png
  33. BIN data/base/texpages/page-84-tiles-arizona.png
  34. BIN data/base/texpages/page-85-cliff-arizona.png
  35. BIN data/base/texpages/page-86-bottom-arizona.png
  36. BIN data/base/texpages/page-87-mud-arizona.png
  37. BIN data/base/texpages/page-88-grass-arizona.png
  38. BIN data/base/texpages/page-89-gray-rubble-urban.png
  39. BIN data/base/texpages/page-90-green-urban.png
  40. BIN data/base/texpages/page-91-tiles-urban.png
  41. BIN data/base/texpages/page-92-medium-tiles-urban.png
  42. BIN data/base/texpages/page-93-big-tiles-urban.png
  43. BIN data/base/texpages/page-94-cliffs-urban.png
  44. BIN data/base/texpages/page-95-brown-rocks-urban.png
  45. BIN data/base/texpages/page-96-burned-ground-urban.png
  46. BIN data/base/texpages/page-97-burned-tiles-urban.png
  47. BIN data/base/texpages/page-98-bottom-urban.png
  48. BIN data/base/texpages/page-99-grass-rockies.png
  49. +2 −2 data/base/tileset/arizonadecals.txt
  50. +1 −1 data/base/tileset/arizonaground.txt
  51. +2 −1 data/base/tileset/rockie_enum.txt
  52. +8 −1 data/base/tileset/rockiedecals.txt
  53. +14 −14 data/base/tileset/rockieground.txt
  54. +7 −7 data/base/tileset/tertilesc1hwGtype.txt
  55. +11 −9 data/base/tileset/tertilesc2hwGtype.txt
  56. +11 −10 data/base/tileset/tertilesc3hwGtype.txt
  57. +3 −1 data/base/tileset/urban_enum.txt
  58. +8 −1 data/base/tileset/urbandecals.txt
  59. +9 −9 data/base/tileset/urbanground.txt
  60. +10 −4 data/base/wrf/cam2/cam2change.wrf
  61. +10 −9 data/base/wrf/cam3/cam3change.wrf
  62. +7 −5 data/base/wrf/vidmem.wrf
  63. +10 −4 data/base/wrf/vidmem2.wrf
  64. +10 −9 data/base/wrf/vidmem3.wrf
  65. +8 −6 data/mp/wrf/vidmem.wrf
  66. +10 −4 data/mp/wrf/vidmem2.wrf
  67. +10 −9 data/mp/wrf/vidmem3.wrf
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -1,4 +1,4 @@
-arizona_decals,23
+arizona_decals,24
37
47
49
@@ -22,4 +22,4 @@ arizona_decals,23
69
70
72
-
+73
@@ -12,7 +12,7 @@ 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_yellow,a_yellow,a_yellow,a_yellow
-a_water,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
@@ -1,7 +1,8 @@
-rockie_enum,9
+rockie_enum,10
r_grass
r_rock
r_cliff
+r_snowcliff
r_snowrock
r_brown
r_water
@@ -1,14 +1,21 @@
-rockie_decals,13
+rockie_decals,20
+01
13
+27
+28
37
+47
49
50
51
52
+55
56
+57
58
59
60
62
72
+74
79
@@ -7,7 +7,7 @@ r_rock,r_rock,r_rock,r_grass
r_rock,r_rock,r_rock,r_rock
r_rock,r_rock,r_rock,r_rock
r_rock,r_rock,r_rock,r_rock
-r_rock,r_rock,r_rock,r_rock
+r_snowrock,r_snowrock,r_snowrock,r_snowrock
r_cliff,r_cliff,r_cliff,r_snowrock
r_snowrock,r_snowrock,r_snowrock,r_snowrock
r_snowrock,r_rock,r_rock,r_rock
@@ -28,7 +28,7 @@ r_snowgrass,r_grass,r_grass,r_grass
r_snowgrass,r_snowgrass,r_grass,r_grass
r_brown,r_brown,r_brown,r_brown
r_brown,r_brown,r_brown,r_brown
-r_cliff,r_cliff,r_cliff,r_cliff
+r_snowcliff,r_snowcliff,r_cliff,r_cliff
r_cliff,r_cliff,r_cliff,r_cliff
r_rock,r_rock,r_water,r_water
r_rock,r_water,r_water,r_water
@@ -41,9 +41,9 @@ r_brown,r_rock,r_brown,r_rock
r_brown,r_brown,r_brown,r_rock
r_brown,r_rock,r_rock,r_rock
r_snowrock,r_snowrock,r_snowrock,r_snowrock
-r_cliff,r_cliff,r_rock,r_cliff
-r_cliff,r_rock,r_rock,r_cliff
-r_cliff,r_cliff,r_rock,r_cliff
+r_cliff,r_snowcliff,r_rock,r_cliff
+r_snowrock,r_snowrock,r_snowrock,r_snowrock
+r_snowcliff,r_snowcliff,r_snowcliff,r_snowcliff
r_cliff,r_cliff,r_rock,r_cliff
r_cliff,r_cliff,r_cliff,r_cliff
r_grass,r_grass,r_grass,r_grass
@@ -53,29 +53,29 @@ r_brown,r_brown,r_brown,r_brown
r_brown,r_brown,r_brown,r_brown
r_brown,r_brown,r_brown,r_brown
r_brown,r_brown,r_brown,r_brown
-r_snow,r_snow,r_snow,r_rock
+r_snowcliff,r_snowcliff,r_snowcliff,r_rock
r_rock,r_rock,r_rock,r_rock
r_brown,r_brown,r_brown,r_brown
r_rock,r_rock,r_rock,r_rock
r_grass,r_grass,r_grass,r_grass
r_brown,r_brown,r_brown,r_brown
r_brown,r_brown,r_brown,r_brown
-r_cliff,r_cliff,r_cliff,r_cliff
+r_snowcliff,r_snowcliff,r_cliff,r_cliff
r_rock,r_rock,r_rock,r_rock
r_cliff,r_cliff,r_cliff,r_snow
r_snow,r_snow,r_snow,r_snow
r_snow,r_snow,r_snow,r_snowrock
r_snow,r_snowrock,r_snowrock,r_snowrock
r_snow,r_snow,r_snowrock,r_snowrock
-r_cliff,r_cliff,r_cliff,r_snow
-r_cliff,r_cliff,r_cliff,r_snow
-r_snow,r_snow,r_snow,r_snow
+r_snowcliff,r_snowcliff,r_cliff,r_cliff
+r_snowcliff,r_cliff,r_snowcliff,r_snowcliff
+r_snowrock,r_snowrock,r_snowrock,r_snowrock
r_cliff,r_cliff,r_cliff,r_snow
r_brown,r_brown,r_brown,r_brown
r_snowrock,r_snowrock,r_snowrock,r_snowrock
r_grass,r_grass,r_grass,r_grass
-r_snowrock,r_snowrock,r_snowrock,r_snowrock
-r_cliff,r_cliff,r_cliff,r_cliff
-r_cliff,r_cliff,r_cliff,r_cliff
-r_cliff,r_cliff,r_cliff,r_cliff
+r_snowrock,r_snowrock,r_rock,r_snowrock
+r_snowcliff,r_snowcliff,r_snowcliff,r_snowcliff
+r_snowcliff,r_cliff,r_cliff,r_cliff
+r_snowcliff,r_snowcliff,r_snowcliff,r_snowcliff
r_tiles,r_tiles,r_tiles,r_tiles
@@ -1,8 +1,8 @@
tertilesc1hw,7
-a_yellow,page-45,4.6
-a_red,page-44,6.2
-a_concrete,page-47,3.2
-a_cliff,page-46,5.8
-a_water,page-42,7.3
-a_mud,page-44,6.2
-a_green,page-44,6.2
+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
@@ -1,9 +1,11 @@
-tertilesc2hw,8
-u_gray,page-51,3.9
-u_green,page-52,2.6
-u_stone,page-47,3.2
-u_cliff,page-49,4.7
-u_brown,page-49,4.7
-u_blue,page-49,4.7
-u_dark,page-47,3.2
-u_water,page-49,4.7
+tertilesc2hw,10
+u_gray,page-89,3.0
+u_green,page-90,5.0
+u_stone,page-91,5.0
+u_mstone,page-92,5.0
+u_bstone,page-93,5.0
+u_cliff,page-94,5.0
+u_brown,page-95,6.0
+u_blue,page-96,4.0
+u_dark,page-97,5.0
+u_water,page-98,6.4
@@ -1,10 +1,11 @@
-tertilesc3hw,9
-r_grass,page-55,4.6
-r_rock,page-56,3.9
-r_cliff,page-46,5.8
-r_water,page-49,5.8
-r_tiles,page-47,3.2
-r_snowgrass,page-54,2.1
-r_snow,page-57,10.2
-r_snowrock,page-58,3.9
-r_brown,page-49,5.8
+tertilesc3hw,10
+r_grass,page-99,3.0
+r_rock,page-100,3.0
+r_cliff,page-101,6.4
+r_water,page-102,6.4
+r_tiles,page-103,5.0
+r_snowgrass,page-104,3.0
+r_snow,page-105,5.0
+r_snowrock,page-106,3.0
+r_brown,page-107,3.5
+r_snowcliff,page-108,6.4
@@ -1,7 +1,9 @@
-urban_enum,8
+urban_enum,10
u_blue
u_gray
u_stone
+u_mstone
+u_bstone
u_dark
u_water
u_brown
@@ -1,8 +1,15 @@
-urban_decals,29
+urban_decals,36
+01
+02
+05
11
12
+20
+21
28
+31
32
+36
40
41
42
@@ -10,15 +10,15 @@ u_gray,u_gray,u_gray,u_gray
u_gray,u_gray,u_gray,u_gray
u_gray,u_stone,u_gray,u_stone
u_gray,u_stone,u_gray,u_gray
-u_stone,u_stone,u_dark,u_stone
-u_dark,u_stone,u_dark,u_stone
+u_dark,u_dark,u_dark,u_dark
+u_dark,u_dark,u_dark,u_dark
u_stone,u_water,u_stone,u_water
u_water,u_water,u_stone,u_stone
u_stone,u_water,u_stone,u_stone
u_water,u_water,u_stone,u_water
u_water,u_water,u_water,u_water
u_dark,u_dark,u_dark,u_dark
-u_stone,u_stone,u_stone,u_stone
+u_bstone,u_bstone,u_bstone,u_bstone
u_stone,u_stone,u_stone,u_stone
u_stone,u_stone,u_stone,u_stone
u_brown,u_brown,u_brown,u_brown
@@ -39,16 +39,16 @@ u_brown,u_brown,u_brown,u_brown
u_green,u_green,u_green,u_brown
u_green,u_brown,u_brown,u_brown
u_brown,u_green,u_brown,u_green
-u_stone,u_stone,u_stone,u_stone
u_blue,u_blue,u_blue,u_blue
-u_stone,u_stone,u_stone,u_stone
+u_blue,u_blue,u_blue,u_blue
+u_blue,u_blue,u_blue,u_blue
u_gray,u_gray,u_gray,u_gray
u_gray,u_gray,u_gray,u_gray
u_green,u_green,u_green,u_green
-u_stone,u_stone,u_stone,u_stone
+u_blue,u_blue,u_blue,u_blue
u_gray,u_gray,u_gray,u_gray
u_stone,u_stone,u_stone,u_stone
-u_stone,u_stone,u_stone,u_stone
+u_blue,u_blue,u_blue,u_blue
u_green,u_green,u_green,u_green
u_stone,u_stone,u_stone,u_stone
u_stone,u_stone,u_stone,u_stone
@@ -60,7 +60,7 @@ u_blue,u_blue,u_blue,u_blue
u_gray,u_gray,u_gray,u_gray
u_stone,u_stone,u_stone,u_stone
u_brown,u_gray,u_brown,u_gray
-u_stone,u_stone,u_stone,u_stone
+u_mstone,u_mstone,u_mstone,u_mstone
u_gray,u_gray,u_gray,u_gray
u_blue,u_blue,u_blue,u_blue
u_blue,u_blue,u_blue,u_blue
@@ -73,7 +73,7 @@ u_cliff,u_cliff,u_cliff,u_cliff
u_brown,u_stone,u_brown,u_stone
u_gray,u_gray,u_gray,u_brown
u_gray,u_brown,u_brown,u_brown
-u_stone,u_stone,u_stone,u_stone
+u_mstone,u_mstone,u_mstone,u_mstone
u_brown,u_stone,u_stone,u_stone
u_brown,u_brown,u_brown,u_stone
u_gray,u_green,u_gray,u_green
@@ -14,12 +14,18 @@ file TEXPAGE "page-8-player-buildings-bases-urban.png"
file TEXPAGE "page-9-player-buildings-bases-urban.png"
/* These come from ../vidmem2.wrf */
file TEXPAGE "page-25-sky-urban.png"
-file TEXPAGE "page-47-tiles.png"
-file TEXPAGE "page-49-dirt.png"
-file TEXPAGE "page-51-debris.png"
-file TEXPAGE "page-52-plants-on-rock.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
+file TEXPAGE "page-89-gray-rubble-urban.png"
+file TEXPAGE "page-90-green-urban.png"
+file TEXPAGE "page-91-tiles-urban.png"
+file TEXPAGE "page-92-medium-tiles-urban.png"
+file TEXPAGE "page-93-big-tiles-urban.png"
+file TEXPAGE "page-94-cliffs-urban.png"
+file TEXPAGE "page-95-brown-rocks-urban.png"
+file TEXPAGE "page-96-burned-ground-urban.png"
+file TEXPAGE "page-97-burned-tiles-urban.png"
+file TEXPAGE "page-98-bottom-urban.png"
directory "stats/research/cam2"
file RESCH "research.txt"
@@ -14,17 +14,18 @@ file TEXPAGE "page-8-player-buildings-bases-rockies.png"
file TEXPAGE "page-9-player-buildings-bases-rockies.png"
/* These come from ../vidmem3.wrf */
file TEXPAGE "page-25-sky-urban.png"
-file TEXPAGE "page-42-rock.png"
-file TEXPAGE "page-46-cliff.png"
-file TEXPAGE "page-49-dirt.png"
-file TEXPAGE "page-54-snow-grass.png"
-file TEXPAGE "page-55-grass.png"
-file TEXPAGE "page-56-gravel.png"
-file TEXPAGE "page-57-snow.png"
-file TEXPAGE "page-58-snow-gravel.png"
-file TEXPAGE "page-47-tiles.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
+file TEXPAGE "page-99-grass-rockies.png"
+file TEXPAGE "page-100-rock-earth-rockies.png"
+file TEXPAGE "page-101-cliff-rockies.png"
+file TEXPAGE "page-102-bottom-rockies.png"
+file TEXPAGE "page-103-tiles-rockies.png"
+file TEXPAGE "page-104-snowgrass-rockies.png"
+file TEXPAGE "page-105-snow-rockies.png"
+file TEXPAGE "page-106-snowrock-rockies.png"
+file TEXPAGE "page-107-brown-earth-rockies.png"
+file TEXPAGE "page-108-snowcliff-rockies.png"
directory "stats/research/cam3"
file RESCH "research.txt"
@@ -43,10 +43,12 @@ file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
/* Below is terrain specific */
file TEXPAGE "page-25-sky-arizona.png"
-file TEXPAGE "page-42-rock.png"
-file TEXPAGE "page-44-mud.png"
-file TEXPAGE "page-45-yellow-sand.png"
-file TEXPAGE "page-46-cliff.png"
-file TEXPAGE "page-47-tiles.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
+file TEXPAGE "page-82-yellow-sand-arizona.png"
+file TEXPAGE "page-83-red-earth-arizona.png"
+file TEXPAGE "page-84-tiles-arizona.png"
+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"
@@ -44,9 +44,15 @@ file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
/* Below is terrain specific, see note at top! */
file TEXPAGE "page-25-sky-urban.png"
-file TEXPAGE "page-47-tiles.png"
-file TEXPAGE "page-49-dirt.png"
-file TEXPAGE "page-51-debris.png"
-file TEXPAGE "page-52-plants-on-rock.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
+file TEXPAGE "page-89-gray-rubble-urban.png"
+file TEXPAGE "page-90-green-urban.png"
+file TEXPAGE "page-91-tiles-urban.png"
+file TEXPAGE "page-92-medium-tiles-urban.png"
+file TEXPAGE "page-93-big-tiles-urban.png"
+file TEXPAGE "page-94-cliffs-urban.png"
+file TEXPAGE "page-95-brown-rocks-urban.png"
+file TEXPAGE "page-96-burned-ground-urban.png"
+file TEXPAGE "page-97-burned-tiles-urban.png"
+file TEXPAGE "page-98-bottom-urban.png"
@@ -43,15 +43,16 @@ file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
/* Below is terrain specific, see note at top! */
file TEXPAGE "page-25-sky-urban.png"
-file TEXPAGE "page-42-rock.png"
-file TEXPAGE "page-46-cliff.png"
-file TEXPAGE "page-47-tiles.png"
-file TEXPAGE "page-49-dirt.png"
-file TEXPAGE "page-54-snow-grass.png"
-file TEXPAGE "page-55-grass.png"
-file TEXPAGE "page-56-gravel.png"
-file TEXPAGE "page-57-snow.png"
-file TEXPAGE "page-58-snow-gravel.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
+file TEXPAGE "page-99-grass-rockies.png"
+file TEXPAGE "page-100-rock-earth-rockies.png"
+file TEXPAGE "page-101-cliff-rockies.png"
+file TEXPAGE "page-102-bottom-rockies.png"
+file TEXPAGE "page-103-tiles-rockies.png"
+file TEXPAGE "page-104-snowgrass-rockies.png"
+file TEXPAGE "page-105-snow-rockies.png"
+file TEXPAGE "page-106-snowrock-rockies.png"
+file TEXPAGE "page-107-brown-earth-rockies.png"
+file TEXPAGE "page-108-snowcliff-rockies.png"
Oops, something went wrong.

0 comments on commit fb18403

Please sign in to comment.