diff --git a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs index 3bae4187c..5e7fc5047 100644 --- a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs +++ b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs @@ -73,12 +73,14 @@ namespace Server.Mobiles public Mobile SculptedBy { get{ return m_SculptedBy; } + set{ m_SculptedBy = value; InvalidateProperties(); } } [CommandProperty( AccessLevel.GameMaster )] public DateTime SculptedOn { get{ return m_SculptedOn; } + set{ m_SculptedOn = value; } } private CharacterStatuePlinth m_Plinth; @@ -130,8 +132,8 @@ namespace Server.Mobiles if ( m_SculptedBy != null ) { - if ( m_SculptedBy.Title != null ) - list.Add( 1076202, m_SculptedBy.Title + " " + m_SculptedBy.Name ); // Sculpted by ~1_Name~ + if ( m_SculptedBy.ShowFameTitle && ( m_SculptedBy.Player || m_SculptedBy.Body.IsHuman ) && m_SculptedBy.Fame >= 10000 ) + list.Add( 1076202, String.Format( "{0} {1}", m_SculptedBy.Female ? "Lady" : "Lord", m_SculptedBy.Name ) ); // Sculpted by ~1_Name~ else list.Add( 1076202, m_SculptedBy.Name ); // Sculpted by ~1_Name~ } @@ -284,6 +286,7 @@ namespace Server.Mobiles { Name = from.Name; BodyValue = from.BodyValue; + Female = from.Female; HairItemID = from.HairItemID; FacialHairItemID = from.FacialHairItemID; } diff --git a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs index d253cdfa2..182f45731 100644 --- a/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs +++ b/Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs @@ -113,7 +113,7 @@ namespace Server.Items AddPage( 0 ); AddImage( 0, 0, 0x24F4 ); AddHtml( 55, 50, 150, 20, statue.Name, false, false ); - AddHtml( 55, 75, 150, 20, statue.SculptedOn.ToString( "G", new CultureInfo("de-DE") ), false, false ); + AddHtml( 55, 75, 150, 20, statue.SculptedOn.ToString(), false, false ); AddHtmlLocalized( 55, 100, 150, 20, GetTypeNumber( statue.StatueType ), 0, false, false ); } diff --git a/Scripts/Mobiles/BaseCreature.cs b/Scripts/Mobiles/BaseCreature.cs index 5ca072088..442623b4b 100644 --- a/Scripts/Mobiles/BaseCreature.cs +++ b/Scripts/Mobiles/BaseCreature.cs @@ -3108,7 +3108,7 @@ namespace Server.Mobiles if ( m_AI != null ) { - if( !Core.ML || ( ct != OrderType.Follow && ct != OrderType.Stop ) ) + if( !Core.ML || ( ct != OrderType.Follow && ct != OrderType.Stop && ct != OrderType.Stay ) ) { m_AI.OnAggressiveAction( aggressor ); } @@ -3116,6 +3116,7 @@ namespace Server.Mobiles { DebugSay( "I'm being attacked but my master told me not to fight." ); Warmode = false; + Combatant = null; return; } } diff --git a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs index 125a374b4..706307d24 100644 --- a/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs +++ b/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs @@ -5,17 +5,17 @@ using Server.Gumps; namespace Server.Mobiles { - [CorpseName( "a Cu Sidhe corpse" )] + [CorpseName( "a cu sidhe corpse" )] public class CuSidhe : BaseMount { [Constructable] - public CuSidhe() : this( "a Cu Sidhe" ) + public CuSidhe() : this( "a cu sidhe" ) { } [Constructable] public CuSidhe( string name ) : base( name, 277, 0x3E91, AIType.AI_Animal, FightMode.Aggressor, 10, 1, 0.2, 0.4 ) - { + { double chance = Utility.RandomDouble() * 23301; if ( chance <= 1 ) @@ -23,12 +23,12 @@ namespace Server.Mobiles else if ( chance < 50 ) Hue = Utility.RandomList( 0x657, 0x515, 0x4B1, 0x481, 0x482, 0x455 ); else if ( chance < 500 ) - Hue = Utility.RandomList( 0x97A, 0x978, 0x901, 0x8AC, 0x5A7, 0x527 ); + Hue = Utility.RandomList( 0x97A, 0x978, 0x901, 0x8AC, 0x5A7, 0x527 ); SetStr( 1200, 1225 ); SetDex( 150, 170 ); SetInt( 250, 285 ); - + SetHits( 1010, 1275 ); SetDamage( 21, 28 ); @@ -54,18 +54,18 @@ namespace Server.Mobiles Tamable = true; ControlSlots = 4; - MinTameSkill = 101.1; + MinTameSkill = 101.1; if ( Utility.RandomDouble() < 0.2 ) PackItem( new TreasureMap( 5, Map.Trammel ) ); - //if ( Utility.RandomDouble() < 0.1 ) + //if ( Utility.RandomDouble() < 0.1 ) //PackItem( new ParrotItem() ); PackGold( 500, 800 ); // TODO 0-2 spellweaving scroll - } + } public override void GenerateLoot() { @@ -77,7 +77,7 @@ namespace Server.Mobiles if ( from.Race != Race.Elf && from == ControlMaster && from.AccessLevel == AccessLevel.Player ) { Item pads = from.FindItemOnLayer( Layer.Shoes ); - + if ( pads is PadsOfTheCuSidhe ) from.SendLocalizedMessage( 1071981 ); // Your boots allow you to mount the Cu Sidhe. else @@ -86,17 +86,17 @@ namespace Server.Mobiles return; } } - + base.OnDoubleClick( from ); } - + public override bool CanHeal{ get{ return true; } } public override bool CanHealOwner{ get{ return true; } } public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } } public override bool CanAngerOnTame{ get { return true; } } public override bool StatLossAfterTame{ get{ return true; } } - public override int Hides{ get{ return 10; } } - public override int Meat{ get{ return 3; } } + public override int Hides{ get{ return 10; } } + public override int Meat{ get{ return 3; } } public override WeaponAbility GetWeaponAbility() { @@ -111,13 +111,13 @@ namespace Server.Mobiles public override int GetAttackSound() { return 0x576; } public override int GetAngerSound() { return 0x578; } public override int GetHurtSound() { return 0x576; } - public override int GetDeathSound() { return 0x579; } + public override int GetDeathSound() { return 0x579; } public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); - writer.Write( (int) 0 ); // version + writer.Write( (int) 1 ); // version } public override void Deserialize( GenericReader reader ) @@ -125,6 +125,9 @@ namespace Server.Mobiles base.Deserialize( reader ); int version = reader.ReadInt(); + + if ( version < 1 && Name == "a Cu Sidhe" ) + Name = "a cu sidhe"; } } }