Rework player palette loading.

mods/ra/mod.yaml

@@ -37,6 +37,7 @@ Rules:
 	./mods/ra/rules/misc.yaml
 	./mods/ra/rules/ai.yaml
 	./mods/ra/rules/player.yaml
+	./mods/ra/rules/palettes.yaml
 	./mods/ra/rules/world.yaml
 	./mods/ra/rules/defaults.yaml
 	./mods/ra/rules/vehicles.yaml

mods/ra/rules/palettes.yaml

@@ -0,0 +1,73 @@
+^Palettes:
+	PlayerPaletteFromCurrentTileset:
+		Name: player
+		ShadowIndex: 3,4
+	PaletteFromCurrentTileset:
+		Name: terrain
+		ShadowIndex: 3,4
+	PaletteFromFile@chrome:
+		Name: chrome
+		Filename: temperat.pal
+		ShadowIndex: 3
+		AllowModifiers: false
+	PaletteFromFile@effect:
+		Name: effect
+		Filename: temperat.pal
+		ShadowIndex: 4
+	PaletteFromFile@colorpicker:
+		Name: colorpicker
+		Filename: temperat.pal
+		ShadowIndex: 4
+		AllowModifiers: false
+	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@invuln:
+		Name: invuln
+		R: 128
+		G: 0
+		B: 0
+		A: 128
+	PaletteFromRGBA@disabled:
+		Name: disabled
+		R: 0
+		G: 0
+		B: 0
+		A: 180
+	ShroudPalette@shroud:
+		Type: Shroud
+	ShroudPalette@fog:
+		Name: fog
+		Fog: true
+	PlayerColorPalette:
+		BasePalette: player
+		RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
+	PlayerHighlightPalette:
+	MenuPaletteEffect:
+	WaterPaletteRotation:
+		ExcludePalettes: player, effect
+	LightPaletteRotator:
+		ExcludePalettes: terrain, effect
+	ChronoshiftPaletteEffect:
+	NukePaletteEffect:

mods/ra/rules/player.yaml

@@ -44,10 +44,6 @@ Player:
 	PlayerResources:
 	ActorGroupProxy:
 	DeveloperMode:
-	PlayerColorPalette:
-		BasePalette: player
-		RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
-	PlayerHighlightPalette:
 	GpsWatcher:
 	Shroud:
 	FrozenActorLayer:

mods/ra/rules/world.yaml

@@ -1,4 +1,5 @@
 World:
+	Inherits: ^Palettes
 	ChatCommands:
 	DevCommands:
 	PlayerCommands:
@@ -7,13 +8,6 @@ World:
 	ActorMap:
 	LoadWidgetAtGameStart:
 	ScreenShaker:
-	MenuPaletteEffect:
-	WaterPaletteRotation:
-		ExcludePalettes: player, effect
-	ChronoshiftPaletteEffect:
-	NukePaletteEffect:
-	LightPaletteRotator:
-		ExcludePalettes: terrain, effect
 	BuildingInfluence:
 	ProductionQueueFromSelection:
 		ProductionPaletteWidget: PRODUCTION_PALETTE
@@ -26,67 +20,6 @@ World:
 		Maximum: 3
 		SpawnInterval: 120
 		WaterChance: .2
-	PlayerPaletteFromCurrentTileset:
-		Name: player
-		ShadowIndex: 3,4
-	PaletteFromCurrentTileset:
-		Name: terrain
-		ShadowIndex: 3,4
-	PaletteFromFile@chrome:
-		Name: chrome
-		Filename: temperat.pal
-		ShadowIndex: 3
-		AllowModifiers: false
-	PaletteFromFile@effect:
-		Name: effect
-		Filename: temperat.pal
-		ShadowIndex: 4
-	PaletteFromFile@colorpicker:
-		Name: colorpicker
-		Filename: temperat.pal
-		ShadowIndex: 4
-		AllowModifiers: false
-	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@invuln:
-		Name: invuln
-		R: 128
-		G: 0
-		B: 0
-		A: 128
-	PaletteFromRGBA@disabled:
-		Name: disabled
-		R: 0
-		G: 0
-		B: 0
-		A: 180
-	ShroudPalette@shroud:
-		Type: Shroud
-	ShroudPalette@fog:
-		Name: fog
-		Fog: true
 	ShroudRenderer:
 		FogVariants: shroud
 		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