From 56894f811abc7ed70a06692565b519fc42d5f10c Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Dec 2013 22:27:20 +1300
Subject: [PATCH 1/5] Use effect palette for crates. Fixes #4316.

---
 mods/cnc/rules/system.yaml | 1 +
 mods/d2k/rules/system.yaml | 1 +
 mods/ra/rules/system.yaml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index bed2ed3d04..c28c2f1741 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -407,6 +407,7 @@ CRATE:
 		NoBaseSelectionShares: 120
 		Unit: mcv
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	BodyOrientation:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 47ed6ec808..c529eb38ff 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -562,6 +562,7 @@ CRATE:
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
 	ProximityCaptor:
 		Types:Crate
diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index 829c741e2b..4460ff97a9 100644
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -809,6 +809,7 @@ CRATE:
 		SelectionShares: 3
 		Unit: 4tnk
 	RenderSprites:
+		Palette: effect
 	WithCrateBody:
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	ProximityCaptor:

From 1b41848623da3210702b652d9be8e92b3a784c71 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Dec 2013 22:48:09 +1300
Subject: [PATCH 2/5] Fix palette modifiers and the effect palette.

---
 mods/cnc/rules/system.yaml | 2 +-
 mods/ra/rules/system.yaml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index c28c2f1741..e385fb7e10 100644
--- a/mods/cnc/rules/system.yaml
+++ b/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
diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index 4460ff97a9..cb7a5d8611 100644
--- a/mods/ra/rules/system.yaml
+++ b/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:

From d4ab1563524c796e8d1c755745c9dffb5c8b4b79 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Dec 2013 22:55:29 +1300
Subject: [PATCH 3/5] Fix C&C crate artwork.

---
 mods/cnc/bits/crate.shp      | Bin 0 -> 625 bytes
 mods/cnc/sequences/misc.yaml |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 mods/cnc/bits/crate.shp

