Unhardcode terrain types. Needs a bit more work re initialization and bridges

2010-06-26 10:55:29 +12:00
parent 8fbbaddce9
commit bf6b2da1a8
31 changed files with 138 additions and 3127 deletions
--- a/mods/cnc/desert.col
+++ b/mods/cnc/desert.col
@@ -1,13 +0,0 @@
-; Minimap colors for cnc DESERT theater
-; Format: terraintype=R,G,B
-Clear=134,95,69
-Water=93,165,206
-Road=168,123,83
-Rock=116,90,63
-Tree=28,32,36
-River=111,132,139
-Rough=68,68,60
-Wall=208,192,160
-Beach=176,156,120
-Ore=161,226,28
-Special=124,124,124
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -48,8 +48,5 @@ Weapons:
 	
 Voices:
 	mods/cnc/voices.yaml:
-	
-Terrain:
-	mods/cnc/terrain.yaml

 ShellmapUid:a0e5a8a3cb4e7fb82a08e8d768c32d480f0ec152
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -54,23 +54,17 @@ World:
 		Name:Desert
 		Theater:DESERT
 		Suffix:des
-		Templates:templates.ini
-		Tileset:tileSet.til
-		MapColors:desert.col
+		Tileset:mods/cnc/tileset-des.yaml
 	Theater@WINTER:
 		Name:Winter
 		Theater:WINTER
 		Suffix:win
-		Templates:templates.ini
-		Tileset:tileSet.til
-		MapColors:winter.col
+		Tileset:mods/cnc/tileset-win.yaml
 	Theater@TEMPERAT:
 		Name:Temperate
 		Theater:TEMPERAT
 		Suffix:tem
-		Templates:templates.ini
-		Tileset:tileSet.til
-		MapColors:temperat.col
+		Tileset:mods/cnc/tileset-tem.yaml
 	PaletteFromFile@terrain_desert:
 		Name: terrain
 		Theater: desert
