warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Monster statue, moved halloween items to halloween items folder!

Browse source
This commit is contained in:
xavier 2012-10-23 00:05:47 +00:00
parent ec6de58cb0
commit 116e29de49
2 changed files with 7 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

137
Scripts/Items/Special/Holiday/HolidayFoods.cs
View file

@ -50,6 +50,7 @@ namespace Server.Items
if ( m_Eaten > 60 ) if ( m_Eaten > 60 )
{ {
m_Eater.Say( 1077388 + Utility.Random( 5 ) ); m_Eater.Say( 1077388 + Utility.Random( 5 ) );
/* ARRGH! My tooth hurts sooo much! /* ARRGH! My tooth hurts sooo much!
* You just can't find a good Britannian dentist these days... * You just can't find a good Britannian dentist these days...
* My teeth! * 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 public class GingerBreadCookie : Food
{ {
private readonly int[] m_Messages = private readonly int[] m_Messages =

8
Scripts/Items/Special/MonsterStatuette.cs
View file

@ -47,7 +47,8 @@ namespace Server.Items
OphidianMage, OphidianMage,
DreadHorn, DreadHorn,
Minotaur, Minotaur,
BlackCat BlackCat,
HalloweenGhoul
} }
public class MonsterStatuetteInfo public class MonsterStatuetteInfo
@ -113,7 +114,8 @@ namespace Server.Items
/* OphidianMage */ new MonsterStatuetteInfo( 1029643, 0x25ab, 639 ), /* OphidianMage */ new MonsterStatuetteInfo( 1029643, 0x25ab, 639 ),
/* DreadHorn */ new MonsterStatuetteInfo( 1031651, 0x2D83, 0xA8 ), /* DreadHorn */ new MonsterStatuetteInfo( 1031651, 0x2D83, 0xA8 ),
/* Minotaur */ new MonsterStatuetteInfo( 1031657, 0x2D89, 0x596 ), /* 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 ) public static MonsterStatuetteInfo GetInfo( MonsterStatuetteType type )
@ -160,6 +162,8 @@ namespace Server.Items
Hue = Utility.RandomSlimeHue(); Hue = Utility.RandomSlimeHue();
else if( m_Type == MonsterStatuetteType.RedDeath ) else if( m_Type == MonsterStatuetteType.RedDeath )
Hue = 0x21; Hue = 0x21;
else if( m_Type == MonsterStatuetteType.HalloweenGhoul )
Hue = 0xF4;
else else
Hue = 0; Hue = 0;