This commit is contained in:
mark 2011-10-21 22:02:10 +00:00
parent b536a6b593
commit b1eced908b
2 changed files with 23 additions and 11 deletions

View file

@ -253,6 +253,7 @@ namespace Server.Mobiles
Delete();
deed.Statue = this;
deed.StatueType = m_Type;
deed.IsRewardItem = m_IsRewardItem;
if ( m_Plinth != null )
@ -410,22 +411,26 @@ namespace Server.Mobiles
public override int LabelNumber
{
get
{
{
StatueType t = m_Type;
if ( m_Statue != null )
{
switch ( m_Statue.StatueType )
{
case StatueType.Marble: return 1076189;
case StatueType.Jade: return 1076188;
case StatueType.Bronze: return 1076190;
}
t = m_Statue.StatueType;
}
return 1076173;
switch ( t )
{
case StatueType.Marble: return 1076189;
case StatueType.Jade: return 1076188;
case StatueType.Bronze: return 1076190;
default: return 1076173;
}
}
}
private CharacterStatue m_Statue;
private StatueType m_Type;
private bool m_IsRewardItem;
[CommandProperty( AccessLevel.GameMaster )]
@ -443,8 +448,9 @@ namespace Server.Mobiles
if ( m_Statue != null )
return m_Statue.StatueType;
return StatueType.Marble;
return m_Type;
}
set { m_Type = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
@ -518,7 +524,9 @@ namespace Server.Mobiles
{
base.Serialize( writer );
writer.WriteEncodedInt( (int) 0 ); // version
writer.WriteEncodedInt( (int) 1 ); // version
writer.Write( (int) m_Type );
writer.Write( (Mobile) m_Statue );
writer.Write( (bool) m_IsRewardItem );
@ -530,6 +538,10 @@ namespace Server.Mobiles
int version = reader.ReadEncodedInt();
if ( version >= 1 ) {
m_Type = (StatueType) reader.ReadInt();
}
m_Statue = reader.ReadMobile() as CharacterStatue;
m_IsRewardItem = reader.ReadBool();
}

View file

@ -141,7 +141,7 @@ namespace Server.Gumps
public override void OnResponse( NetState state, RelayInfo info )
{
if ( m_Statue == null || m_Statue.Deleted )
if ( m_Statue == null || m_Statue.Deleted || m_Maker == null || m_Maker.Deleted || !m_Maker.IsChildOf( state.Mobile.Backpack ) )
return;
bool sendGump = false;