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

Pets shouldn't attack when told to 'stay' - http://jira.runuo.com/browse/RUNUO-99

Browse source 
Cu Sidhe incorrect name - http://jira.runuo.com/browse/RUNUO-98
Small CharacterStatue improvements - http://jira.runuo.com/browse/RUNUO-97
This commit is contained in:
athena 2011-11-27 03:03:18 +00:00
parent 1d2a2d7783
commit 7bd20d02cd
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs
View file

@ -73,12 +73,14 @@ namespace Server.Mobiles
public Mobile SculptedBy public Mobile SculptedBy
{ {
get{ return m_SculptedBy; } get{ return m_SculptedBy; }
set{ m_SculptedBy = value; InvalidateProperties(); }
} }
[CommandProperty( AccessLevel.GameMaster )] [CommandProperty( AccessLevel.GameMaster )]
public DateTime SculptedOn public DateTime SculptedOn
{ {
get{ return m_SculptedOn; } get{ return m_SculptedOn; }
set{ m_SculptedOn = value; }
} }
private CharacterStatuePlinth m_Plinth; private CharacterStatuePlinth m_Plinth;
@ -130,8 +132,8 @@ namespace Server.Mobiles
if ( m_SculptedBy != null ) if ( m_SculptedBy != null )
{ {
if ( m_SculptedBy.Title != null ) if ( m_SculptedBy.ShowFameTitle && ( m_SculptedBy.Player || m_SculptedBy.Body.IsHuman ) && m_SculptedBy.Fame >= 10000 )
list.Add( 1076202, m_SculptedBy.Title + " " + m_SculptedBy.Name ); // Sculpted by ~1_Name~ list.Add( 1076202, String.Format( "{0} {1}", m_SculptedBy.Female ? "Lady" : "Lord", m_SculptedBy.Name ) ); // Sculpted by ~1_Name~
else else
list.Add( 1076202, m_SculptedBy.Name ); // Sculpted by ~1_Name~ list.Add( 1076202, m_SculptedBy.Name ); // Sculpted by ~1_Name~
} }
@ -284,6 +286,7 @@ namespace Server.Mobiles
{ {
Name = from.Name; Name = from.Name;
BodyValue = from.BodyValue; BodyValue = from.BodyValue;
Female = from.Female;
HairItemID = from.HairItemID; HairItemID = from.HairItemID;
FacialHairItemID = from.FacialHairItemID; FacialHairItemID = from.FacialHairItemID;
} }

2
Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs
View file

@ -113,7 +113,7 @@ namespace Server.Items
AddPage( 0 ); AddPage( 0 );
AddImage( 0, 0, 0x24F4 ); AddImage( 0, 0, 0x24F4 );
AddHtml( 55, 50, 150, 20, statue.Name, false, false ); 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 ); AddHtmlLocalized( 55, 100, 150, 20, GetTypeNumber( statue.StatueType ), 0, false, false );
} }

3
Scripts/Mobiles/BaseCreature.cs
View file

@ -3108,7 +3108,7 @@ namespace Server.Mobiles
if ( m_AI != null ) 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 ); m_AI.OnAggressiveAction( aggressor );
} }
@ -3116,6 +3116,7 @@ namespace Server.Mobiles
{ {
DebugSay( "I'm being attacked but my master told me not to fight." ); DebugSay( "I'm being attacked but my master told me not to fight." );
Warmode = false; Warmode = false;
Combatant = null;
return; return;
} }
} }

11
Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs
View file

@ -5,11 +5,11 @@ using Server.Gumps;
namespace Server.Mobiles namespace Server.Mobiles
{ {
[CorpseName( "a Cu Sidhe corpse" )] [CorpseName( "a cu sidhe corpse" )]
public class CuSidhe : BaseMount public class CuSidhe : BaseMount
{ {
[Constructable] [Constructable]
public CuSidhe() : this( "a Cu Sidhe" ) public CuSidhe() : this( "a cu sidhe" )
{ {
} }
@ -111,13 +111,13 @@ namespace Server.Mobiles
public override int GetAttackSound() { return 0x576; } public override int GetAttackSound() { return 0x576; }
public override int GetAngerSound() { return 0x578; } public override int GetAngerSound() { return 0x578; }
public override int GetHurtSound() { return 0x576; } public override int GetHurtSound() { return 0x576; }
public override int GetDeathSound() { return 0x579; } public override int GetDeathSound() { return 0x579; }
public override void Serialize( GenericWriter writer ) public override void Serialize( GenericWriter writer )
{ {
base.Serialize( writer ); base.Serialize( writer );
writer.Write( (int) 0 ); // version writer.Write( (int) 1 ); // version
} }
public override void Deserialize( GenericReader reader ) public override void Deserialize( GenericReader reader )
@ -125,6 +125,9 @@ namespace Server.Mobiles
base.Deserialize( reader ); base.Deserialize( reader );
int version = reader.ReadInt(); int version = reader.ReadInt();
if ( version < 1 && Name == "a Cu Sidhe" )
Name = "a cu sidhe";
} }
} }
} }