diff --git a/mods/cnc/bits/crate.shp b/mods/cnc/bits/crate.shp
new file mode 100644
index 0000000000000000000000000000000000000000..1bca541a373cfccc67ef90dbfad41cf22ce71948
GIT binary patch
literal 625
zcmc&v!4bkR3`@BV(FxeE8}!RmdB>7H6E<x~0z5eSz`lzeS+bHTMJ%2X*Oa!X>m|+>
zxwSua|Iq{Wv4cNAwo#=xDy7KVL<B^3Sglg`N);ig_JYG!h@(CJ@Tb8uVjecp3b^BQ
gKT!n^e(rG>tA=1;A1n1EI{bey|L$^De|y?&cOK(ScmMzZ

literal 0
HcmV?d00001

diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml
index 3821bfacd9..d520a08acb 100644
--- a/mods/cnc/sequences/misc.yaml
+++ b/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
 

From c1b894959e4baaeaee622e0b5a9cb4bdec9fca1d Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Dec 2013 23:23:17 +1300
Subject: [PATCH 4/5] Fix RA crate artwork.

---
 mods/ra/bits/scrate.shp     | Bin 163 -> 3600 bytes
 mods/ra/bits/sh-crate.shp   | Bin 161 -> 0 bytes
 mods/ra/rules/system.yaml   |   1 +
 mods/ra/sequences/misc.yaml |  16 ++++++++--------
 4 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 mods/ra/bits/sh-crate.shp

diff --git a/mods/ra/bits/scrate.shp b/mods/ra/bits/scrate.shp
index 4a63101b5645f1f8f1663695abd6e3c8ec721545..7c1ee4f4588959f6cd197a205f9287687a26806c 100644
GIT binary patch
literal 3600
zcmdT`OOD$x3>Au?MNy#WvbX3>dZ4ZXWYxeIm}M-Hl0Cc5z_awKH|ar!AL~QgK$`|d
zPzAAMQjeslXG(7!x6kzB_SLx~_YZHh|8>y*%RBAAz1RNd2kk$7<k_{&b@*4K```g`
zu*N??j8&DVkkp?}exvaoBFrT2raV>qbLV}G=WbfbVR`{i(w9aq{?8N8&nno|c{;&)
zN8WV+WQ;V<#7~f}V}QnCpX(@9yT)70@8534e=jbMx0<>SzVgNRzdw}@C9^!JR5~15
zO{LOdZsi0~Dw)}f$!^+{n)NR;ujy{Z|1VU65K8$e`3V6L05Jp>)l>u^F;^u7(PRJ>
zfLxWVvHhy#(ZyVq9v%8@hI&i`SEX?ns*wB>U`Q#ZF{OcCO7r-XAQC91WbA|=v;vF?
zX%RJk#(BppqYtHZs|JJjW?73Hi(iCSbhqN~M5R4u%nm5~$bY-hvMEx1n%!}Z(^-lS
zz2sB`WN|*ouw<RA3uW{iYki=cW3wD&#RU<`g_sYrM>3-%V0#E-;&W^qIAn=r@gD|E
zM46O|Tiwh^OhRHAM1AKc1xk%rL@FB0uEff|MWtO~lYTQIq=$J!T-GnP@)VlHV3BS4
zXE~YkSFzWP{xOyIDC3wYvN+2aT}nN$mW4<)DwHW@hWD^x4DD`{iiR>K9owsqgwV^?
zXO_E9&j6|gvY8hqj9h)j3(J@K=fY(~zWR*AMJdBUivQ=(Lrl<z#PiuwZZY(IXo!^M
z&PA0r@mF0lQsy-R8VdOq^0asr8LkO%E2;JrPlaB2%p7mO2Z4%iYa~!}*HMX1h?<)k
zgfgRDN~<&D4O|8MT;uK3eaD4j7T<ELb-zzB@0zOA9w@!5Rmlm*)EGEA!n7(4l`I^8
z|D3B*YUYyyyjCS|S4A2Gii&q{y?)IqDgLmn@e3o?XxyVDlX8tWz?HH5N>_|Bjj5#H
G+VK?>nf)FB

literal 163
zcmYL@Ar8Vo6hvoBC8DBfibJ6Y=^;1;cfcd*?yAjKT;cPxH~1A8BoqkY9Nb|;Tf>N%
z_uLqasZdY50*)i_WdBNMz>0iMura;{DLp&K&kH=WL}X4#(;Ntam}3m2+F#+d6Gqu~
tk1wnWvZ8A9eqo%G&{VgLu|#PGL1|U*TjP-v73+Ryn)<yr%Q_u~Lq8=1HsJsO

diff --git a/mods/ra/bits/sh-crate.shp b/mods/ra/bits/sh-crate.shp
deleted file mode 100644
index 913c4efc05a383ef8a46edb08776b08c329da55b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmYL@F$%&!6htR6AXtTDNu5H((hCV*z``4tzX4&{OUUQ5o#oFJ5(RBN&Eh7FQ_Re3
zhRHC?pjmPUT<3CM=x^~1kjUo<3gMNY>e*U;5_)C{$gOyd8^Afw9D?(z;|;wI!l=4o
rdVo}rm!>PmFRT@JFjN$Aop!yCD+nr5J=JYf?x#9yoA)-0mvrX`B$+eY

diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index cb7a5d8611..515a412357 100644
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -811,6 +811,7 @@ CRATE:
 	RenderSprites:
 		Palette: effect
 	WithCrateBody:
+		Images: scrate
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	ProximityCaptor:
 		Types:Crate
diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml
index 2ebc09f4b3..7cd65490c0 100644
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -219,18 +219,18 @@ fb4:
 		Start: 0
 		Length: *
 
-crate:
-	idle: scrate
+scrate:
+	idle:
 		Start: 0
 		ZOffset: -511
-	water: wwcrate
-		Start: 0
-		Length: *
+	land:
+		Start: 1
+		ZOffset: -511
+	water:
+		Start: 2
+		Length: 4
 		Tick: 500
 		ZOffset: -511
-	land: sh-crate
-		Start: 0
-		ZOffset: -511
 
 xcratea:
 	idle:

From 83bb3f97f691743e7eed8ad08d6aac3b0fe7833c Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 18 Dec 2013 22:50:56 +1300
Subject: [PATCH 5/5] Update changelog.

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9cf20b7042..9159399613 100644
--- a/CHANGELOG
+++ b/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.