From bca9a25c752c8ea9c7a4662d5146c70697f6ef36 Mon Sep 17 00:00:00 2001 From: xavier Date: Sat, 10 Nov 2012 16:31:51 +0000 Subject: [PATCH] We fly. Server time: [time --- Scripts/Commands/ShardTime.cs | 19 +++++++++++++++++++ .../Halloween/2012/Engines/PlayerZombies.cs | 12 ++++++++++-- Scripts/Items/Special/MonsterStatuette.cs | 2 ++ Scripts/Mobiles/Animals/Birds/Chicken.cs | 1 + Scripts/Mobiles/Animals/Birds/Eagle.cs | 1 + Scripts/Mobiles/Animals/Birds/Phoenix.cs | 1 + .../Mobiles/Monsters/Humanoid/Magic/Daemon.cs | 1 + .../Monsters/Humanoid/Magic/FireGargoyle.cs | 1 + .../Monsters/Humanoid/Magic/Gargoyle.cs | 2 ++ .../Humanoid/Magic/GargoyleDestroyer.cs | 1 + .../Humanoid/Magic/GargoyleEnforcer.cs | 2 ++ .../Monsters/Humanoid/Magic/IceFiend.cs | 1 + .../Mobiles/Monsters/Humanoid/Magic/Imp.cs | 1 + .../Monsters/Humanoid/Melee/Mongbat.cs | 1 + .../Monsters/ML/Misc/Magic/GreaterDragon.cs | 1 + .../Monsters/ML/Misc/Melee/Reptalon.cs | 1 + .../Monsters/ML/Twisted Weald/Swoop.cs | 1 + .../Monsters/Reptile/Magic/AncientWyrm.cs | 1 + .../Mobiles/Monsters/Reptile/Magic/Dragon.cs | 1 + .../Monsters/Reptile/Magic/ShadowWyrm.cs | 2 ++ .../Monsters/Reptile/Magic/WhiteWyrm.cs | 2 ++ .../Mobiles/Monsters/Reptile/Melee/Drake.cs | 1 + .../Mobiles/Monsters/Reptile/Melee/Harpy.cs | 1 + .../Monsters/Reptile/Melee/StoneHarpy.cs | 1 + .../Mobiles/Monsters/Reptile/Melee/Wyvern.cs | 2 ++ .../Monsters/Summons/SummonedDaemon.cs | 1 + Scripts/Mobiles/Special/LordOaks.cs | 2 +- Scripts/Mobiles/Special/Silvani.cs | 1 + 28 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 Scripts/Commands/ShardTime.cs diff --git a/Scripts/Commands/ShardTime.cs b/Scripts/Commands/ShardTime.cs new file mode 100644 index 000000000..ff70c321d --- /dev/null +++ b/Scripts/Commands/ShardTime.cs @@ -0,0 +1,19 @@ +using System; + +namespace Server.Commands +{ + public class Time + { + public static void Initialize() + { + CommandSystem.Register( "Time", AccessLevel.Player, new CommandEventHandler( Time_OnCommand ) ); + } + + [Usage( "Time" )] + [Description( "Returns the server's local time." )] + private static void Time_OnCommand( CommandEventArgs e ) + { + e.Mobile.SendMessage( DateTime.UtcNow.ToString( "MMM ddd d HH:mm yyyy" ) ); + } + } +} \ No newline at end of file diff --git a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs index ac232a4d9..83d776d14 100644 --- a/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs +++ b/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs @@ -50,7 +50,7 @@ namespace Server.Engines.Events { m_TotalZombieLimit = 200; m_DeathQueueLimit = 200; - m_QueueDelaySeconds = 2; + m_QueueDelaySeconds = 120; m_QueueClearIntervalSeconds = 1800; DateTime today = DateTime.Now; @@ -91,13 +91,18 @@ namespace Server.Engines.Events m_ReAnimated.Clear(); m_DeathQueue.Clear(); + + if( DateTime.Now <= HolidaySettings.FinishHalloween ) + { + m_ClearTimer.Stop(); + } } private static void Timer_Callback() { PlayerMobile player = null; - if( DateTime.Now < HolidaySettings.FinishHalloween ) + if( DateTime.Now <= HolidaySettings.FinishHalloween ) { for( int index = 0; m_DeathQueue.Count > 0 && index < m_DeathQueue.Count; index++ ) { @@ -132,6 +137,9 @@ namespace Server.Engines.Events else { m_Timer.Stop(); + + + } } diff --git a/Scripts/Items/Special/MonsterStatuette.cs b/Scripts/Items/Special/MonsterStatuette.cs index 3bf296448..014e4e974 100644 --- a/Scripts/Items/Special/MonsterStatuette.cs +++ b/Scripts/Items/Special/MonsterStatuette.cs @@ -197,6 +197,8 @@ namespace Server.Items Hue = Utility.RandomSlimeHue(); else if( m_Type == MonsterStatuetteType.RedDeath ) Hue = 0x21; + else if( m_Type == MonsterStatuetteType.HalloweenGhoul ) + Hue = 0xF4; } public override bool HandlesOnMovement{ get{ return m_TurnedOn && IsLockedDown; } } diff --git a/Scripts/Mobiles/Animals/Birds/Chicken.cs b/Scripts/Mobiles/Animals/Birds/Chicken.cs index a64849d98..1d43498fc 100644 --- a/Scripts/Mobiles/Animals/Birds/Chicken.cs +++ b/Scripts/Mobiles/Animals/Birds/Chicken.cs @@ -43,6 +43,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override FoodType FavoriteFood{ get{ return FoodType.GrainsAndHay; } } + public override bool CanFly { get { return true; } } public override int Feathers{ get{ return 25; } } diff --git a/Scripts/Mobiles/Animals/Birds/Eagle.cs b/Scripts/Mobiles/Animals/Birds/Eagle.cs index 20f02948d..c3d07e1de 100644 --- a/Scripts/Mobiles/Animals/Birds/Eagle.cs +++ b/Scripts/Mobiles/Animals/Birds/Eagle.cs @@ -49,6 +49,7 @@ namespace Server.Mobiles public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 36; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } + public override bool CanFly { get { return true; } } public Eagle(Serial serial) : base(serial) { diff --git a/Scripts/Mobiles/Animals/Birds/Phoenix.cs b/Scripts/Mobiles/Animals/Birds/Phoenix.cs index 80cbce407..6a42b8980 100644 --- a/Scripts/Mobiles/Animals/Birds/Phoenix.cs +++ b/Scripts/Mobiles/Animals/Birds/Phoenix.cs @@ -53,6 +53,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 36; } } + public override bool CanFly { get { return true; } } public Phoenix( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs index 6d7eae1d5..9e6593a63 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Daemon.cs @@ -61,6 +61,7 @@ namespace Server.Mobiles public override Poison PoisonImmune{ get{ return Poison.Regular; } } public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 1; } } + public override bool CanFly { get { return true; } } public Daemon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs index 516761139..dd90e864a 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/FireGargoyle.cs @@ -53,6 +53,7 @@ namespace Server.Mobiles public override bool HasBreath{ get{ return true; } } // fire breath enabled public override int TreasureMapLevel{ get{ return 1; } } public override int Meat{ get{ return 1; } } + public override bool CanFly { get { return true; } } public FireGargoyle( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs index e7e4f03af..780c72b6d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Gargoyle.cs @@ -44,6 +44,8 @@ namespace Server.Mobiles PackItem( new GargoylesPickaxe() ); } + public override bool CanFly { get { return true; } } + public override void GenerateLoot() { AddLoot( LootPack.Average ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs index eeeb0b0bb..14a187c67 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleDestroyer.cs @@ -57,6 +57,7 @@ namespace Server.Mobiles public override bool BardImmune{ get{ return !Core.AOS; } } public override int Meat{ get{ return 1; } } + public override bool CanFly { get { return true; } } public override void OnDamagedBySpell( Mobile from ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs index 2e2cb4861..94b1832da 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/GargoyleEnforcer.cs @@ -50,6 +50,8 @@ namespace Server.Mobiles PackItem( new GargoylesPickaxe() ); } + public override bool CanFly { get { return true; } } + public override void GenerateLoot() { AddLoot( LootPack.Rich ); diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs index 98a30f7c8..0a216119d 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/IceFiend.cs @@ -49,6 +49,7 @@ namespace Server.Mobiles public override int TreasureMapLevel{ get{ return 4; } } public override int Meat{ get{ return 1; } } + public override bool CanFly { get { return true; } } public IceFiend( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs index 3ae8aa2ee..bf17c2cbf 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Magic/Imp.cs @@ -59,6 +59,7 @@ namespace Server.Mobiles public override HideType HideType{ get{ return HideType.Spined; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon; } } + public override bool CanFly { get { return true; } } public Imp( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs index 1efca0eff..579529023 100644 --- a/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs +++ b/Scripts/Mobiles/Monsters/Humanoid/Melee/Mongbat.cs @@ -41,6 +41,7 @@ namespace Server.Mobiles ControlSlots = 1; MinTameSkill = -18.9; } + public override bool CanFly { get { return true; } } public override void GenerateLoot() { diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs index 8b8e2f790..26bcb15e2 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs @@ -69,6 +69,7 @@ namespace Server.Mobiles public override ScaleType ScaleType{ get{ return ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override bool CanAngerOnTame { get { return true; } } + public override bool CanFly { get { return true; } } public override WeaponAbility GetWeaponAbility() { diff --git a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs index c22fa4501..5ecd254e0 100644 --- a/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs +++ b/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs @@ -57,6 +57,7 @@ namespace Server.Mobiles public override bool CanAngerOnTame{ get { return true; } } public override bool StatLossAfterTame{ get{ return true; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } + public override bool CanFly { get { return true; } } public Reptalon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs index da298ca34..311df4b06 100644 --- a/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs +++ b/Scripts/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs @@ -109,6 +109,7 @@ namespace Server.Mobiles } } + public override bool CanFly { get { return true; } } public override bool GivesMLMinorArtifact{ get{ return true; } } public override int Feathers{ get{ return 72; } } diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs index 4d49c57d6..f02d5c668 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/AncientWyrm.cs @@ -71,6 +71,7 @@ namespace Server.Mobiles public override Poison PoisonImmune{ get{ return Poison.Regular; } } public override Poison HitPoison{ get{ return Utility.RandomBool() ? Poison.Lesser : Poison.Regular; } } public override int TreasureMapLevel{ get{ return 5; } } + public override bool CanFly { get { return true; } } public AncientWyrm( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs index 63fa113b9..193612a6a 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/Dragon.cs @@ -63,6 +63,7 @@ namespace Server.Mobiles public override ScaleType ScaleType{ get{ return ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); } } public override FoodType FavoriteFood{ get{ return FoodType.Meat; } } public override bool CanAngerOnTame { get { return true; } } + public override bool CanFly { get { return true; } } public Dragon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs index 9be1bb806..4a51106cb 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/ShadowWyrm.cs @@ -72,6 +72,8 @@ namespace Server.Mobiles public override int Scales{ get{ return 10; } } public override ScaleType ScaleType{ get{ return ScaleType.Black; } } public override HideType HideType{ get{ return HideType.Barbed; } } + public override bool CanFly { get { return true; } } + public ShadowWyrm( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs index 304d39031..9bcd1983b 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Magic/WhiteWyrm.cs @@ -63,6 +63,8 @@ namespace Server.Mobiles public override ScaleType ScaleType{ get{ return ScaleType.White; } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Gold; } } public override bool CanAngerOnTame { get { return true; } } + public override bool CanFly { get { return true; } } + public WhiteWyrm( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs index 18b1c72be..51fdc5c91 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Drake.cs @@ -62,6 +62,7 @@ namespace Server.Mobiles public override int Scales{ get{ return 2; } } public override ScaleType ScaleType{ get{ return ( Body == 60 ? ScaleType.Yellow : ScaleType.Red ); } } public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish; } } + public override bool CanFly { get { return true; } } public Drake( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs index ca06ab0aa..91b12a579 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Harpy.cs @@ -75,6 +75,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 4; } } public override MeatType MeatType{ get{ return MeatType.Bird; } } public override int Feathers{ get{ return 50; } } + public override bool CanFly { get { return true; } } public Harpy( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs index 34a8258c9..0b3c6583e 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/StoneHarpy.cs @@ -76,6 +76,7 @@ namespace Server.Mobiles public override int Meat{ get{ return 1; } } public override int Feathers{ get{ return 50; } } + public override bool CanFly { get { return true; } } public StoneHarpy( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs index 810654023..5b5a4d062 100644 --- a/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs +++ b/Scripts/Mobiles/Monsters/Reptile/Melee/Wyvern.cs @@ -59,6 +59,8 @@ namespace Server.Mobiles public override int Meat{ get{ return 10; } } public override int Hides{ get{ return 20; } } public override HideType HideType{ get{ return HideType.Horned; } } + public override bool CanFly { get { return true; } } + public override int GetAttackSound() { diff --git a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs index e5c03f50a..6f9918d2b 100644 --- a/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs +++ b/Scripts/Mobiles/Monsters/Summons/SummonedDaemon.cs @@ -44,6 +44,7 @@ namespace Server.Mobiles } public override Poison PoisonImmune{ get{ return Poison.Regular; } } // TODO: Immune to poison? + public override bool CanFly { get { return true; } } public SummonedDaemon( Serial serial ) : base( serial ) { diff --git a/Scripts/Mobiles/Special/LordOaks.cs b/Scripts/Mobiles/Special/LordOaks.cs index 0d3279b0b..a02a1fd49 100644 --- a/Scripts/Mobiles/Special/LordOaks.cs +++ b/Scripts/Mobiles/Special/LordOaks.cs @@ -70,7 +70,7 @@ namespace Server.Mobiles } public override bool AutoDispel{ get{ return true; } } - + public override bool CanFly { get { return true; } } public override bool BardImmune{ get{ return !Core.SE; } } public override bool Unprovokable{ get{ return Core.SE; } } public override bool Uncalmable{ get{ return Core.SE; } } diff --git a/Scripts/Mobiles/Special/Silvani.cs b/Scripts/Mobiles/Special/Silvani.cs index 3cc360002..d749c8a87 100644 --- a/Scripts/Mobiles/Special/Silvani.cs +++ b/Scripts/Mobiles/Special/Silvani.cs @@ -53,6 +53,7 @@ namespace Server.Mobiles get{ return OppositionGroup.FeyAndUndead; } } + public override bool CanFly { get { return true; } } public override bool Unprovokable{ get{ return true; } } public override Poison PoisonImmune{ get{ return Poison.Regular; } } public override int TreasureMapLevel{ get{ return 5; } }