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

Fixes string interpolation

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:07:43 -07:00
parent 42d0b6271f
commit 7d3a0ca265
233 changed files with 758 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Skills/AnimalLore.cs
View file

@ -86,7 +86,7 @@ namespace Server.SkillHandlers
if ( skill.Base < 10.0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0:F1}</div>", skill.Value );
return $"<div align=right>{skill.Value:F1}</div>";
}
private static string FormatAttributes( int cur, int max )
@ -94,7 +94,7 @@ namespace Server.SkillHandlers
if ( max == 0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0}/{1}</div>", cur, max );
return $"<div align=right>{cur}/{max}</div>";
}
private static string FormatStat( int val )
@ -102,7 +102,7 @@ namespace Server.SkillHandlers
if ( val == 0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0}</div>", val );
return $"<div align=right>{val}</div>";
}
private static string FormatDouble( double val )
@ -110,7 +110,7 @@ namespace Server.SkillHandlers
if ( val == 0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0:F1}</div>", val );
return $"<div align=right>{val:F1}</div>";
}
private static string FormatElement( int val )
@ -118,7 +118,7 @@ namespace Server.SkillHandlers
if ( val <= 0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0}%</div>", val );
return $"<div align=right>{val}%</div>";
}
#region Mondain's Legacy
@ -127,7 +127,7 @@ namespace Server.SkillHandlers
if ( min <= 0 || max <= 0 )
return "<div align=right>---</div>";
return String.Format( "<div align=right>{0}-{1}</div>", min, max );
return $"<div align=right>{min}-{max}</div>";
}
#endregion
@ -143,7 +143,7 @@ namespace Server.SkillHandlers
AddImage( 118, 277, 2081 );
AddImage( 118, 347, 2083 );
AddHtml( 147, 108, 210, 18, String.Format( "<center><i>{0}</i></center>", c.Name ), false, false );
AddHtml( 147, 108, 210, 18, $"<center><i>{c.Name}</i></center>", false, false );
AddButton( 240, 77, 2093, 2093, 2, GumpButtonType.Reply, 0 );

2
Scripts/Skills/Snooping.cs
View file

@ -64,7 +64,7 @@ namespace Server.SkillHandlers
if ( map != null )
{
string message = String.Format( "You notice {0} attempting to peek into {1}'s belongings.", from.Name, root.Name );
string message = $"You notice {@from.Name} attempting to peek into {root.Name}'s belongings.";
IPooledEnumerable<NetState> eable = map.GetClientsInRange( from.Location, 8 );

2
Scripts/Skills/Stealing.cs
View file

@ -340,7 +340,7 @@ namespace Server.SkillHandlers
if ( !IsInGuild( mobRoot ) && IsInnocentTo( m_Thief, mobRoot ) )
m_Thief.CriminalAction( false );
string message = String.Format( "You notice {0} trying to steal from {1}.", m_Thief.Name, mobRoot.Name );
string message = $"You notice {m_Thief.Name} trying to steal from {mobRoot.Name}.";
foreach ( NetState ns in m_Thief.GetClientsInRange( 8 ) )
{