Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -5,161 +5,163 @@ using Server.Network;
namespace Server.Mobiles
{
public abstract class BaseGuildmaster : BaseVendor
{
protected override List<SBInfo> SBInfos { get; } = new List<SBInfo>();
public abstract class BaseGuildmaster : BaseVendor
{
public BaseGuildmaster(string title) : base(title)
{
Title = $"the {title} {(Female ? "guildmistress" : "guildmaster")}";
}
public override bool IsActiveVendor => false;
public BaseGuildmaster(Serial serial) : base(serial)
{
}
public override bool ClickTitle => false;
protected override List<SBInfo> SBInfos{ get; } = new List<SBInfo>();
public virtual int JoinCost => 500;
public override bool IsActiveVendor => false;
public virtual TimeSpan JoinAge => TimeSpan.FromDays( 0.0 );
public virtual TimeSpan JoinGameAge => TimeSpan.FromDays( 2.0 );
public virtual TimeSpan QuitAge => TimeSpan.FromDays( 7.0 );
public virtual TimeSpan QuitGameAge => TimeSpan.FromDays( 4.0 );
public override bool ClickTitle => false;
public override void InitSBInfo()
{
}
public virtual int JoinCost => 500;
public virtual bool CheckCustomReqs( PlayerMobile pm )
{
return true;
}
public virtual TimeSpan JoinAge => TimeSpan.FromDays(0.0);
public virtual TimeSpan JoinGameAge => TimeSpan.FromDays(2.0);
public virtual TimeSpan QuitAge => TimeSpan.FromDays(7.0);
public virtual TimeSpan QuitGameAge => TimeSpan.FromDays(4.0);
public virtual void SayGuildTo( Mobile m )
{
SayTo( m, 1008055 + (int)NpcGuild );
}
public override void InitSBInfo()
{
}
public virtual void SayWelcomeTo( Mobile m )
{
SayTo( m, 1008054 ); // Welcome to the guild! Thou shalt find that fellow members shall grant thee lower prices in shops.
}
public virtual bool CheckCustomReqs(PlayerMobile pm)
{
return true;
}
public virtual void SayPriceTo( Mobile m )
{
m.Send( new MessageLocalizedAffix( Serial, Body, MessageType.Regular, SpeechHue, 3, 1008052, Name, AffixType.Append, JoinCost.ToString(), "" ) );
}
public virtual void SayGuildTo(Mobile m)
{
SayTo(m, 1008055 + (int)NpcGuild);
}
public virtual bool WasNamed( string speech )
{
string name = Name;
public virtual void SayWelcomeTo(Mobile m)
{
SayTo(m, 1008054); // Welcome to the guild! Thou shalt find that fellow members shall grant thee lower prices in shops.
}
return ( name != null && Insensitive.StartsWith( speech, name ) );
}
public virtual void SayPriceTo(Mobile m)
{
m.Send(new MessageLocalizedAffix(Serial, Body, MessageType.Regular, SpeechHue, 3, 1008052, Name,
AffixType.Append, JoinCost.ToString(), ""));
}
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( Location, 2 ) )
return true;
public virtual bool WasNamed(string speech)
{
string name = Name;
return base.HandlesOnSpeech( from );
}
return name != null && Insensitive.StartsWith(speech, name);
}
public override void OnSpeech( SpeechEventArgs e )
{
Mobile from = e.Mobile;
public override bool HandlesOnSpeech(Mobile from)
{
if (from.InRange(Location, 2))
return true;
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && WasNamed( e.Speech ) )
{
PlayerMobile pm = (PlayerMobile)from;
return base.HandlesOnSpeech(from);
}
if ( e.HasKeyword( 0x0004 ) ) // *join* | *member*
{
if ( pm.NpcGuild == NpcGuild )
SayTo( from, 501047 ); // Thou art already a member of our guild.
else if ( pm.NpcGuild != NpcGuild.None )
SayTo( from, 501046 ); // Thou must resign from thy other guild first.
else if ( pm.GameTime < JoinGameAge || (pm.CreationTime + JoinAge) > DateTime.UtcNow )
SayTo( from, 501048 ); // You are too young to join my guild...
else if ( CheckCustomReqs( pm ) )
SayPriceTo( from );
public override void OnSpeech(SpeechEventArgs e)
{
Mobile from = e.Mobile;
e.Handled = true;
}
else if ( e.HasKeyword( 0x0005 ) ) // *resign* | *quit*
{
if ( pm.NpcGuild != NpcGuild )
{
SayTo( from, 501052 ); // Thou dost not belong to my guild!
}
else if ( (pm.NpcGuildJoinTime + QuitAge) > DateTime.UtcNow || (pm.NpcGuildGameTime + QuitGameAge) > pm.GameTime )
{
SayTo( from, 501053 ); // You just joined my guild! You must wait a week to resign.
}
else
{
SayTo( from, 501054 ); // I accept thy resignation.
pm.NpcGuild = NpcGuild.None;
}
if (!e.Handled && from is PlayerMobile && from.InRange(Location, 2) && WasNamed(e.Speech))
{
PlayerMobile pm = (PlayerMobile)from;
e.Handled = true;
}
}
if (e.HasKeyword(0x0004)) // *join* | *member*
{
if (pm.NpcGuild == NpcGuild)
SayTo(from, 501047); // Thou art already a member of our guild.
else if (pm.NpcGuild != NpcGuild.None)
SayTo(from, 501046); // Thou must resign from thy other guild first.
else if (pm.GameTime < JoinGameAge || pm.CreationTime + JoinAge > DateTime.UtcNow)
SayTo(from, 501048); // You are too young to join my guild...
else if (CheckCustomReqs(pm))
SayPriceTo(from);
base.OnSpeech( e );
}
e.Handled = true;
}
else if (e.HasKeyword(0x0005)) // *resign* | *quit*
{
if (pm.NpcGuild != NpcGuild)
{
SayTo(from, 501052); // Thou dost not belong to my guild!
}
else if (pm.NpcGuildJoinTime + QuitAge > DateTime.UtcNow ||
pm.NpcGuildGameTime + QuitGameAge > pm.GameTime)
{
SayTo(from, 501053); // You just joined my guild! You must wait a week to resign.
}
else
{
SayTo(from, 501054); // I accept thy resignation.
pm.NpcGuild = NpcGuild.None;
}
public override bool OnGoldGiven( Mobile from, Gold dropped )
{
if ( from is PlayerMobile && dropped.Amount == JoinCost )
{
PlayerMobile pm = (PlayerMobile)from;
e.Handled = true;
}
}
if ( pm.NpcGuild == NpcGuild )
{
SayTo( from, 501047 ); // Thou art already a member of our guild.
}
else if ( pm.NpcGuild != NpcGuild.None )
{
SayTo( from, 501046 ); // Thou must resign from thy other guild first.
}
else if ( pm.GameTime < JoinGameAge || (pm.CreationTime + JoinAge) > DateTime.UtcNow )
{
SayTo( from, 501048 ); // You are too young to join my guild...
}
else if ( CheckCustomReqs( pm ) )
{
SayWelcomeTo( from );
base.OnSpeech(e);
}
pm.NpcGuild = NpcGuild;
pm.NpcGuildJoinTime = DateTime.UtcNow;
pm.NpcGuildGameTime = pm.GameTime;
public override bool OnGoldGiven(Mobile from, Gold dropped)
{
if (from is PlayerMobile && dropped.Amount == JoinCost)
{
PlayerMobile pm = (PlayerMobile)from;
dropped.Delete();
return true;
}
if (pm.NpcGuild == NpcGuild)
{
SayTo(from, 501047); // Thou art already a member of our guild.
}
else if (pm.NpcGuild != NpcGuild.None)
{
SayTo(from, 501046); // Thou must resign from thy other guild first.
}
else if (pm.GameTime < JoinGameAge || pm.CreationTime + JoinAge > DateTime.UtcNow)
{
SayTo(from, 501048); // You are too young to join my guild...
}
else if (CheckCustomReqs(pm))
{
SayWelcomeTo(from);
return false;
}
pm.NpcGuild = NpcGuild;
pm.NpcGuildJoinTime = DateTime.UtcNow;
pm.NpcGuildGameTime = pm.GameTime;
return base.OnGoldGiven( from, dropped );
}
dropped.Delete();
return true;
}
public BaseGuildmaster( string title ) : base( title )
{
Title = $"the {title} {(Female ? "guildmistress" : "guildmaster")}";
}
return false;
}
public BaseGuildmaster( Serial serial ) : base( serial )
{
}
return base.OnGoldGiven(from, dropped);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
}
}
}