Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -5,250 +5,253 @@ using Server.Network;
|
|||
|
||||
namespace Server.Engines.ConPVP
|
||||
{
|
||||
public class LadderItem : Item
|
||||
{
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public LadderController Ladder { get; set; }
|
||||
public class LadderItem : Item
|
||||
{
|
||||
[Constructible]
|
||||
public LadderItem() : base(0x117F)
|
||||
{
|
||||
Movable = false;
|
||||
}
|
||||
|
||||
public override string DefaultName => "1v1 leaderboard";
|
||||
public LadderItem(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LadderItem() : base( 0x117F )
|
||||
{
|
||||
Movable = false;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public LadderController Ladder{ get; set; }
|
||||
|
||||
public LadderItem( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override string DefaultName => "1v1 leaderboard";
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 1 );
|
||||
writer.Write(1);
|
||||
|
||||
writer.Write( (Item) Ladder );
|
||||
}
|
||||
writer.Write(Ladder);
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
Ladder = reader.ReadItem() as LadderController;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
switch (version)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
Ladder = reader.ReadItem() as LadderController;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( from.InRange( GetWorldLocation(), 2 ) )
|
||||
{
|
||||
Ladder ladder = Server.Engines.ConPVP.Ladder.Instance;
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (from.InRange(GetWorldLocation(), 2))
|
||||
{
|
||||
Ladder ladder = ConPVP.Ladder.Instance;
|
||||
|
||||
if ( Ladder != null )
|
||||
ladder = Ladder.Ladder;
|
||||
if (Ladder != null)
|
||||
ladder = Ladder.Ladder;
|
||||
|
||||
if ( ladder != null )
|
||||
{
|
||||
from.CloseGump( typeof( LadderGump ) );
|
||||
from.SendGump( new LadderGump( ladder, 0 ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that
|
||||
}
|
||||
}
|
||||
if (ladder != null)
|
||||
{
|
||||
from.CloseGump(typeof(LadderGump));
|
||||
from.SendGump(new LadderGump(ladder, 0));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class LadderGump : Gump
|
||||
{
|
||||
private Ladder m_Ladder;
|
||||
private int m_Page;
|
||||
public class LadderGump : Gump
|
||||
{
|
||||
private int m_ColumnX = 12;
|
||||
private Ladder m_Ladder;
|
||||
|
||||
public LadderGump( Ladder ladder ) : this( ladder, 0 )
|
||||
{
|
||||
}
|
||||
private ArrayList m_List;
|
||||
private int m_Page;
|
||||
|
||||
public static string Rank( int num )
|
||||
{
|
||||
string numStr = num.ToString( "N0" );
|
||||
public LadderGump(Ladder ladder) : this(ladder, 0)
|
||||
{
|
||||
}
|
||||
|
||||
if ( (num%100) > 10 && (num%100) < 20 )
|
||||
return numStr + "th";
|
||||
public LadderGump(Ladder ladder, int page) : base(50, 50)
|
||||
{
|
||||
m_Ladder = ladder;
|
||||
m_Page = page;
|
||||
|
||||
switch ( num % 10 )
|
||||
{
|
||||
case 1: return numStr + "st";
|
||||
case 2: return numStr + "nd";
|
||||
case 3: return numStr + "rd";
|
||||
default: return numStr + "th";
|
||||
}
|
||||
}
|
||||
AddPage(0);
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
Mobile from = sender.Mobile;
|
||||
ArrayList list = ladder.ToArrayList();
|
||||
m_List = list;
|
||||
|
||||
if ( info.ButtonID == 1 && m_Page > 0 )
|
||||
from.SendGump( new LadderGump( m_Ladder, m_Page - 1 ) );
|
||||
else if ( info.ButtonID == 2 && ((m_Page+1)*15)<Math.Min(m_List.Count,150) )
|
||||
from.SendGump( new LadderGump( m_Ladder, m_Page + 1 ) );
|
||||
}
|
||||
int lc = Math.Min(list.Count, 150);
|
||||
|
||||
private ArrayList m_List;
|
||||
int start = page * 15;
|
||||
int end = start + 15;
|
||||
|
||||
public LadderGump( Ladder ladder, int page ) : base( 50, 50 )
|
||||
{
|
||||
m_Ladder = ladder;
|
||||
m_Page = page;
|
||||
if (end > lc)
|
||||
end = lc;
|
||||
|
||||
AddPage( 0 );
|
||||
int ct = end - start;
|
||||
|
||||
ArrayList list = ladder.ToArrayList();
|
||||
m_List = list;
|
||||
int height = 12 + 20 + ct * 20 + 23 + 12;
|
||||
|
||||
int lc = Math.Min( list.Count, 150 );
|
||||
AddBackground(0, 0, 499, height, 0x2436);
|
||||
|
||||
int start = page * 15;
|
||||
int end = start+15;
|
||||
for (int i = start + 1; i < end; i += 2)
|
||||
AddImageTiled(12, 32 + (i - start) * 20, 475, 20, 0x2430);
|
||||
|
||||
if ( end > lc )
|
||||
end = lc;
|
||||
AddAlphaRegion(10, 10, 479, height - 20);
|
||||
|
||||
int ct = end-start;
|
||||
if (page > 0)
|
||||
AddButton(446, height - 12 - 2 - 16, 0x15E3, 0x15E7, 1, GumpButtonType.Reply, 0);
|
||||
else
|
||||
AddImage(446, height - 12 - 2 - 16, 0x2626);
|
||||
|
||||
int height = 12 + 20 + (ct*20) + 23 + 12;
|
||||
if ((page + 1) * 15 < lc)
|
||||
AddButton(466, height - 12 - 2 - 16, 0x15E1, 0x15E5, 2, GumpButtonType.Reply, 0);
|
||||
else
|
||||
AddImage(466, height - 12 - 2 - 16, 0x2622);
|
||||
|
||||
AddBackground( 0, 0, 499, height, 0x2436 );
|
||||
AddHtml(16, height - 12 - 2 - 18, 400, 20,
|
||||
Color(string.Format("Top {3} of {0:N0} duelists, page {1} of {2}", list.Count, page + 1, (lc + 14) / 15, lc),
|
||||
0xFFC000), false, false);
|
||||
|
||||
for ( int i = start + 1; i < end; i += 2 )
|
||||
AddImageTiled( 12, 32 + ((i - start) * 20), 475, 20, 0x2430 );
|
||||
AddColumnHeader(75, "Rank");
|
||||
AddColumnHeader(115, "Level");
|
||||
AddColumnHeader(50, "Guild");
|
||||
AddColumnHeader(115, "Name");
|
||||
AddColumnHeader(60, "Wins");
|
||||
AddColumnHeader(60, "Losses");
|
||||
|
||||
AddAlphaRegion( 10, 10, 479, height - 20 );
|
||||
for (int i = start; i < end && i < lc; ++i)
|
||||
{
|
||||
LadderEntry entry = (LadderEntry)list[i];
|
||||
|
||||
if ( page > 0 )
|
||||
AddButton( 446, height-12-2-16, 0x15E3, 0x15E7, 1, GumpButtonType.Reply, 0 );
|
||||
else
|
||||
AddImage( 446, height-12-2-16, 0x2626 );
|
||||
int y = 32 + (i - start) * 20;
|
||||
int x = 12;
|
||||
|
||||
if ( ((page+1)*15)<lc )
|
||||
AddButton( 466, height-12-2-16, 0x15E1, 0x15E5, 2, GumpButtonType.Reply, 0 );
|
||||
else
|
||||
AddImage( 466, height-12-2-16, 0x2622 );
|
||||
AddBorderedText(x, y, 75, Center(Rank(i + 1)), 0xFFFFFF, 0);
|
||||
x += 75;
|
||||
|
||||
AddHtml( 16, height-12-2-18, 400, 20, Color( string.Format( "Top {3} of {0:N0} duelists, page {1} of {2}", list.Count, page+1, (lc+14)/15, lc ), 0xFFC000 ), false, false );
|
||||
/*AddImage( 20, y + 5, 0x2616, 0x96C );
|
||||
AddImage( 22, y + 5, 0x2616, 0x96C );
|
||||
AddImage( 20, y + 7, 0x2616, 0x96C );
|
||||
AddImage( 22, y + 7, 0x2616, 0x96C );
|
||||
|
||||
AddColumnHeader( 75, "Rank" );
|
||||
AddColumnHeader( 115, "Level" );
|
||||
AddColumnHeader( 50, "Guild" );
|
||||
AddColumnHeader( 115, "Name" );
|
||||
AddColumnHeader( 60, "Wins" );
|
||||
AddColumnHeader( 60, "Losses" );
|
||||
AddImage( 21, y + 6, 0x2616, 0x454 );*/
|
||||
|
||||
for ( int i = start; i < end && i < lc; ++i )
|
||||
{
|
||||
LadderEntry entry = (LadderEntry)list[i];
|
||||
AddImage(x + 3, y + 4, 0x805);
|
||||
|
||||
int y = 32 + ((i - start) * 20);
|
||||
int x = 12;
|
||||
int xp = entry.Experience;
|
||||
int level = Ladder.GetLevel(xp);
|
||||
|
||||
AddBorderedText( x, y, 75, Center( Rank( i+1 ) ), 0xFFFFFF, 0 );
|
||||
x += 75;
|
||||
int xpBase, xpAdvance;
|
||||
Ladder.GetLevelInfo(level, out xpBase, out xpAdvance);
|
||||
|
||||
/*AddImage( 20, y + 5, 0x2616, 0x96C );
|
||||
AddImage( 22, y + 5, 0x2616, 0x96C );
|
||||
AddImage( 20, y + 7, 0x2616, 0x96C );
|
||||
AddImage( 22, y + 7, 0x2616, 0x96C );
|
||||
int width;
|
||||
|
||||
AddImage( 21, y + 6, 0x2616, 0x454 );*/
|
||||
int xpOffset = xp - xpBase;
|
||||
|
||||
AddImage( x + 3, y + 4, 0x805 );
|
||||
if (xpOffset >= xpAdvance)
|
||||
width = 109; // level 50
|
||||
else
|
||||
width = (109 * xpOffset + xpAdvance / 2) / (xpAdvance - 1);
|
||||
|
||||
int xp = entry.Experience;
|
||||
int level = Ladder.GetLevel( xp );
|
||||
//AddImageTiled( 21, y + 6, width, 8, 0x2617 );
|
||||
AddImageTiled(x + 3, y + 4, width, 11, 0x806);
|
||||
AddBorderedText(x, y, 115, Center(level.ToString()), 0xFFFFFF, 0);
|
||||
x += 115;
|
||||
|
||||
int xpBase, xpAdvance;
|
||||
Ladder.GetLevelInfo( level, out xpBase, out xpAdvance );
|
||||
Mobile mob = entry.Mobile;
|
||||
|
||||
int width;
|
||||
if (mob.Guild != null)
|
||||
AddBorderedText(x, y, 50, Center(mob.Guild.Abbreviation), 0xFFFFFF, 0);
|
||||
|
||||
int xpOffset = xp - xpBase;
|
||||
x += 50;
|
||||
|
||||
if ( xpOffset >= xpAdvance )
|
||||
width = 109; // level 50
|
||||
else
|
||||
width = ((109 * xpOffset) + (xpAdvance / 2)) / (xpAdvance - 1);
|
||||
AddBorderedText(x + 5, y, 115 - 5, mob.Name, 0xFFFFFF, 0);
|
||||
x += 115;
|
||||
|
||||
//AddImageTiled( 21, y + 6, width, 8, 0x2617 );
|
||||
AddImageTiled( x + 3, y + 4, width, 11, 0x806 );
|
||||
AddBorderedText( x, y, 115, Center( level.ToString() ), 0xFFFFFF, 0 );
|
||||
x += 115;
|
||||
AddBorderedText(x, y, 60, Center(entry.Wins.ToString()), 0xFFFFFF, 0);
|
||||
x += 60;
|
||||
|
||||
Mobile mob = entry.Mobile;
|
||||
AddBorderedText(x, y, 60, Center(entry.Losses.ToString()), 0xFFFFFF, 0);
|
||||
x += 60;
|
||||
|
||||
if ( mob.Guild != null )
|
||||
AddBorderedText( x, y, 50, Center( mob.Guild.Abbreviation ), 0xFFFFFF, 0 );
|
||||
//AddBorderedText( 292 + 15, y, 115 - 30, String.Format( "{0} <DIV ALIGN=CENTER>/</DIV> <DIV ALIGN=RIGHT>{1}</DIV>", entry.Wins, entry.Losses ), 0xFFC000, 0 );
|
||||
}
|
||||
}
|
||||
|
||||
x += 50;
|
||||
public static string Rank(int num)
|
||||
{
|
||||
string numStr = num.ToString("N0");
|
||||
|
||||
AddBorderedText( x + 5, y, 115 - 5, ( mob.Name ), 0xFFFFFF, 0 );
|
||||
x += 115;
|
||||
if (num % 100 > 10 && num % 100 < 20)
|
||||
return numStr + "th";
|
||||
|
||||
AddBorderedText( x, y, 60, Center( entry.Wins.ToString() ), 0xFFFFFF, 0 );
|
||||
x += 60;
|
||||
switch (num % 10)
|
||||
{
|
||||
case 1: return numStr + "st";
|
||||
case 2: return numStr + "nd";
|
||||
case 3: return numStr + "rd";
|
||||
default: return numStr + "th";
|
||||
}
|
||||
}
|
||||
|
||||
AddBorderedText( x, y, 60, Center( entry.Losses.ToString() ), 0xFFFFFF, 0 );
|
||||
x += 60;
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
Mobile from = sender.Mobile;
|
||||
|
||||
//AddBorderedText( 292 + 15, y, 115 - 30, String.Format( "{0} <DIV ALIGN=CENTER>/</DIV> <DIV ALIGN=RIGHT>{1}</DIV>", entry.Wins, entry.Losses ), 0xFFC000, 0 );
|
||||
}
|
||||
}
|
||||
if (info.ButtonID == 1 && m_Page > 0)
|
||||
from.SendGump(new LadderGump(m_Ladder, m_Page - 1));
|
||||
else if (info.ButtonID == 2 && (m_Page + 1) * 15 < Math.Min(m_List.Count, 150))
|
||||
from.SendGump(new LadderGump(m_Ladder, m_Page + 1));
|
||||
}
|
||||
|
||||
public string Center( string text )
|
||||
{
|
||||
return $"<CENTER>{text}</CENTER>";
|
||||
}
|
||||
public string Center(string text)
|
||||
{
|
||||
return $"<CENTER>{text}</CENTER>";
|
||||
}
|
||||
|
||||
public string Color( string text, int color )
|
||||
{
|
||||
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
|
||||
}
|
||||
public string Color(string text, int color)
|
||||
{
|
||||
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
|
||||
}
|
||||
|
||||
private void AddBorderedText( int x, int y, int width, string text, int color, int borderColor )
|
||||
{
|
||||
/*AddColoredText( x - 1, y, width, text, borderColor );
|
||||
AddColoredText( x + 1, y, width, text, borderColor );
|
||||
AddColoredText( x, y - 1, width, text, borderColor );
|
||||
AddColoredText( x, y + 1, width, text, borderColor );*/
|
||||
/*AddColoredText( x - 1, y - 1, width, text, borderColor );
|
||||
AddColoredText( x + 1, y + 1, width, text, borderColor );*/
|
||||
AddColoredText( x, y, width, text, color );
|
||||
}
|
||||
private void AddBorderedText(int x, int y, int width, string text, int color, int borderColor)
|
||||
{
|
||||
/*AddColoredText( x - 1, y, width, text, borderColor );
|
||||
AddColoredText( x + 1, y, width, text, borderColor );
|
||||
AddColoredText( x, y - 1, width, text, borderColor );
|
||||
AddColoredText( x, y + 1, width, text, borderColor );*/
|
||||
/*AddColoredText( x - 1, y - 1, width, text, borderColor );
|
||||
AddColoredText( x + 1, y + 1, width, text, borderColor );*/
|
||||
AddColoredText(x, y, width, text, color);
|
||||
}
|
||||
|
||||
private void AddColoredText( int x, int y, int width, string text, int color )
|
||||
{
|
||||
if ( color == 0 )
|
||||
AddHtml( x, y, width, 20, text, false, false );
|
||||
else
|
||||
AddHtml( x, y, width, 20, Color( text, color ), false, false );
|
||||
}
|
||||
private void AddColoredText(int x, int y, int width, string text, int color)
|
||||
{
|
||||
if (color == 0)
|
||||
AddHtml(x, y, width, 20, text, false, false);
|
||||
else
|
||||
AddHtml(x, y, width, 20, Color(text, color), false, false);
|
||||
}
|
||||
|
||||
private int m_ColumnX = 12;
|
||||
private void AddColumnHeader(int width, string name)
|
||||
{
|
||||
AddBackground(m_ColumnX, 12, width, 20, 0x242C);
|
||||
AddImageTiled(m_ColumnX + 2, 14, width - 4, 16, 0x2430);
|
||||
AddBorderedText(m_ColumnX, 13, width, Center(name), 0xFFFFFF, 0);
|
||||
|
||||
private void AddColumnHeader( int width, string name )
|
||||
{
|
||||
AddBackground( m_ColumnX, 12, width, 20, 0x242C );
|
||||
AddImageTiled( m_ColumnX + 2, 14, width - 4, 16, 0x2430 );
|
||||
AddBorderedText( m_ColumnX, 13, width, Center( name ), 0xFFFFFF, 0 );
|
||||
|
||||
m_ColumnX += width;
|
||||
}
|
||||
}
|
||||
m_ColumnX += width;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue