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

2
Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs
View file

@ -272,7 +272,7 @@ namespace Server.Engines.Events
Body = from.Body;
m_From = from;
Name = String.Format( "{0}\'s Naughty Twin", from.Name );
Name = $"{@from.Name}\'s Naughty Twin";
Timer.DelayCall<Mobile>( TrickOrTreat.OneSecond, Utility.RandomBool() ? new TimerStateCallback<Mobile>( StealCandy ) : new TimerStateCallback<Mobile>( ToGate ), m_From );
}

2
Scripts/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs
View file

@ -39,7 +39,7 @@ namespace Server.Items
private void AssignRandomName()
{
Name = String.Format( "{0}'s Jack-O-Lantern", m_Staff[ Utility.Random( m_Staff.Length ) ] );
Name = $"{m_Staff[Utility.Random(m_Staff.Length)]}'s Jack-O-Lantern";
}
public override bool OnDragLift( Mobile from )

2
Scripts/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items.Holiday
{
if ( m_Staffer != null )
{
return String.Format( "{0} hand painted by {1}", MaskName, m_Staffer );
return $"{MaskName} hand painted by {m_Staffer}";
}
return MaskName;

4
Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs
View file

@ -144,7 +144,7 @@ namespace Server.Engines.Events
public PlayerBones( String name )
: base( Utility.RandomMinMax( 0x0ECA, 0x0ED2 ) )
{
Name = String.Format( "{0}'s bones", name );
Name = $"{name}'s bones";
switch( Utility.Random( 10 ) )
{
@ -190,7 +190,7 @@ namespace Server.Engines.Events
{
m_DeadPlayer = player;
Name = ( player != null ) ? String.Format( "{0}'s {1}", player.Name, m_Name ) : m_Name;
Name = ( player != null ) ? $"{player.Name}'s {m_Name}" : m_Name;
Body = 0x93;
BaseSoundID = 0x1c3;

2
Scripts/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
get
{
if ( m_Owner != null )
return String.Format( "{0}'s St. Valentine Bear", m_Owner );
return $"{m_Owner}'s St. Valentine Bear";
else
return "St. Valentine Bear";
}

4
Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs
View file

@ -40,7 +40,7 @@ namespace Server.Items
base.AddNameProperty( list );
if ( IsSigned )
list.Add( 1152273, String.Format( "{0}\t{1}", m_From, m_To ) ); // ~1_val~ is madly in love with ~2_val~
list.Add( 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
public static bool CheckSeason( Mobile from )
@ -57,7 +57,7 @@ namespace Server.Items
base.OnSingleClick( from );
if ( IsSigned )
LabelTo( from, 1152273, String.Format( "{0}\t{1}", m_From, m_To ) ); // ~1_val~ is madly in love with ~2_val~
LabelTo( from, 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
public override void OnDoubleClick( Mobile from )