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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

220
Scripts/Gumps/Guilds/New Guild System/BaseGuildGump.cs
View file

@ -1,140 +1,140 @@
using System;
using Server.Mobiles;
using Server.Gumps;
using Server.Network;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
namespace Server.Guilds
{
public abstract class BaseGuildGump : Gump
{
protected Guild guild { get; }
public abstract class BaseGuildGump : Gump
{
public BaseGuildGump(PlayerMobile pm, Guild g) : this(pm, g, 10, 10)
{
}
protected PlayerMobile player { get; }
public BaseGuildGump(PlayerMobile pm, Guild g, int x, int y) : base(x, y)
{
guild = g;
player = pm;
public BaseGuildGump( PlayerMobile pm, Guild g ) : this( pm, g, 10, 10 )
{
}
pm.CloseGump(typeof(BaseGuildGump));
}
public BaseGuildGump( PlayerMobile pm, Guild g, int x, int y ) : base( x, y )
{
guild = g;
player = pm;
protected Guild guild{ get; }
pm.CloseGump( typeof( BaseGuildGump ) );
}
protected PlayerMobile player{ get; }
//There's prolly a way to have all the vars set of inherited classes before something is called in the Ctor... but... I can't think of it right now, and I can't use Timer.DelayCall here :<
//There's prolly a way to have all the vars set of inherited classes before something is called in the Ctor... but... I can't think of it right now, and I can't use Timer.DelayCall here :<
public virtual void PopulateGump()
{
AddPage( 0 );
public virtual void PopulateGump()
{
AddPage(0);
AddBackground( 0, 0, 600, 440, 0x24AE );
AddBackground( 66, 40, 150, 26, 0x2486 );
AddButton( 71, 45, 0x845, 0x846, 1, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 96, 43, 110, 26, 1063014, 0x0, false, false ); // My Guild
AddBackground( 236, 40, 150, 26, 0x2486 );
AddButton( 241, 45, 0x845, 0x846, 2, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 266, 43, 110, 26, 1062974, 0x0, false, false ); // Guild Roster
AddBackground( 401, 40, 150, 26, 0x2486 );
AddButton( 406, 45, 0x845, 0x846, 3, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 431, 43, 110, 26, 1062978, 0x0, false, false ); // Diplomacy
AddPage( 1 );
}
AddBackground(0, 0, 600, 440, 0x24AE);
AddBackground(66, 40, 150, 26, 0x2486);
AddButton(71, 45, 0x845, 0x846, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(96, 43, 110, 26, 1063014, 0x0, false, false); // My Guild
AddBackground(236, 40, 150, 26, 0x2486);
AddButton(241, 45, 0x845, 0x846, 2, GumpButtonType.Reply, 0);
AddHtmlLocalized(266, 43, 110, 26, 1062974, 0x0, false, false); // Guild Roster
AddBackground(401, 40, 150, 26, 0x2486);
AddButton(406, 45, 0x845, 0x846, 3, GumpButtonType.Reply, 0);
AddHtmlLocalized(431, 43, 110, 26, 1062978, 0x0, false, false); // Diplomacy
AddPage(1);
}
public override void OnResponse( NetState sender, RelayInfo info )
{
PlayerMobile pm = sender.Mobile as PlayerMobile;
public override void OnResponse(NetState sender, RelayInfo info)
{
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( !IsMember( pm, guild ) )
return;
if (!IsMember(pm, guild))
return;
switch( info.ButtonID )
{
case 1:
{
pm.SendGump( new GuildInfoGump( pm, guild ) );
break;
}
case 2:
{
pm.SendGump( new GuildRosterGump( pm, guild ) );
break;
}
case 3:
{
pm.SendGump( new GuildDiplomacyGump( pm, guild ) );
break;
}
}
}
switch (info.ButtonID)
{
case 1:
{
pm.SendGump(new GuildInfoGump(pm, guild));
break;
}
case 2:
{
pm.SendGump(new GuildRosterGump(pm, guild));
break;
}
case 3:
{
pm.SendGump(new GuildDiplomacyGump(pm, guild));
break;
}
}
}
public static bool IsLeader( Mobile m, Guild g )
{
return !( m.Deleted || g.Disbanded || !( m is PlayerMobile ) || (m.AccessLevel < AccessLevel.GameMaster && g.Leader != m) );
}
public static bool IsLeader(Mobile m, Guild g)
{
return !(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && g.Leader != m);
}
public static bool IsMember( Mobile m, Guild g )
{
return !( m.Deleted || g.Disbanded || !( m is PlayerMobile ) || (m.AccessLevel < AccessLevel.GameMaster && !g.IsMember( m )) );
}
public static bool IsMember(Mobile m, Guild g)
{
return !(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && !g.IsMember(m));
}
public static bool CheckProfanity( string s )
{
return CheckProfanity( s, 50 );
}
public static bool CheckProfanity( string s, int maxLength )
{
//return NameVerification.Validate( s, 1, 50, true, true, false, int.MaxValue, ProfanityProtection.Exceptions, ProfanityProtection.Disallowed, ProfanityProtection.StartDisallowed ); //What am I doing wrong, this still allows chars like the <3 symbol... 3 AM. someone change this to use this
public static bool CheckProfanity(string s)
{
return CheckProfanity(s, 50);
}
//With testing on OSI, Guild stuff seems to follow a 'simpler' method of profanity protection
if ( s.Length < 1 || s.Length > maxLength )
return false;
public static bool CheckProfanity(string s, int maxLength)
{
//return NameVerification.Validate( s, 1, 50, true, true, false, int.MaxValue, ProfanityProtection.Exceptions, ProfanityProtection.Disallowed, ProfanityProtection.StartDisallowed ); //What am I doing wrong, this still allows chars like the <3 symbol... 3 AM. someone change this to use this
char[] exceptions = ProfanityProtection.Exceptions;
//With testing on OSI, Guild stuff seems to follow a 'simpler' method of profanity protection
if (s.Length < 1 || s.Length > maxLength)
return false;
s = s.ToLower();
char[] exceptions = ProfanityProtection.Exceptions;
for ( int i = 0; i < s.Length; ++i )
{
char c = s[i];
s = s.ToLower();
if ( (c < 'a' || c > 'z') && (c < '0' || c > '9'))
{
bool except = false;
for (int i = 0; i < s.Length; ++i)
{
char c = s[i];
for( int j = 0; !except && j < exceptions.Length; j++ )
if ( c == exceptions[j] )
except = true;
if ((c < 'a' || c > 'z') && (c < '0' || c > '9'))
{
bool except = false;
if ( !except )
return false;
}
}
for (int j = 0; !except && j < exceptions.Length; j++)
if (c == exceptions[j])
except = true;
string[] disallowed = ProfanityProtection.Disallowed;
if (!except)
return false;
}
}
for( int i = 0; i < disallowed.Length; i++ )
{
if ( s.IndexOf( disallowed[i] ) != -1 )
return false;
}
string[] disallowed = ProfanityProtection.Disallowed;
return true;
}
for (int i = 0; i < disallowed.Length; i++)
if (s.IndexOf(disallowed[i]) != -1)
return false;
public void AddHtmlText( int x, int y, int width, int height, TextDefinition text, bool back, bool scroll )
{
if ( text != null && text.Number > 0 )
AddHtmlLocalized( x, y, width, height, text.Number, back, scroll );
else if ( text?.String != null )
AddHtml( x, y, width, height, text.String, back, scroll );
}
return true;
}
public static string Color( string text, int color )
{
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
}
}
public void AddHtmlText(int x, int y, int width, int height, TextDefinition text, bool back, bool scroll)
{
if (text != null && text.Number > 0)
AddHtmlLocalized(x, y, width, height, text.Number, back, scroll);
else if (text?.String != null)
AddHtml(x, y, width, height, text.String, back, scroll);
}
public static string Color(string text, int color)
{
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
}
}