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,95 +3,89 @@ using Server.Network;
namespace Server.Gumps
{
public interface IRewardOption
{
void GetOptions( RewardOptionList list );
void OnOptionSelected( Mobile from, int choice );
}
public interface IRewardOption
{
void GetOptions(RewardOptionList list);
void OnOptionSelected(Mobile from, int choice);
}
public class RewardOptionGump : Gump
{
private RewardOptionList m_Options = new RewardOptionList();
private IRewardOption m_Option;
public class RewardOptionGump : Gump
{
private IRewardOption m_Option;
private RewardOptionList m_Options = new RewardOptionList();
public RewardOptionGump( IRewardOption option ) : this( option, 0 )
{
}
public RewardOptionGump(IRewardOption option) : this(option, 0)
{
}
public RewardOptionGump( IRewardOption option, int title ) : base( 60, 36 )
{
m_Option = option;
public RewardOptionGump(IRewardOption option, int title) : base(60, 36)
{
m_Option = option;
m_Option?.GetOptions( m_Options );
m_Option?.GetOptions(m_Options);
AddPage( 0 );
AddPage(0);
AddBackground( 0, 0, 273, 324, 0x13BE );
AddImageTiled( 10, 10, 253, 20, 0xA40 );
AddImageTiled( 10, 40, 253, 244, 0xA40 );
AddImageTiled( 10, 294, 253, 20, 0xA40 );
AddAlphaRegion( 10, 10, 253, 304 );
AddBackground(0, 0, 273, 324, 0x13BE);
AddImageTiled(10, 10, 253, 20, 0xA40);
AddImageTiled(10, 40, 253, 244, 0xA40);
AddImageTiled(10, 294, 253, 20, 0xA40);
AddAlphaRegion(10, 10, 253, 304);
AddButton( 10, 294, 0xFB1, 0xFB2, 0, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 45, 296, 450, 20, 1060051, 0x7FFF, false, false ); // CANCEL
AddButton(10, 294, 0xFB1, 0xFB2, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(45, 296, 450, 20, 1060051, 0x7FFF, false, false); // CANCEL
if ( title > 0 )
AddHtmlLocalized( 14, 12, 273, 20, title, 0x7FFF, false, false );
else
AddHtmlLocalized( 14, 12, 273, 20, 1080392, 0x7FFF, false, false ); // Select your choice from the menu below.
if (title > 0)
AddHtmlLocalized(14, 12, 273, 20, title, 0x7FFF, false, false);
else
AddHtmlLocalized(14, 12, 273, 20, 1080392, 0x7FFF, false, false); // Select your choice from the menu below.
AddPage( 1 );
AddPage(1);
for ( int i = 0; i < m_Options.Count; i++ )
{
AddButton( 19, 49 + i * 24, 0x845, 0x846, m_Options[ i ].ID, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 44, 47 + i * 24, 213, 20, m_Options[ i ].Cliloc, 0x7FFF, false, false );
}
}
for (int i = 0; i < m_Options.Count; i++)
{
AddButton(19, 49 + i * 24, 0x845, 0x846, m_Options[i].ID, GumpButtonType.Reply, 0);
AddHtmlLocalized(44, 47 + i * 24, 213, 20, m_Options[i].Cliloc, 0x7FFF, false, false);
}
}
public override void OnResponse( NetState sender, RelayInfo info )
{
if ( m_Option != null && Contains( info.ButtonID ) )
m_Option.OnOptionSelected( sender.Mobile, info.ButtonID );
}
public override void OnResponse(NetState sender, RelayInfo info)
{
if (m_Option != null && Contains(info.ButtonID))
m_Option.OnOptionSelected(sender.Mobile, info.ButtonID);
}
private bool Contains( int chosen )
{
if ( m_Options == null )
return false;
private bool Contains(int chosen)
{
if (m_Options == null)
return false;
foreach ( RewardOption option in m_Options )
{
if ( option.ID == chosen )
return true;
}
foreach (RewardOption option in m_Options)
if (option.ID == chosen)
return true;
return false;
}
}
return false;
}
}
public class RewardOption
{
public int ID { get; }
public class RewardOption
{
public RewardOption(int id, int cliloc)
{
ID = id;
Cliloc = cliloc;
}
public int Cliloc { get; }
public int ID{ get; }
public RewardOption( int id, int cliloc )
{
ID = id;
Cliloc = cliloc;
}
}
public int Cliloc{ get; }
}
public class RewardOptionList : List<RewardOption>
{
public RewardOptionList()
{
}
public void Add( int id, int cliloc )
{
Add( new RewardOption( id, cliloc ) );
}
}
}
public class RewardOptionList : List<RewardOption>
{
public void Add(int id, int cliloc)
{
Add(new RewardOption(id, cliloc));
}
}
}