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

corrections.

Browse source
This commit is contained in:
xavier 2012-10-24 23:03:38 +00:00
parent 6446eafbf7
commit f12c345d2e
3 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs
View file

@ -24,11 +24,6 @@ namespace Server.Items
ItemID = ( Utility.RandomBool() ) ? 0x09F0 : 0x09AD; ItemID = ( Utility.RandomBool() ) ? 0x09F0 : 0x09AD;
} }
public override int ComputeItemID()
{
return base.ComputeItemID();
}
public MurkyMilk( Serial serial ) public MurkyMilk( Serial serial )
: base( serial ) : base( serial )
{ {

2
Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs
View file

@ -62,7 +62,7 @@ namespace Server.Mobiles
{ {
//PackItem( new TwilightLantern() ); OLD Halloween //PackItem( new TwilightLantern() ); OLD Halloween
switch( Utility.Random( 50 ) ) switch( Utility.Random( 5 ) )
{ {
case 0: PackItem( new PaintedEvilClownMask() ); break; case 0: PackItem( new PaintedEvilClownMask() ); break;
case 1: PackItem( new PaintedDaemonMask() ); break; case 1: PackItem( new PaintedDaemonMask() ); break;

37
Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs
View file

@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace Server.Engines.Events namespace Server.Engines.Events
{ {
public class HalloweenHauntings : Item public class HalloweenHauntings
{ {
public static Dictionary<PlayerMobile, ZombieSkeleton> ReAnimated { get { return m_ReAnimated; } set { m_ReAnimated = value; } } public static Dictionary<PlayerMobile, ZombieSkeleton> ReAnimated { get { return m_ReAnimated; } set { m_ReAnimated = value; } }
@ -41,11 +41,16 @@ namespace Server.Engines.Events
public static void Initialize() public static void Initialize()
{ {
m_TotalZombieLimit = 200;
m_DeathQueueLimit = 200;
m_QueueDelaySeconds = 2;
m_QueueClearIntervalSeconds = 1800;
DateTime today = DateTime.Now; DateTime today = DateTime.Now;
TimeSpan tick = TimeSpan.FromSeconds( m_QueueDelaySeconds ); TimeSpan tick = TimeSpan.FromSeconds( m_QueueDelaySeconds );
TimeSpan clear = TimeSpan.FromSeconds( m_QueueClearIntervalSeconds ); TimeSpan clear = TimeSpan.FromSeconds( m_QueueClearIntervalSeconds );
m_Start = new DateTime( 2011, 10, 25 ); m_Start = new DateTime( 2012, 10, 25 );
m_Finish = new DateTime( 2012, 11, 15 ); m_Finish = new DateTime( 2012, 11, 15 );
m_ReAnimated = new Dictionary<PlayerMobile, ZombieSkeleton>(); m_ReAnimated = new Dictionary<PlayerMobile, ZombieSkeleton>();
@ -59,32 +64,20 @@ namespace Server.Engines.Events
EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath ); EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath );
} }
m_TotalZombieLimit = 200;
m_DeathQueueLimit = 200;
m_QueueDelaySeconds = 2;
m_QueueClearIntervalSeconds = 1800;
}
public static void Command_Stop( Mobile mobile )
{
m_Timer.Stop();
}
public static void Command_Start( Mobile mobile )
{
m_Timer.Start();
} }
public static void EventSink_PlayerDeath( PlayerDeathEventArgs e ) public static void EventSink_PlayerDeath( PlayerDeathEventArgs e )
{ {
if( e.Mobile != null && !e.Mobile.Deleted ) /* not sure .. better safe than sorry? */ if( e.Mobile != null && !e.Mobile.Deleted ) /* not sure .. better safe than sorry? */
{ {
PlayerMobile player = e.Mobile as PlayerMobile; if( e.Mobile is PlayerMobile )
if( m_Timer.Running && !m_DeathQueue.Contains( player ) && m_DeathQueue.Count < m_DeathQueueLimit )
{ {
m_DeathQueue.Add( player ); PlayerMobile player = e.Mobile as PlayerMobile;
if( m_Timer.Running && !m_DeathQueue.Contains( player ) && m_DeathQueue.Count < m_DeathQueueLimit )
{
m_DeathQueue.Add( player );
}
} }
} }
} }
@ -231,7 +224,7 @@ namespace Server.Engines.Events
case 2: PackItem( new Torso() ); break; case 2: PackItem( new Torso() ); break;
case 3: PackItem( new Bone() ); break; case 3: PackItem( new Bone() ); break;
case 4: PackItem( new RibCage() ); break; case 4: PackItem( new RibCage() ); break;
case 5: PackItem( new PlayerBones( m_DeadPlayer.Name ) ); break; case 5: if( m_DeadPlayer != null && !m_DeadPlayer.Deleted ) { PackItem( new PlayerBones( m_DeadPlayer.Name ) ); } break;
default: break; default: break;
} }