From e4ea188578398b81fe9d7df06383fe3901c6ab3f Mon Sep 17 00:00:00 2001 From: xavier Date: Fri, 17 Dec 2010 15:17:58 +0000 Subject: [PATCH] last tweaks. timer doesnt always allow enough time for animation, additional OSI hue. --- Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs | 12 +++++++++--- Scripts/Items/Special/Holiday/IceyPatch.cs | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs b/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs index 77b3bbfb8..eee2bf77b 100644 --- a/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs +++ b/Scripts/Items/Special/Holiday/HolidayGiftBoxes.cs @@ -29,10 +29,11 @@ namespace Server.Items 0x851, 0x503, 0xb8c, - 0x4ab + 0x4ab, + 0x84B }; private static readonly int[] m_NeonHues = - { + { 0x438, 0x424, 0x433, @@ -71,6 +72,7 @@ namespace Server.Items int version = reader.ReadInt(); } } + public class GiftBoxCube : BaseContainer { public override int DefaultGumpID { get { return 0x11B; } } @@ -99,6 +101,7 @@ namespace Server.Items int version = reader.ReadInt(); } } + public class GiftBoxCylinder : BaseContainer { public override int DefaultGumpID { get { return 0x11C; } } @@ -127,6 +130,7 @@ namespace Server.Items int version = reader.ReadInt(); } } + public class GiftBoxOctogon : BaseContainer { public override int DefaultGumpID { get { return 0x11D; } } @@ -155,6 +159,7 @@ namespace Server.Items int version = reader.ReadInt(); } } + public class GiftBoxAngel : BaseContainer { public override int DefaultGumpID { get { return 0x11F; } } @@ -183,6 +188,7 @@ namespace Server.Items int version = reader.ReadInt(); } } + [Flipable(0x232A, 0x232B)] public class GiftBoxNeon : BaseContainer { @@ -212,4 +218,4 @@ namespace Server.Items int version = reader.ReadInt(); } } -} +} \ No newline at end of file diff --git a/Scripts/Items/Special/Holiday/IceyPatch.cs b/Scripts/Items/Special/Holiday/IceyPatch.cs index 2e51bb8b2..8123527d2 100644 --- a/Scripts/Items/Special/Holiday/IceyPatch.cs +++ b/Scripts/Items/Special/Holiday/IceyPatch.cs @@ -49,7 +49,7 @@ namespace Server.Items if (freeze) { m.Frozen = freeze; - Timer.DelayCall(TimeSpan.FromSeconds((message==1095162) ? 2.25 : 1.25), new TimerStateCallback(EndFall_Callback), m); + Timer.DelayCall(TimeSpan.FromSeconds((message==1095162) ? 2.0 : 1.25), new TimerStateCallback(EndFall_Callback), m); } m.SendLocalizedMessage(message); @@ -76,7 +76,7 @@ namespace Server.Items } if (arg != null) { - Timer.DelayCall(TimeSpan.FromSeconds(.25), new TimerStateCallback(BeginFall_Callback), arg); + Timer.DelayCall(TimeSpan.FromSeconds(.4), new TimerStateCallback(BeginFall_Callback), arg); } }