Remove TileSet.Palette and PaletteFromCurrentTileset.

2018-04-08 17:27:58 +00:00
parent 7221c29d9b
commit 4f0aa89c01
22 changed files with 179 additions and 87 deletions
--- a/mods/cnc/rules/palettes.yaml
+++ b/mods/cnc/rules/palettes.yaml
@@ -1,9 +1,53 @@
 ^Palettes:
-	PaletteFromCurrentTileset@terrain:
+	PaletteFromFile@terrain-desert:
 		Name: terrain
+		Tileset: DESERT
+		Filename: desert.pal
 		ShadowIndex: 4
-	PaletteFromCurrentTileset@static:
+	PaletteFromFile@terrain-winter:
+		Name: terrain
+		Tileset: WINTER
+		Filename: winter.pal
+		ShadowIndex: 4
+	PaletteFromFile@terrain-snow:
+		Name: terrain
+		Tileset: SNOW
+		Filename: snow.pal
+		ShadowIndex: 4
+	PaletteFromFile@terrain-temperat:
+		Name: terrain
+		Tileset: TEMPERAT
+		Filename: temperat.pal
+		ShadowIndex: 4
+	PaletteFromFile@terrain-jungle:
+		Name: terrain
+		Tileset: JUNGLE
+		Filename: jungle.pal
+		ShadowIndex: 4
+	PaletteFromFile@staticterrain-desert:
 		Name: staticterrain
+		Tileset: DESERT
+		Filename: desert.pal
+		ShadowIndex: 4
+	PaletteFromFile@staticterrain-winter:
+		Name: staticterrain
+		Tileset: WINTER
+		Filename: winter.pal
+		ShadowIndex: 4
+	PaletteFromFile@staticterrain-snow:
+		Name: staticterrain
+		Tileset: SNOW
+		Filename: snow.pal
+		ShadowIndex: 4
+	PaletteFromFile@staticterrain-temperat:
+		Name: staticterrain
+		Tileset: TEMPERAT
+		Filename: temperat.pal
+		ShadowIndex: 4
+	PaletteFromFile@staticterrain-jungle:
+		Name: staticterrain
+		Tileset: JUNGLE
+		Filename: jungle.pal
 		ShadowIndex: 4
 	PaletteFromFile@chrome:
 		Name: chrome
--- a/mods/cnc/tilesets/desert.yaml
+++ b/mods/cnc/tilesets/desert.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Desert
 	Id: DESERT
-	Palette: desert.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 	HeightDebugColors: 880000

--- a/mods/cnc/tilesets/jungle.yaml
+++ b/mods/cnc/tilesets/jungle.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Jungle
 	Id: JUNGLE
-	Palette: jungle.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 	HeightDebugColors: AA0000

--- a/mods/cnc/tilesets/snow.yaml
+++ b/mods/cnc/tilesets/snow.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Snow
 	Id: SNOW
-	Palette: snow.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 	HeightDebugColors: 880000

--- a/mods/cnc/tilesets/temperat.yaml
+++ b/mods/cnc/tilesets/temperat.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Temperate
 	Id: TEMPERAT
-	Palette: temperat.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 	HeightDebugColors: AA0000

--- a/mods/cnc/tilesets/winter.yaml
+++ b/mods/cnc/tilesets/winter.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Winter
 	Id: WINTER
-	Palette: winter.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Beach, River, Bridge
 	HeightDebugColors: 880000

--- a/mods/d2k/rules/palettes.yaml
+++ b/mods/d2k/rules/palettes.yaml
@@ -1,6 +1,7 @@
 ^Palettes:
-	PaletteFromCurrentTileset:
+	PaletteFromFile:
 		Name: terrain
+		Filename: PALETTE.BIN
 	PaletteFromFile@d2k:
 		Name: d2k
 		Filename: PALETTE.BIN
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -2,7 +2,6 @@ General:
 	Name: Arrakis
 	Id: ARRAKIS
 	SheetSize: 1024
-	Palette: PALETTE.BIN
 	EditorTemplateOrder: Basic, Dune, Sand-Detail, Rock-Detail, Ice-Detail, Rock-Sand-Smooth, Sand-Sand-Cliff, Sand-Rock-Cliff, Sand-Ice-Cliff, Rock-Rock-Cliff, Rock-Sand-Cliff, Cliff-Type-Changer, Cliff-Ends, Sand-Platform, Bridge, Rotten-Base, Dead-Worm, Unidentified
 	IgnoreTileSpriteOffsets: True
 	HeightDebugColors: 880000
--- a/mods/ra/rules/palettes.yaml
+++ b/mods/ra/rules/palettes.yaml
@@ -1,11 +1,28 @@
 ^Palettes:
+	PaletteFromFile@terrain-snow:
+		Name: terrain
+		Tileset: SNOW
+		Filename: snow.pal
+		ShadowIndex: 3, 4
+	PaletteFromFile@terrain-interior:
+		Name: terrain
+		Tileset: INTERIOR
+		Filename: interior.pal
+		ShadowIndex: 3, 4
+	PaletteFromFile@terrain-temperat:
+		Name: terrain
+		Tileset: TEMPERAT
+		Filename: temperat.pal
+		ShadowIndex: 3, 4
+	PaletteFromFile@terrain-desert:
+		Name: terrain
+		Tileset: DESERT
+		Filename: desert.pal
+		ShadowIndex: 3, 4
 	PaletteFromFile@player:
 		Name: player
 		Filename: temperat.pal
 		ShadowIndex: 4
-	PaletteFromCurrentTileset:
-		Name: terrain
-		ShadowIndex: 3,4
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
--- a/mods/ra/tilesets/desert.yaml
+++ b/mods/ra/tilesets/desert.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Desert
 	Id: DESERT
