Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,76 +1,67 @@
|
|||
using System;
|
||||
//using System.Collections.Generic;
|
||||
//using System.Collections.Generic;
|
||||
|
||||
namespace Server.Items.Holiday
|
||||
{
|
||||
[TypeAlias( "Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask" )]
|
||||
public class BasePaintedMask : Item
|
||||
{
|
||||
public override string DefaultName
|
||||
{
|
||||
get
|
||||
{
|
||||
if ( m_Staffer != null )
|
||||
{
|
||||
return $"{MaskName} hand painted by {m_Staffer}";
|
||||
}
|
||||
[TypeAlias("Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask")]
|
||||
public class BasePaintedMask : Item
|
||||
{
|
||||
private static string[] m_Staffers =
|
||||
{
|
||||
"Ryan",
|
||||
"Mark",
|
||||
"Krrios",
|
||||
"Zippy",
|
||||
"Athena",
|
||||
"Eos",
|
||||
"Xavier"
|
||||
};
|
||||
|
||||
return MaskName;
|
||||
}
|
||||
}
|
||||
private string m_Staffer;
|
||||
|
||||
public virtual string MaskName => "A Mask";
|
||||
public BasePaintedMask(int itemid)
|
||||
: this(m_Staffers[Utility.Random(m_Staffers.Length)], itemid)
|
||||
{
|
||||
}
|
||||
|
||||
private string m_Staffer;
|
||||
public BasePaintedMask(string staffer, int itemid)
|
||||
: base(itemid + Utility.Random(2))
|
||||
{
|
||||
m_Staffer = staffer;
|
||||
|
||||
private static string[] m_Staffers =
|
||||
{
|
||||
"Ryan",
|
||||
"Mark",
|
||||
"Krrios",
|
||||
"Zippy",
|
||||
"Athena",
|
||||
"Eos",
|
||||
"Xavier"
|
||||
};
|
||||
Utility.Intern(m_Staffer);
|
||||
}
|
||||
|
||||
public BasePaintedMask( int itemid )
|
||||
: this( m_Staffers[ Utility.Random( m_Staffers.Length ) ], itemid )
|
||||
{
|
||||
public BasePaintedMask(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
public override string DefaultName
|
||||
{
|
||||
get
|
||||
{
|
||||
if (m_Staffer != null) return $"{MaskName} hand painted by {m_Staffer}";
|
||||
|
||||
public BasePaintedMask( string staffer, int itemid )
|
||||
: base( itemid + Utility.Random( 2 ) )
|
||||
{
|
||||
m_Staffer = staffer;
|
||||
return MaskName;
|
||||
}
|
||||
}
|
||||
|
||||
Utility.Intern( m_Staffer );
|
||||
}
|
||||
public virtual string MaskName => "A Mask";
|
||||
|
||||
public BasePaintedMask( Serial serial ) : base( serial )
|
||||
{
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
}
|
||||
writer.Write(1); // version
|
||||
writer.Write(m_Staffer);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
writer.Write( ( int )1 ); // version
|
||||
writer.Write( ( string )m_Staffer );
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
|
||||
int version = reader.ReadInt();
|
||||
|
||||
if ( version == 1 )
|
||||
{
|
||||
m_Staffer = Utility.Intern( reader.ReadString() );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (version == 1) m_Staffer = Utility.Intern(reader.ReadString());
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue