Replaces types with built-in types.

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

View file

@ -119,7 +119,7 @@ namespace Server.Items
{
string line = box.Topic[i];
if ( !String.IsNullOrEmpty( line ) )
if ( !string.IsNullOrEmpty( line ) )
AddLabelCropped( 30, 90 + i * 20, 340, 20, 0x3E3, line );
}

View file

@ -31,7 +31,7 @@ namespace Server.Items
{
base.OnSingleClick( from );
if ( !String.IsNullOrEmpty( m_Subtext ) )
if ( !string.IsNullOrEmpty( m_Subtext ) )
LabelTo( from, m_Subtext );
}
@ -39,7 +39,7 @@ namespace Server.Items
{
base.AddNameProperties( list );
if ( !String.IsNullOrEmpty( m_Subtext ) )
if ( !string.IsNullOrEmpty( m_Subtext ) )
list.Add( m_Subtext );
}

View file

@ -157,7 +157,7 @@ namespace Server.Items
1041361,
"",
AffixType.Append,
String.Concat(" ", m_Worth.ToString()),
string.Concat(" ", m_Worth.ToString()),
"")); // A bank check:
}

View file

@ -539,7 +539,7 @@ namespace Server.Items
public string SafeString( string v )
{
if ( v == null )
return String.Empty;
return string.Empty;
return v;
}
@ -618,7 +618,7 @@ namespace Server.Items
public string SafeString( string v )
{
if ( v == null )
return String.Empty;
return string.Empty;
return v;
}

View file

@ -216,7 +216,7 @@ namespace Server.Items
else if ( m_TargetMap == Map.Trammel )
list.Add( (House != null ? 1062453 : 1060806), RuneFormat, desc ); // ~1_val~ (Trammel)[(House)]
else
list.Add( (House != null ? "{0} ({1})(House)" : "{0} ({1})"), String.Format( RuneFormat, desc ), m_TargetMap );
list.Add( (House != null ? "{0} ({1})(House)" : "{0} ({1})"), string.Format( RuneFormat, desc ), m_TargetMap );
}
}
@ -230,15 +230,15 @@ namespace Server.Items
desc = "an unknown location";
if ( m_TargetMap == Map.Tokuno )
LabelTo( from, (House != null ? 1063260 : 1063259), String.Format( RuneFormat, desc ) ); // ~1_val~ (Tokuno Islands)[(House)]
LabelTo( from, (House != null ? 1063260 : 1063259), string.Format( RuneFormat, desc ) ); // ~1_val~ (Tokuno Islands)[(House)]
else if ( m_TargetMap == Map.Malas )
LabelTo( from, (House != null ? 1062454 : 1060804), String.Format( RuneFormat, desc ) ); // ~1_val~ (Malas)[(House)]
LabelTo( from, (House != null ? 1062454 : 1060804), string.Format( RuneFormat, desc ) ); // ~1_val~ (Malas)[(House)]
else if ( m_TargetMap == Map.Felucca )
LabelTo( from, (House != null ? 1062452 : 1060805), String.Format( RuneFormat, desc ) ); // ~1_val~ (Felucca)[(House)]
LabelTo( from, (House != null ? 1062452 : 1060805), string.Format( RuneFormat, desc ) ); // ~1_val~ (Felucca)[(House)]
else if ( m_TargetMap == Map.Trammel )
LabelTo( from, (House != null ? 1062453 : 1060806), String.Format( RuneFormat, desc ) ); // ~1_val~ (Trammel)[(House)]
LabelTo( from, (House != null ? 1062453 : 1060806), string.Format( RuneFormat, desc ) ); // ~1_val~ (Trammel)[(House)]
else
LabelTo( from, (House != null ? "{0} ({1})(House)" : "{0} ({1})"), String.Format( RuneFormat, desc ), m_TargetMap );
LabelTo( from, (House != null ? "{0} ({1})(House)" : "{0} ({1})"), string.Format( RuneFormat, desc ), m_TargetMap );
}
else
{

View file

@ -176,7 +176,7 @@ namespace Server.Items
private static string FormatDescription( HouseRaffleDeed deed )
{
if ( deed == null )
return String.Empty;
return string.Empty;
if ( deed.IsExpired )
{

View file

@ -32,7 +32,7 @@ namespace Server.Items
*level in that skill by the amount of points displayed on the scroll.
*As you may not gain skills beyond your maximum skill cap, any excess points will be lost.*/
public override string DefaultTitle => String.Format( "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>" );
public override string DefaultTitle => string.Format( "<basefont color=#FFFFFF>Scroll of Alacrity:</basefont>" );
public ScrollofAlacrity() : this( SkillName.Alchemy )
{

View file

@ -50,7 +50,7 @@ namespace Server.Items
public virtual string GetNameLocalized()
{
return String.Concat( "#", AosSkillBonuses.GetLabel( m_Skill ).ToString() );
return string.Concat( "#", AosSkillBonuses.GetLabel( m_Skill ).ToString() );
}
public virtual string GetName()

View file

@ -248,7 +248,7 @@ namespace Server.Items
if ( relay != null )
{
if ( String.IsNullOrEmpty( relay.Text ) )
if ( string.IsNullOrEmpty( relay.Text ) )
{
m_Target.EngravedText = null;
state.Mobile.SendLocalizedMessage( 1072362 ); // You remove the engraving from the object.

View file

@ -383,7 +383,7 @@ namespace Server.Items
if (Blessed)
{
if (BlessedFor != null)
list.Add(1072304, !String.IsNullOrEmpty(BlessedFor.Name) ? BlessedFor.Name : "Unnamed Warrior"); // Owned by ~1_name~
list.Add(1072304, !string.IsNullOrEmpty(BlessedFor.Name) ? BlessedFor.Name : "Unnamed Warrior"); // Owned by ~1_name~
else
list.Add(1072304, "Nobody"); // Owned by ~1_name~
}

View file

@ -2425,7 +2425,7 @@ namespace Server.Items
SetSaveFlag( ref flags, SaveFlag.SkillBonuses, !m_AosSkillBonuses.IsEmpty );
SetSaveFlag( ref flags, SaveFlag.Slayer2, m_Slayer2 != SlayerName.None );
SetSaveFlag( ref flags, SaveFlag.ElementalDamages, !m_AosElementDamages.IsEmpty );
SetSaveFlag( ref flags, SaveFlag.EngravedText, !String.IsNullOrEmpty( m_EngravedText ) );
SetSaveFlag( ref flags, SaveFlag.EngravedText, !string.IsNullOrEmpty( m_EngravedText ) );
writer.Write( (int) flags );
@ -3007,7 +3007,7 @@ namespace Server.Items
* method and engraving tool, to make it perm cleaned up.
*/
if ( !String.IsNullOrEmpty( m_EngravedText ) )
if ( !string.IsNullOrEmpty( m_EngravedText ) )
list.Add( 1062613, m_EngravedText );
/* list.Add( 1062613, Utility.FixHtml( m_EngravedText ) ); */