--- a/mods/cnc/temperat.col
+++ b/mods/cnc/temperat.col
@@ -1,13 +0,0 @@
-; Minimap colors for cnc TEMPERAT theater
-; Format: terraintype,R,G,B
-Clear=40,68,40
-Water=92,116,164
-Road=88,116,116
-Rock=68,68,60
-Tree=28,32,36
-River=92,140,180
-Rough=68,68,60
-Wall=208,192,160
-Beach=176,156,120
-Ore=161,226,28
-Special=124,124,124
--- a/mods/cnc/templates.ini
+++ b/mods/cnc/templates.ini
--- a/mods/cnc/terrain.yaml
+++ b/mods/cnc/terrain.yaml
@@ -1,38 +0,0 @@
-Clear:
-	Buildable: yes
-
-Rough:
-	Buildable: no
-
-Road:
-	Buildable: yes
-	
-Tree:
-	Buildable: no
-	AcceptSmudge: no
-
-Water:
-	Buildable: no
-	AcceptSmudge: no
-
-Rock:
-	Buildable: no
-	AcceptSmudge: no
-
-Wall:
-	Buildable: no
-
-Ore:
-	Buildable: no
-
-Beach:
-	Buildable: no
-	AcceptSmudge: no
-
-River:
-	Buildable: no
-	AcceptSmudge: no
-
-Special:
-	Buildable: no
-	AcceptSmudge: no
--- a/mods/cnc/tileSet.til
+++ b/mods/cnc/tileSet.til
@@ -1,589 +0,0 @@
-; clear ground
-DTW
-1
-00ff
-clear1
-
-; clear ground
-DTW
-1
-ffff
-clear1
-
-; clear ground
-DTW
-1
-0000
-clear1
-
-; plain water
-DTW
-1
-0001
-w1
-
-TW
-1
-0002
-w2
-
-; Coastline
-TW
-5
-0003
-sh{0}
-
-TW
-1
-0008
-sh11
-
-TW
-1
-0009
-sh12
-
-TW
-1
-000A
-sh13
-
-TW
-1
-000B
-sh14
-
-TW
-1
-000C
-sh15
-
-; Cliffs
-DTW
-38
-000D
-s{0:00}
-
-; More Coast
-TW
-1
-0033
-sh32
-
-TW
-1
-0034
-sh33
-
-
-D--
-1
-0035
-sh20
-
-D--
-1
-0036
-sh21
-
-D--
-1
-0037
-sh22
-
-D--
-1
-0038
-sh23
-
-
-; Bushes
-D--
-10
-0039
-br{0}
-
-; Bones/Wall/Mud/UFO/Rock
-DT-
-4
-0043
-p{0:00}
-
-D--
-1
-0047
-p05
-
-D--
-1
-0048
-p06
-
-DTW
-1
-0049
-p07
-
-TW
-1
-004A
-p08
-
-; Ford WU
-TW
-1
-004B
-sh16
-
-; Water
-DTW
-1
-004C
-sh17
-
-; Water
-DTW
-1
-004D
-sh18
-
-D--
-1
-004E
-sh19
-
-
-; Destroyed house
-TW
-1
-004F
-p13
-
-; Walls
-TW
-1
-0050
-p14
-
-; Snow
--W
-1
-0051
-p15
-
-; Rocks
-DTW
-2
-0052
-b{0}
-
-TW
-1
-0054
-b3
-
-D--
-1
-0055
-b4
-
-D--
-1
-0056
-b5
-
-D--
-1
-0057
-b6
-
-; More coast
-TW
-1
-0058
-sh6
-
-TW
-1
-0059
-sh7
-
-TW
-1
-005A
-sh8
-
-TW
-1
-005B
-sh9
-
-TW
-1
-005C
-sh10
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; ROADS
-
-; roads
-DTW
-43
-005d
-d{0:00}
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; RIVERS
-
-; rivers
-TW
-13
-0088
-rv{0:00}
-
-D--
-1
-0095
-rv14
-
-D--
-1
-0096
-rv15
-
-D--
-1
-0097
-rv16
-
-D--
-1
-0098
-rv17
-
-D--
-1
-0099
-rv18
-
-D--
-1
-009A
-rv19
-
-D--
-1
-009B
-rv20
-
-D--
-1
-009C
-rv21
-
-D--
-1
-009D
-rv22
-
-D--
-1
-009E
-rv23
-
-D--
-1
-009F
-rv24
-
-D--
-1
-00A0
-rv25
-
-; River Crossing
-DTW
-2
-00A1
-ford{0}
-
-; Waterfalls
-DTW
-2
-00A3
-falls{0}
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; BRIDGES
-
-; short bridge "/"
-TW
-1
-00A5
-bridge1
-
-; short bridge "/" (destroyed)
-TW
-1
-00A6
-bridge1d
-
-; short bridge "\"
-TW
-1
-00A7
-bridge2
-
-; short bridge "\" (destroyed)
-TW
-1
-00A8
-bridge2d
-
-; desert short bridge "/"
-D--
-1
-00A9
-bridge3
-
-; desert short bridge "/" (destroyed)
-D--
-1
-00AA
-bridge3d
-
-; desert short bridge "\"
-D--
-1
-00AB
-bridge4
-
-; desert short bridge "\" (destroyed)
-D--
-1
-00AC
-bridge4d
-
-; Desert coast
-D--
-1
-00AD
-sh24
-
-D--
-1
-00AE
-sh25
-
-D--
-1
-00AF
-sh26
-
-D--
-1
-00B0
-sh27
-
-D--
-1
-00B1
-sh28
-
-D--
-1
-00B2
-sh29
-
-D--
-1
-00B3
-sh30
-
-D--
-1
-00B4
-sh31
-
-; Snow
--W
-1
-00B5
-p16
-
--W
-1
-00B6
-p17
-
--W
-1
-00B7
-p18
-
--W
-1
-00B8
-p19
-
--W
-1
-00B9
-p20
-
-; More coast
-TW
-1
-00BA
-sh34
-
-TW
-1
-00BB
-sh35
-
-D--
-1
-00BC
-sh36
-
-D--
-1
-00BD
-sh37
-
-D--
-1
-00BE
-sh38
-
-D--
-1
-00BF
-sh39
-
-D--
-1
-00C0
-sh40
-
-D--
-1
-00C1
-sh41
-
-D--
-1
-00C2
-sh42
-
-D--
-1
-00C3
-sh43
-
-D--
-1
-00C4
-sh44
-
-D--
-1
-00C5
-sh45
-
-D--
-1
-00C6
-sh46
-
-D--
-1
-00C7
-sh47
-
-D--
-1
-00C8
-sh48
-
-D--
-1
-00C9
-sh49
-
-D--
-1
-00CA
-sh50
-
-D--
-1
-00CB
-sh51
-
-D--
-1
-00CC
-sh52
-
-D--
-1
-00CD
-sh53
-
-D--
-1
-00CE
-sh54
-
-D--
-1
-00CF
-sh55
-
-D--
-1
-00D0
-sh56
-
-D--
-1
-00D1
-sh57
-
-D--
-1
-00D2
-sh58
-
-D--
-1
-00D3
-sh59
-
-D--
-1
-00D4
-sh60
-
-D--
-1
-00D5
-sh61
-
-D--
-1
-00D6
-sh62
-
-D--
-1
-00D7
-sh63
-
-; bogus
-TS-
-1
-fffe
-bogus
--- a/mods/cnc/winter.col
+++ b/mods/cnc/winter.col
@@ -1,13 +0,0 @@
-; Minimap colors for cnc WINTER theater
-; Format: terraintype,R,G,B
-Clear=40,68,40
-Water=92,116,164
-Road=88,116,116
-Rock=68,68,60
-Tree=28,32,36
-River=92,140,180
-Rough=68,68,60
-Wall=208,192,160
-Beach=176,156,120
-Ore=161,226,28
-Special=124,124,124