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

@ -1,136 +1,135 @@
using System;
using System.Collections;
using Server.Gumps;
using Server.Network;
namespace Server.Engines.ConPVP
{
public class RulesetGump : Gump
{
private Mobile m_From;
private Ruleset m_Ruleset;
private RulesetLayout m_Page;
private DuelContext m_DuelContext;
private bool m_ReadOnly;
public class RulesetGump : Gump
{
private DuelContext m_DuelContext;
private Mobile m_From;
private RulesetLayout m_Page;
private bool m_ReadOnly;
private Ruleset m_Ruleset;
public string Center( string text )
{
return $"<CENTER>{text}</CENTER>";
}
public RulesetGump(Mobile from, Ruleset ruleset, RulesetLayout page, DuelContext duelContext) : this(from, ruleset,
page, duelContext, false)
{
}
public void AddGoldenButton( int x, int y, int bid )
{
AddButton( x , y , 0xD2, 0xD2, bid, GumpButtonType.Reply, 0 );
AddButton( x+3, y+3, 0xD8, 0xD8, bid, GumpButtonType.Reply, 0 );
}
public RulesetGump(Mobile from, Ruleset ruleset, RulesetLayout page, DuelContext duelContext, bool readOnly) : base(
readOnly ? 310 : 50, 50)
{
m_From = from;
m_Ruleset = ruleset;
m_Page = page;
m_DuelContext = duelContext;
m_ReadOnly = readOnly;
public RulesetGump( Mobile from, Ruleset ruleset, RulesetLayout page, DuelContext duelContext ) : this( from, ruleset, page, duelContext, false )
{
}
Dragable = !readOnly;
public RulesetGump( Mobile from, Ruleset ruleset, RulesetLayout page, DuelContext duelContext, bool readOnly ) : base( readOnly ? 310 : 50, 50 )
{
m_From = from;
m_Ruleset = ruleset;
m_Page = page;
m_DuelContext = duelContext;
m_ReadOnly = readOnly;
from.CloseGump(typeof(RulesetGump));
from.CloseGump(typeof(DuelContextGump));
from.CloseGump(typeof(ParticipantGump));
Dragable = !readOnly;
RulesetLayout depthCounter = page;
int depth = 0;
from.CloseGump( typeof( RulesetGump ) );
from.CloseGump( typeof( DuelContextGump ) );
from.CloseGump( typeof( ParticipantGump ) );
while (depthCounter != null)
{
++depth;
depthCounter = depthCounter.Parent;
}
RulesetLayout depthCounter = page;
int depth = 0;
int count = page.Children.Length + page.Options.Length;
while ( depthCounter != null )
{
++depth;
depthCounter = depthCounter.Parent;
}
AddPage(0);
int count = page.Children.Length + page.Options.Length;
int height = 35 + 10 + 2 + count * 22 + 2 + 30;
AddPage( 0 );
AddBackground(0, 0, 260, height, 9250);
AddBackground(10, 10, 240, height - 20, 0xDAC);
int height = 35 + 10 + 2 + (count * 22) + 2 + 30;
AddHtml(35, 25, 190, 20, Center(page.Title), false, false);
AddBackground( 0, 0, 260, height, 9250 );
AddBackground( 10, 10, 240, height - 20, 0xDAC );
int x = 35;
int y = 47;
AddHtml( 35, 25, 190, 20, Center( page.Title ), false, false );
for (int i = 0; i < page.Children.Length; ++i)
{
AddGoldenButton(x, y, 1 + i);
AddHtml(x + 25, y, 250, 22, page.Children[i].Title, false, false);
int x = 35;
int y = 47;
y += 22;
}
for ( int i = 0; i < page.Children.Length; ++i )
{
AddGoldenButton( x, y, 1 + i );
AddHtml( x + 25, y, 250, 22, page.Children[i].Title, false, false );
for (int i = 0; i < page.Options.Length; ++i)
{
bool enabled = ruleset.Options[page.Offset + i];
y += 22;
}
if (readOnly)
AddImage(x, y, enabled ? 0xD3 : 0xD2);
else
AddCheck(x, y, 0xD2, 0xD3, enabled, i);
for ( int i = 0; i < page.Options.Length; ++i )
{
bool enabled = ruleset.Options[page.Offset + i];
AddHtml(x + 25, y, 250, 22, page.Options[i], false, false);
if ( readOnly )
AddImage( x, y, enabled ? 0xD3 : 0xD2 );
else
AddCheck( x, y, 0xD2, 0xD3, enabled, i );
y += 22;
}
}
AddHtml( x + 25, y, 250, 22, page.Options[i], false, false );
public string Center(string text)
{
return $"<CENTER>{text}</CENTER>";
}
y += 22;
}
}
public void AddGoldenButton(int x, int y, int bid)
{
AddButton(x, y, 0xD2, 0xD2, bid, GumpButtonType.Reply, 0);
AddButton(x + 3, y + 3, 0xD8, 0xD8, bid, GumpButtonType.Reply, 0);
}
public override void OnResponse( NetState sender, RelayInfo info )
{
if ( m_DuelContext != null && !m_DuelContext.Registered )
return;
public override void OnResponse(NetState sender, RelayInfo info)
{
if (m_DuelContext != null && !m_DuelContext.Registered)
return;
if ( !m_ReadOnly )
{
BitArray opts = new BitArray( m_Page.Options.Length );
if (!m_ReadOnly)
{
BitArray opts = new BitArray(m_Page.Options.Length);
for ( int i = 0; i < info.Switches.Length; ++i )
{
int sid = info.Switches[i];
for (int i = 0; i < info.Switches.Length; ++i)
{
int sid = info.Switches[i];
if ( sid >= 0 && sid < m_Page.Options.Length )
opts[sid] = true;
}
if (sid >= 0 && sid < m_Page.Options.Length)
opts[sid] = true;
}
for ( int i = 0; i < opts.Length; ++i )
{
if ( m_Ruleset.Options[m_Page.Offset + i] != opts[i] )
{
m_Ruleset.Options[m_Page.Offset + i] = opts[i];
m_Ruleset.Changed = true;
}
}
}
for (int i = 0; i < opts.Length; ++i)
if (m_Ruleset.Options[m_Page.Offset + i] != opts[i])
{
m_Ruleset.Options[m_Page.Offset + i] = opts[i];
m_Ruleset.Changed = true;
}
}
int bid = info.ButtonID;
int bid = info.ButtonID;
if ( bid == 0 )
{
if ( m_Page.Parent != null )
m_From.SendGump( new RulesetGump( m_From, m_Ruleset, m_Page.Parent, m_DuelContext, m_ReadOnly ) );
else if ( !m_ReadOnly )
m_From.SendGump( new PickRulesetGump( m_From, m_DuelContext, m_Ruleset ) );
}
else
{
bid -= 1;
if (bid == 0)
{
if (m_Page.Parent != null)
m_From.SendGump(new RulesetGump(m_From, m_Ruleset, m_Page.Parent, m_DuelContext, m_ReadOnly));
else if (!m_ReadOnly)
m_From.SendGump(new PickRulesetGump(m_From, m_DuelContext, m_Ruleset));
}
else
{
bid -= 1;
if ( bid >= 0 && bid < m_Page.Children.Length )
m_From.SendGump( new RulesetGump( m_From, m_Ruleset, m_Page.Children[bid], m_DuelContext, m_ReadOnly ) );
}
}
}
if (bid >= 0 && bid < m_Page.Children.Length)
m_From.SendGump(new RulesetGump(m_From, m_Ruleset, m_Page.Children[bid], m_DuelContext, m_ReadOnly));
}
}
}
}