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

@ -3,60 +3,61 @@ using Server.Network;
namespace Server.Gumps
{
public class GuildDeclarePeaceGump : GuildListGump
{
public GuildDeclarePeaceGump( Mobile from, Guild guild ) : base( from, guild, true, guild.Enemies )
{
}
public class GuildDeclarePeaceGump : GuildListGump
{
public GuildDeclarePeaceGump(Mobile from, Guild guild) : base(from, guild, true, guild.Enemies)
{
}
protected override void Design()
{
AddHtmlLocalized( 20, 10, 400, 35, 1011137, false, false ); // Select the guild you wish to declare peace with.
protected override void Design()
{
AddHtmlLocalized(20, 10, 400, 35, 1011137, false, false); // Select the guild you wish to declare peace with.
AddButton( 20, 400, 4005, 4007, 1, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 55, 400, 245, 30, 1011138, false, false ); // Send the olive branch.
AddButton(20, 400, 4005, 4007, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 400, 245, 30, 1011138, false, false); // Send the olive branch.
AddButton( 300, 400, 4005, 4007, 2, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 335, 400, 100, 35, 1011012, false, false ); // CANCEL
}
AddButton(300, 400, 4005, 4007, 2, GumpButtonType.Reply, 0);
AddHtmlLocalized(335, 400, 100, 35, 1011012, false, false); // CANCEL
}
public override void OnResponse( NetState state, RelayInfo info )
{
if ( GuildGump.BadLeader( m_Mobile, m_Guild ) )
return;
public override void OnResponse(NetState state, RelayInfo info)
{
if (GuildGump.BadLeader(m_Mobile, m_Guild))
return;
if ( info.ButtonID == 1 )
{
int[] switches = info.Switches;
if (info.ButtonID == 1)
{
int[] switches = info.Switches;
if ( switches.Length > 0 )
{
int index = switches[0];
if (switches.Length > 0)
{
int index = switches[0];
if ( index >= 0 && index < m_List.Count )
{
Guild g = (Guild)m_List[index];
if (index >= 0 && index < m_List.Count)
{
Guild g = m_List[index];
if ( g != null )
{
m_Guild.RemoveEnemy( g );
m_Guild.GuildMessage( 1018018, true, "{0} ({1})", g.Name, g.Abbreviation ); // Guild Message: You are now at peace with this guild:
if (g != null)
{
m_Guild.RemoveEnemy(g);
m_Guild.GuildMessage(1018018, true, "{0} ({1})", g.Name,
g.Abbreviation); // Guild Message: You are now at peace with this guild:
GuildGump.EnsureClosed( m_Mobile );
GuildGump.EnsureClosed(m_Mobile);
if ( m_Guild.Enemies.Count > 0 )
m_Mobile.SendGump( new GuildDeclarePeaceGump( m_Mobile, m_Guild ) );
else
m_Mobile.SendGump( new GuildmasterGump( m_Mobile, m_Guild ) );
}
}
}
}
else if ( info.ButtonID == 2 )
{
GuildGump.EnsureClosed( m_Mobile );
m_Mobile.SendGump( new GuildmasterGump( m_Mobile, m_Guild ) );
}
}
}
if (m_Guild.Enemies.Count > 0)
m_Mobile.SendGump(new GuildDeclarePeaceGump(m_Mobile, m_Guild));
else
m_Mobile.SendGump(new GuildmasterGump(m_Mobile, m_Guild));
}
}
}
}
else if (info.ButtonID == 2)
{
GuildGump.EnsureClosed(m_Mobile);
m_Mobile.SendGump(new GuildmasterGump(m_Mobile, m_Guild));
}
}
}
}