From 116e29de4993c6a895f819f4f8321e8a970be0e6 Mon Sep 17 00:00:00 2001 From: xavier Date: Tue, 23 Oct 2012 00:05:47 +0000 Subject: [PATCH] Monster statue, moved halloween items to halloween items folder! --- Scripts/Items/Special/Holiday/HolidayFoods.cs | 137 +----------------- Scripts/Items/Special/MonsterStatuette.cs | 8 +- 2 files changed, 7 insertions(+), 138 deletions(-) diff --git a/Scripts/Items/Special/Holiday/HolidayFoods.cs b/Scripts/Items/Special/Holiday/HolidayFoods.cs index 783875a52..c9f02fb9c 100644 --- a/Scripts/Items/Special/Holiday/HolidayFoods.cs +++ b/Scripts/Items/Special/Holiday/HolidayFoods.cs @@ -50,6 +50,7 @@ namespace Server.Items if ( m_Eaten > 60 ) { m_Eater.Say( 1077388 + Utility.Random( 5 ) ); + /* ARRGH! My tooth hurts sooo much! * You just can't find a good Britannian dentist these days... * My teeth! @@ -132,142 +133,6 @@ namespace Server.Items } } - public class Lollipop : CandyCane - { - [Constructable] - public Lollipop() - : this( 1 ) - { - } - - [Constructable] - public Lollipop( int amount ) - : base( 0x468D + Utility.Random( 3 ) ) - { - Stackable = true; - Amount = amount; - } - - public Lollipop( Serial serial ) - : base( serial ) - { - } - - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } - - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } - - public class JellyBeans : CandyCane - { - [Constructable] - public JellyBeans() - : this( 1 ) - { - } - - [Constructable] - public JellyBeans( int amount ) - : base( 0x468C ) - { - Stackable = true; - Amount = amount; - } - - public JellyBeans( Serial serial ) - : base( serial ) - { - } - - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } - - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } - - public class NougatSwirl : CandyCane - { - [Constructable] - public NougatSwirl() - : this( 1 ) - { - } - - [Constructable] - public NougatSwirl( int amount ) - : base( 0x4690 ) - { - Stackable = true; - Amount = amount; - } - - public NougatSwirl( Serial serial ) - : base( serial ) - { - } - - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } - - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } - - public class Taffy : CandyCane - { - [Constructable] - public Taffy() - : this( 1 ) - { - } - - [Constructable] - public Taffy( int amount ) - : base( 0x469D ) - { - Stackable = true; - Amount = amount; - } - - public Taffy( Serial serial ) - : base( serial ) - { - } - - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - writer.Write( (int) 0 ); // version - } - - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - int version = reader.ReadInt(); - } - } - public class GingerBreadCookie : Food { private readonly int[] m_Messages = diff --git a/Scripts/Items/Special/MonsterStatuette.cs b/Scripts/Items/Special/MonsterStatuette.cs index 1c856c262..3bf296448 100644 --- a/Scripts/Items/Special/MonsterStatuette.cs +++ b/Scripts/Items/Special/MonsterStatuette.cs @@ -47,7 +47,8 @@ namespace Server.Items OphidianMage, DreadHorn, Minotaur, - BlackCat + BlackCat, + HalloweenGhoul } public class MonsterStatuetteInfo @@ -113,7 +114,8 @@ namespace Server.Items /* OphidianMage */ new MonsterStatuetteInfo( 1029643, 0x25ab, 639 ), /* DreadHorn */ new MonsterStatuetteInfo( 1031651, 0x2D83, 0xA8 ), /* Minotaur */ new MonsterStatuetteInfo( 1031657, 0x2D89, 0x596 ), - /* Black Cat */ new MonsterStatuetteInfo( 1096928, 0x4688, 0x69 ) + /* Black Cat */ new MonsterStatuetteInfo( 1096928, 0x4688, 0x69 ), + /* HalloweenGhoul */ new MonsterStatuetteInfo( 1076782, 0x2109, 0x482 ) }; public static MonsterStatuetteInfo GetInfo( MonsterStatuetteType type ) @@ -160,6 +162,8 @@ namespace Server.Items Hue = Utility.RandomSlimeHue(); else if( m_Type == MonsterStatuetteType.RedDeath ) Hue = 0x21; + else if( m_Type == MonsterStatuetteType.HalloweenGhoul ) + Hue = 0xF4; else Hue = 0;