Merge pull request #4328 from pchote/crate-palette-fix

Polish crate rendering

CHANGELOG

@@ -60,6 +60,7 @@ NEW:
 		Disabled cloak/uncloak sound for camouflaged Pillbox.
 		Added two Lua-powered single player missions, ported from Red Alert's single player campaign.
 		Fixed aircraft falling down not revealing shroud.
+		Fixed floating crate artwork.
 	Tiberian Dawn:
 		C&C mod renamed to Tiberian Dawn to resolve naming ambiguities.
 		Fixed Bio Lab wrongly belonging to a hostile faction in East vs West 3.
@@ -77,6 +78,8 @@ NEW:
 		Viceroids now heal on and move faster on Tiberium.
 		Implemented the original shroud artwork.
 		Fixed helicopters falling down not revealing shroud.
+		Fixed effect (explosions, etc) saturation when the ingame menu is activated.
+		Added shadow to crate artwork.
 	Dune 2000:
 		Added buildable concrete walls.
 		Fixed some cliffs being passable.

mods/cnc/rules/system.yaml

@@ -215,6 +215,7 @@ World:
 	ScreenShaker:
 	NukePaletteEffect:
 	WaterPaletteRotation:
+		ExcludePalettes: effect
 	BuildingInfluence:
 	BridgeLayer:
 		Bridges: bridge1, bridge2, bridge3, bridge4
@@ -233,7 +234,6 @@ World:
 		Name: effect
 		Filename: temperat.pal
 		ShadowIndex: 4
-		AllowModifiers: false
 	PaletteFromFile@colorpicker:
 		Name: colorpicker
 		Filename: temperat.pal
@@ -407,6 +407,7 @@ CRATE:
 		NoBaseSelectionShares: 120
 		Unit: mcv
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	BodyOrientation:

mods/cnc/sequences/misc.yaml

@@ -163,10 +163,10 @@ allyrepair:
 		Tick: 160
 
 crate:
-	idle: wcrate
+	idle:
 		Start: 0
 		ZOffset: -511
-	land: wcrate
+	land:
 		Start: 0
 		ZOffset: -511
 

mods/d2k/rules/system.yaml

@@ -562,6 +562,7 @@ CRATE:
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
 	ProximityCaptor:
 		Types:Crate

mods/ra/rules/system.yaml

@@ -542,11 +542,11 @@ World:
 		Widget: INGAME_ROOT
 	ScreenShaker:
 	WaterPaletteRotation:
-		ExcludePalettes: player
+		ExcludePalettes: player, effect
 	ChronoshiftPaletteEffect:
 	NukePaletteEffect:
 	LightPaletteRotator:
-		ExcludePalettes: terrain
+		ExcludePalettes: terrain, effect
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
 	BridgeLayer:
@@ -809,7 +809,9 @@ CRATE:
 		SelectionShares: 3
 		Unit: 4tnk
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
+		Images: scrate
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	ProximityCaptor:
 		Types:Crate

mods/ra/sequences/misc.yaml

@@ -219,18 +219,18 @@ fb4:
 		Start: 0
 		Length: *
 
-crate:
+scrate:
-	idle: scrate
+	idle:
 		Start: 0
 		ZOffset: -511
-	water: wwcrate
+	land:
-		Start: 0
+		Start: 1
-		Length: *
+		ZOffset: -511
+	water:
+		Start: 2
+		Length: 4
 		Tick: 500
 		ZOffset: -511
-	land: sh-crate
-		Start: 0
-		ZOffset: -511
 
 xcratea:
 	idle: