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

Replaces types with built-in types.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:22:16 -07:00
parent fee83ce560
commit 22ab83ea9e
98 changed files with 248 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -65,11 +65,11 @@ namespace Server.Engines.ConPVP
else
fmt = "You have been challenged to a duel from {0}. Do you accept?";
AddHtml( 22-1, 50, 294, 40, Color( String.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22+1, 50, 294, 40, Color( String.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50-1, 294, 40, Color( String.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50+1, 294, 40, Color( String.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50, 294, 40, Color( String.Format( fmt, challenger.Name ), 0xB0C868 ), false, false );
AddHtml( 22-1, 50, 294, 40, Color( string.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22+1, 50, 294, 40, Color( string.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50-1, 294, 40, Color( string.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50+1, 294, 40, Color( string.Format( fmt, challenger.Name ), BlackColor32 ), false, false );
AddHtml( 22, 50, 294, 40, Color( string.Format( fmt, challenger.Name ), 0xB0C868 ), false, false );
AddImageTiled( 32, 88, 264, 1, 9107 );
AddImageTiled( 42, 90, 264, 1, 9157 );

6
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -1180,7 +1180,7 @@ namespace Server.Engines.ConPVP
string text =
$"{{0}} are ranked {LadderGump.Rank(entry.Index + 1)} at level {Ladder.GetLevel(entry.Experience)}.";
pm.PrivateOverheadMessage( MessageType.Regular, pm.SpeechHue, true, String.Format( text, from==pm?"You":"They" ), from.NetState );
pm.PrivateOverheadMessage( MessageType.Regular, pm.SpeechHue, true, string.Format( text, from==pm?"You":"They" ), from.NetState );
}
else if ( obj is Mobile mob )
{
@ -1272,8 +1272,8 @@ namespace Server.Engines.ConPVP
string text =
$"{{0}} {{1}} ranked {LadderGump.Rank(entry.Index + 1)} at level {Ladder.GetLevel(entry.Experience)}.";
pm.LocalOverheadMessage( MessageType.Regular, pm.SpeechHue, true, String.Format( text, "You", "are" ) );
pm.NonlocalOverheadMessage( MessageType.Regular, pm.SpeechHue, true, String.Format( text, pm.Name, "is" ) );
pm.LocalOverheadMessage( MessageType.Regular, pm.SpeechHue, true, string.Format( text, "You", "are" ) );
pm.NonlocalOverheadMessage( MessageType.Regular, pm.SpeechHue, true, string.Format( text, pm.Name, "is" ) );
//pm.PublicOverheadMessage( MessageType.Regular, pm.SpeechHue, true, String.Format( "Level {0} with {1} win{2} and {3} loss{4}.", Ladder.GetLevel( entry.Experience ), entry.Wins, entry.Wins==1?"":"s", entry.Losses, entry.Losses==1?"":"es" ) );
//pm.PublicOverheadMessage( MessageType.Regular, pm.SpeechHue, true, String.Format( "Level {0} with {1} win{2} and {3} loss{4}.", Ladder.GetLevel( entry.Experience ), entry.Wins, entry.Wins==1?"":"s", entry.Losses, entry.Losses==1?"":"es" ) );

2
Scripts/Engines/ConPVP/DuelContextGump.cs
View file

@ -65,7 +65,7 @@ namespace Server.Engines.ConPVP
{
Participant p = (Participant)context.Participants[i];
AddGoldenButtonLabeled( x, y, 4 + i, String.Format( p.Count == 1 ? "Player {0}: {3}" : "Team {0}: {1}/{2}: {3}", 1 + i, p.FilledSlots, p.Count, p.NameList ) ); y += 22;
AddGoldenButtonLabeled( x, y, 4 + i, string.Format( p.Count == 1 ? "Player {0}: {3}" : "Team {0}: {1}/{2}: {3}", 1 + i, p.FilledSlots, p.Count, p.NameList ) ); y += 22;
}
}

2
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -1581,7 +1581,7 @@ namespace Server.Engines.ConPVP
public void Alert( string format, params object[] args )
{
Alert( String.Format( format, args ) );
Alert( string.Format( format, args ) );
}
public BRGame( BRController controller, DuelContext context ) : base( context )

2
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -925,7 +925,7 @@ namespace Server.Engines.ConPVP
public void Alert( string format, params object[] args )
{
Alert( String.Format( format, args ) );
Alert( string.Format( format, args ) );
}
public CTFGame( CTFController controller, DuelContext context ) : base( context )

2
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -559,7 +559,7 @@ namespace Server.Engines.ConPVP
public void Alert( string format, params object[] args )
{
Alert( String.Format( format, args ) );
Alert( string.Format( format, args ) );
}
public DDGame( DDController controller, DuelContext context ) : base( context )

2
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -947,7 +947,7 @@ namespace Server.Engines.ConPVP
public void Alert(string format, params object[] args)
{
Alert(String.Format(format, args));
Alert(string.Format(format, args));
}
public KHGame(KHController controller, DuelContext context)

2
Scripts/Engines/ConPVP/LadderGump.cs
View file

@ -149,7 +149,7 @@ namespace Server.Engines.ConPVP
else
AddImage( 466, height-12-2-16, 0x2622 );
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 );
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 );
AddColumnHeader( 75, "Rank" );
AddColumnHeader( 115, "Level" );

2
Scripts/Engines/ConPVP/Participant.cs
View file

@ -51,7 +51,7 @@ namespace Server.Engines.ConPVP
m_Players[i].Mobile.SendMessage( hue, message );
if ( nonLocalOverhead != null )
m_Players[i].Mobile.NonlocalOverheadMessage( Network.MessageType.Regular, hue, false, String.Format( nonLocalOverhead, m_Players[i].Mobile.Name, m_Players[i].Mobile.Female ? "her" : "his" ) );
m_Players[i].Mobile.NonlocalOverheadMessage( Network.MessageType.Regular, hue, false, string.Format( nonLocalOverhead, m_Players[i].Mobile.Name, m_Players[i].Mobile.Female ? "her" : "his" ) );
if ( localOverhead != null )
m_Players[i].Mobile.LocalOverheadMessage( Network.MessageType.Regular, hue, false, localOverhead );

4
Scripts/Engines/ConPVP/Tournament.cs
View file

@ -716,7 +716,7 @@ namespace Server.Engines.ConPVP
timeUntil = $"in {minutesUntil} minute{(minutesUntil == 1 ? "" : "s")}";
m_Registrar.PrivateOverheadMessage( MessageType.Regular,
0x35, false, String.Format( fmt, from.Female ? "Lady" : "Lord", timeUntil ), from.NetState );
0x35, false, string.Format( fmt, from.Female ? "Lady" : "Lord", timeUntil ), from.NetState );
}
TournyParticipant part = new TournyParticipant( from );
@ -2687,7 +2687,7 @@ namespace Server.Engines.ConPVP
public void AddLog( string format, params object[] args )
{
AddLog( String.Format( format, args ) );
AddLog( string.Format( format, args ) );
}
public void WonMatch( TournyMatch match )