-	Palette: desert.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge
 	HeightDebugColors: 880000

--- a/mods/ra/tilesets/interior.yaml
+++ b/mods/ra/tilesets/interior.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Interior
 	Id: INTERIOR
-	Palette: interior.pal
 	EditorTemplateOrder: Floor, Wall
 	HeightDebugColors: 880000

--- a/mods/ra/tilesets/snow.yaml
+++ b/mods/ra/tilesets/snow.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Snow
 	Id: SNOW
-	Palette: snow.pal
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge
 	HeightDebugColors: 880000

--- a/mods/ra/tilesets/temperat.yaml
+++ b/mods/ra/tilesets/temperat.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Temperate
 	Id: TEMPERAT
-	Palette: temperat.pal
 	SheetSize: 1024
 	EditorTemplateOrder: Terrain, Debris, Road, Cliffs, Water Cliffs, Beach, River, Bridge
 	HeightDebugColors: AA0000
--- a/mods/ts/rules/palettes.yaml
+++ b/mods/ts/rules/palettes.yaml
@@ -2,6 +2,24 @@
 	PaletteFromFile@mouse:
 		Name: mouse
 		Filename: mousepal.pal
+	PaletteFromFile@terraintem:
+		Name: terrain
+		Tileset: TEMPERATE
+		Filename: isotem.pal
+	PaletteFromFile@terrainsno:
+		Name: terrain
+		Tileset: SNOW
+		Filename: isosno.pal
+	PaletteFromFile@terraindectem:
+		Name: terraindecoration
+		Tileset: TEMPERATE
+		Filename: isotem.pal
+		ShadowIndex: 1
+	PaletteFromFile@terraindecsno:
+		Name: terraindecoration
+		Tileset: SNOW
+		Filename: isosno.pal
+		ShadowIndex: 1
 	PaletteFromFile@playersno:
 		Name: player
 		Tileset: SNOW
@@ -15,11 +33,6 @@
 	PaletteFromFile@depth:
 		Name: depth
 		Filename: depth.pal
-	PaletteFromCurrentTileset:
-		Name: terrain
-	PaletteFromCurrentTileset@decoration:
-		Name: terraindecoration
-		ShadowIndex: 1
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: cameo.pal
--- a/mods/ts/tilesets/snow.yaml
+++ b/mods/ts/tilesets/snow.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Snow
 	Id: SNOW
-	Palette: isosno.pal
 	HeightDebugColors: 00000080, 00004480, 00008880, 0000CC80, 0000FF80, 4400CC80, 88008880, CC004480, FF110080, FF550080, FF990080, FFDD0080, DDFF0080, 99FF0080, 55FF0080, 11FF0080
 	EditorTemplateOrder: Bendy Dirt Roads, Blank, Bridges, Civilian Buildings, Clear, Clear/Rough LAT, Cliff Pieces, Cliff Set, Cliff/Water pieces, Dead Oil Tanker, Destroyable Cliffs, Dirt Road Junctions, Dirt Road Slopes, DirtTrackTunnel Floor, DirtTunnel Floor, Grey/Clear LAT, House, Ice 01, Ice 02, Ice 03, Ice Flow, Ice Ramps, Ice shore, Misc Buildings, Monorail Slopes, Paved Road Ends, Paved Road Slopes, Paved Roads, Pavement, Pavement (Use for LAT), Pavement/Clear LAT, Ramp edge fixup, Rough ground, Rough lat, Ruins, Shore Pieces, Slope Set Pieces, Straight Dirt Roads, TrackTunnel Floor, TrainBridges, Tunnel Side, Tunnels, Water, Water slopes, Waterfalls, Waterfalls-B, Waterfalls-C, Waterfalls-D
 	SheetSize: 2048
--- a/mods/ts/tilesets/temperate.yaml
+++ b/mods/ts/tilesets/temperate.yaml
@@ -1,7 +1,6 @@
 General:
 	Name: Temperate
 	Id: TEMPERATE
-	Palette: isotem.pal
 	HeightDebugColors: 00000080, 00004480, 00008880, 0000CC80, 0000FF80, 4400CC80, 88008880, CC004480, FF110080, FF550080, FF990080, FFDD0080, DDFF0080, 99FF0080, 55FF0080, 11FF0080
 	EditorTemplateOrder: Misc Buildings, Clear, Cliff Pieces, Ice Flow, House, Blank, Ice Ramps, Cliff Set, Civilian Buildings, Shore Pieces, Rough LAT tile, Clear/Rough LAT, Cliff/Water pieces, Bendy Dirt Roads, Dirt Road Junctions, Straight Dirt Roads, Bridges, Paved Roads, Water, Dirt Road Slopes, Slope Set Pieces, Dead Oil Tanker, Ruins, Waterfalls, Ground 01, Ground 02, Sand, Sand/Clear LAT, Rough ground, Paved Road Ends, TrainBridges, Pavement, Pavement/Clear LAT, Paved road bits, Green, Green/Clear LAT, Ramp edge fixup, Water slopes, Pavement (Use for LAT), Paved Road Slopes, Monorail Slopes, Waterfalls-B, Waterfalls-C, Waterfalls-D, Tunnel Floor, Tunnel Side, TrackTunnel Floor, Destroyable Cliffs, Water Caves, Scrin Wreckage, DirtTrackTunnel Floor, DirtTunnel Floor, Crystal LAT tile, Clear Crystal LAT, Swampy, Swampy LAT, Blue Mold, Blue Mold LAT, Crystal Cliff, Kodiak Crash
 	SheetSize: 2048