Rework player palette loading.

mods/ts/mod.yaml

@@ -65,6 +65,7 @@ Rules:
 	./mods/ts/rules/misc.yaml
 	./mods/ts/rules/player.yaml
 	./mods/ts/rules/world.yaml
+	./mods/ts/rules/palettes.yaml
 	./mods/ts/rules/defaults.yaml
 	./mods/ts/rules/aircraft.yaml
 	./mods/ts/rules/civilian-infantry.yaml

mods/ts/rules/palettes.yaml

@@ -0,0 +1,95 @@
+^Palettes:
+	PaletteFromFile@mouse:
+		Name: mouse
+		Filename: mousepal.pal
+	PaletteFromFile@playersno:
+		Name: player
+		Tileset: SNOW
+		Filename: unitsno.pal
+		ShadowIndex: 1
+	PaletteFromFile@playertem:
+		Name: player
+		Tileset: TEMPERAT
+		Filename: unittem.pal
+		ShadowIndex: 1
+	PaletteFromFile@depth:
+		Name: depth
+		Filename: depth.pal
+	PaletteFromCurrentTileset:
+		Name: terrain
+		ShadowIndex: 1
+	PaletteFromFile@chrome:
+		Name: chrome
+		Filename: cameo.pal
+		AllowModifiers: false
+		ShadowIndex: 242
+	PaletteFromFile@pips:
+		Name: pips
+		Filename: palette.pal
+		AllowModifiers: false
+		ShadowIndex: 4
+	PaletteFromFile@ra:
+		Name: ra
+		Filename: palette.pal
+		ShadowIndex: 4
+	PaletteFromFile@effect:
+		Name: effect
+		Filename: anim.pal
+	PaletteFromFile@colorpicker:
+		Name: colorpicker
+		Filename: unittem.pal
+		AllowModifiers: false
+		ShadowIndex: 1
+	PaletteFromFile@alpha:
+		Name: alpha
+		Filename: alpha.pal
+	PaletteFromRGBA@shadow:
+		Name: shadow
+		R: 0
+		G: 0
+		B: 0
+		A: 140
+	PaletteFromRGBA@cloak:
+		Name: cloak
+		R: 0
+		G: 0
+		B: 0
+		A: 140
+	PaletteFromRGBA@highlight:
+		Name: highlight
+		R: 255
+		G: 255
+		B: 255
+		A: 128
+	PaletteFromRGBA@moveflash:
+		Name: moveflash
+		R: 255
+		G: 255
+		B: 255
+		A: 64
+	PaletteFromRGBA@disabled:
+		Name: disabled
+		R: 0
+		G: 0
+		B: 0
+		A: 180
+	TSShroudPalette@shroud:
+		Type: Shroud
+	VoxelNormalsPalette@normals:
+		Name: normals
+		Type: TiberianSun
+	FixedColorPalette@GreenTiberium:
+		Base: player
+		Name: greentiberium
+		Color: 64, 255, 128
+		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+	FixedColorPalette@BlueTiberium:
+		Base: player
+		Name: bluetiberium
+		Color: 160, 255, 172
+		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+	PlayerColorPalette:
+		BasePalette: player
+		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+	PlayerHighlightPalette:
+	MenuPaletteEffect:

mods/ts/rules/player.yaml

@@ -40,10 +40,6 @@ Player:
 	PlayerResources:
 	ActorGroupProxy:
 	DeveloperMode:
-	PlayerColorPalette:
-		BasePalette: player
-		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
-	PlayerHighlightPalette:
 	GpsWatcher:
 	Shroud:
 	FrozenActorLayer:

mods/ts/rules/world.yaml

@@ -1,4 +1,5 @@
 World:
+	Inherits: ^Palettes
 	ChatCommands:
 	DevCommands:
 	PlayerCommands:
@@ -6,94 +7,14 @@ World:
 	ScreenMap:
 	ActorMap:
 	LoadWidgetAtGameStart:
-	MenuPaletteEffect:
 	BuildingInfluence:
 	ProductionQueueFromSelection:
 		ProductionPaletteWidget: PRODUCTION_PALETTE
-	PaletteFromFile@mouse:
-		Name: mouse
-		Filename: mousepal.pal
-	PaletteFromFile@playersno:
-		Name: player
-		Tileset: SNOW
-		Filename: unitsno.pal
-		ShadowIndex: 1
-	PaletteFromFile@playertem:
-		Name: player
-		Tileset: TEMPERAT
-		Filename: unittem.pal
-		ShadowIndex: 1
-	PaletteFromFile@depth:
-		Name: depth
-		Filename: depth.pal
-	PaletteFromCurrentTileset:
-		Name: terrain
-		ShadowIndex: 1
-	PaletteFromFile@chrome:
-		Name: chrome
-		Filename: cameo.pal
-		AllowModifiers: false
-		ShadowIndex: 242
-	PaletteFromFile@pips:
-		Name: pips
-		Filename: palette.pal
-		AllowModifiers: false
-		ShadowIndex: 4
-	PaletteFromFile@ra:
-		Name: ra
-		Filename: palette.pal
-		ShadowIndex: 4
-	PaletteFromFile@effect:
-		Name: effect
-		Filename: anim.pal
-	PaletteFromFile@colorpicker:
-		Name: colorpicker
-		Filename: unittem.pal
-		AllowModifiers: false
-		ShadowIndex: 1
-	PaletteFromFile@alpha:
-		Name: alpha
-		Filename: alpha.pal
-	PaletteFromRGBA@shadow:
-		Name: shadow
-		R: 0
-		G: 0
-		B: 0
-		A: 140
-	PaletteFromRGBA@cloak:
-		Name: cloak
-		R: 0
-		G: 0
-		B: 0
-		A: 140
-	PaletteFromRGBA@highlight:
-		Name: highlight
-		R: 255
-		G: 255
-		B: 255
-		A: 128
-	PaletteFromRGBA@moveflash:
-		Name: moveflash
-		R: 255
-		G: 255
-		B: 255
-		A: 64
-	PaletteFromRGBA@disabled:
-		Name: disabled
-		R: 0
-		G: 0
-		B: 0
-		A: 180
-	TSShroudPalette@shroud:
-		Type: Shroud
 	ShroudRenderer:
 		Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255
 		UseExtendedIndex: true
 		ShroudPalette: shroud
 		FogPalette: shroud
-	VoxelNormalsPalette@normals:
-		Name: normals
-		Type: TiberianSun
 	Country@Random:
 		Name: Any
 		Race: Random
@@ -134,11 +55,6 @@ World:
 		Sequence: largecraters
 	ResourceLayer:
 	ResourceClaimLayer:
-	FixedColorPalette@GreenTiberium:
-		Base: player
-		Name: greentiberium
-		Color: 64, 255, 128
-		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 	ResourceType@Tiberium:
 		ResourceType: 1
 		Palette: greentiberium
@@ -151,11 +67,6 @@ World:
 		AllowedTerrainTypes: Clear, Rough, DirtRoad
 		AllowUnderActors: true
 		TerrainType: Tiberium
-	FixedColorPalette@BlueTiberium:
-		Base: player
-		Name: bluetiberium
-		Color: 160, 255, 172
-		RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 	ResourceType@BlueTiberium:
 		ResourceType: 2
 		Palette: bluetiberium