From 50ffbf0f455f1ff34e98f0bdac3b7a9bf09d9192 Mon Sep 17 00:00:00 2001 From: Mittendrein Markus Date: Sun, 14 Feb 2016 18:10:24 +0100 Subject: Colorize Scrolls with a color specific to their "magic element" --- TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c') diff --git a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c index ccd9e08..de61ef5 100644 --- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c +++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c @@ -61,7 +61,7 @@ func FxFadeOutStart(pTarget,iEffectNumber) func FxFadeOutStop(pTarget,iEffectNumber) { - SetClrModulation(RGBa(255,255,255),pTarget); + SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255)),pTarget); return(1); } @@ -71,7 +71,7 @@ func FxFadeOutTimer(pTarget,iEffectNumber) if (Contained(pTarget) || pTarget->~AvoidFadeOut()) return(-1); EffectVar(0,pTarget,iEffectNumber)--; if (!EffectVar(0,pTarget,iEffectNumber)) RemoveObject(pTarget); - SetClrModulation(RGBa(255,255,255,255-EffectVar(0,pTarget,iEffectNumber)),pTarget); + SetClrModulation(RGBpA(GetClrModulation(pTarget) || RGB(255, 255, 255), 255-EffectVar(0,pTarget,iEffectNumber)),pTarget); return(1); } -- cgit v1.2.3-54-g00ecf