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

4
Scripts/Mobiles/BaseCreature.cs
View file

@ -1022,7 +1022,7 @@ namespace Server.Mobiles
if ( suffix.Length == 0 )
suffix = "(Paragon)";
else
suffix = String.Concat( suffix, " (Paragon)" );
suffix = string.Concat( suffix, " (Paragon)" );
}
return base.ApplyNameSuffix( suffix );
@ -2796,7 +2796,7 @@ namespace Server.Mobiles
public void DebugSay( string format, params object[] args )
{
if ( m_DebugAI )
PublicOverheadMessage( MessageType.Regular, 41, false, String.Format( format, args ) );
PublicOverheadMessage( MessageType.Regular, 41, false, string.Format( format, args ) );
}
/*

2
Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs
View file

@ -75,7 +75,7 @@ namespace Server.Mobiles
"{0}!! You will pay for that!"
};
Say( true, String.Format( toSay[Utility.Random( toSay.Length )], from.Name ) );
Say( true, string.Format( toSay[Utility.Random( toSay.Length )], from.Name ) );
}
base.OnDamage( amount, from, willKill );

18
Scripts/Mobiles/PlayerMobile.cs
View file

@ -3081,7 +3081,7 @@ namespace Server.Mobiles
private static void SendToStaffMessage( Mobile from, string format, params object[] args )
{
SendToStaffMessage( from, String.Format( format, args ) );
SendToStaffMessage( from, string.Format( format, args ) );
}
public override void Damage( int amount, Mobile from )
@ -3839,19 +3839,19 @@ namespace Server.Mobiles
Faction faction = pl.Faction;
if ( faction.Commander == this )
text = String.Concat( Female ? "(Commanding Lady of the " : "(Commanding Lord of the ", faction.Definition.FriendlyName, ")" );
text = string.Concat( Female ? "(Commanding Lady of the " : "(Commanding Lord of the ", faction.Definition.FriendlyName, ")" );
else if ( pl.Sheriff != null )
text = String.Concat( "(The Sheriff of ", pl.Sheriff.Definition.FriendlyName, ", ", faction.Definition.FriendlyName, ")" );
text = string.Concat( "(The Sheriff of ", pl.Sheriff.Definition.FriendlyName, ", ", faction.Definition.FriendlyName, ")" );
else if ( pl.Finance != null )
text = String.Concat( "(The Finance Minister of ", pl.Finance.Definition.FriendlyName, ", ", faction.Definition.FriendlyName, ")" );
text = string.Concat( "(The Finance Minister of ", pl.Finance.Definition.FriendlyName, ", ", faction.Definition.FriendlyName, ")" );
else
{
ascii = true;
if ( pl.MerchantTitle != MerchantTitle.None )
text = String.Concat( "(", MerchantTitles.GetInfo( pl.MerchantTitle ).Title.String, ", ", faction.Definition.FriendlyName, ")" );
text = string.Concat( "(", MerchantTitles.GetInfo( pl.MerchantTitle ).Title.String, ", ", faction.Definition.FriendlyName, ")" );
else
text = String.Concat( "(", pl.Rank.Title.String, ", ", faction.Definition.FriendlyName, ")" );
text = string.Concat( "(", pl.Rank.Title.String, ", ", faction.Definition.FriendlyName, ")" );
}
int hue = ( Faction.Find( from ) == faction ? 98 : 38 );
@ -4341,7 +4341,7 @@ namespace Server.Mobiles
if ( suffix.Length == 0 )
suffix = "(Young)";
else
suffix = String.Concat( suffix, " (Young)" );
suffix = string.Concat( suffix, " (Young)" );
}
#region Ethics
@ -4350,7 +4350,7 @@ namespace Server.Mobiles
if ( suffix.Length == 0 )
suffix = m_EthicPlayer.Ethic.Definition.Adjunct.String;
else
suffix = String.Concat( suffix, " ", m_EthicPlayer.Ethic.Definition.Adjunct.String );
suffix = string.Concat( suffix, " ", m_EthicPlayer.Ethic.Definition.Adjunct.String );
}
#endregion
@ -4364,7 +4364,7 @@ namespace Server.Mobiles
if ( suffix.Length == 0 )
suffix = adjunct;
else
suffix = String.Concat( suffix, " ", adjunct );
suffix = string.Concat( suffix, " ", adjunct );
}
}

14
Scripts/Mobiles/Townfolk/Banker.cs
View file

@ -33,7 +33,7 @@ namespace Server.Mobiles
if (AccountGold.Enabled && m.Account != null)
{
balance = m.Account.GetTotalGold();
if (balance >= Int32.MaxValue) { return Int32.MaxValue; }
if (balance >= int.MaxValue) { return int.MaxValue; }
}
Container bank = m.FindBankNoCreate();
@ -44,11 +44,11 @@ namespace Server.Mobiles
var checks = bank.FindItemsByType<BankCheck>();
balance += gold.Aggregate(0L, (c, t) => c + t.Amount);
if (balance >= Int32.MaxValue) { return Int32.MaxValue; }
if (balance >= int.MaxValue) { return int.MaxValue; }
balance += checks.Aggregate(0L, (c, t) => c + t.Worth);
}
return Math.Max(0, (int)Math.Min(Int32.MaxValue, balance));
return Math.Max(0, (int)Math.Min(int.MaxValue, balance));
}
public static int GetBalance(Mobile m, out Item[] gold, out Item[] checks)
@ -59,10 +59,10 @@ namespace Server.Mobiles
{
balance = m.Account.GetTotalGold();
if (balance > Int32.MaxValue)
if (balance > int.MaxValue)
{
gold = checks = new Item[0];
return Int32.MaxValue;
return int.MaxValue;
}
}
@ -74,7 +74,7 @@ namespace Server.Mobiles
checks = bank.FindItemsByType(typeof(BankCheck));
balance += gold.OfType<Gold>().Aggregate(0L, (c, t) => c + t.Amount);
if (balance >= Int32.MaxValue) { return Int32.MaxValue; }
if (balance >= int.MaxValue) { return int.MaxValue; }
balance += checks.OfType<BankCheck>().Aggregate(0L, (c, t) => c + t.Worth);
}
else
@ -82,7 +82,7 @@ namespace Server.Mobiles
gold = checks = new Item[0];
}
return Math.Max(0, (int)Math.Min(Int32.MaxValue, balance));
return Math.Max(0, (int)Math.Min(int.MaxValue, balance));
}
public static bool Withdraw(Mobile from, int amount)

8
Scripts/Mobiles/Townfolk/TownCrier.cs
View file

@ -153,7 +153,7 @@ namespace Server.Mobiles
from.SendMessage( "Duration set to: {0}", ts );
from.SendMessage( "Enter the first line to shout:" );
from.Prompt = new TownCrierLinesPrompt( m_Owner, null, new List<String>(), ts );
from.Prompt = new TownCrierLinesPrompt( m_Owner, null, new List<string>(), ts );
}
public override void OnCancel( Mobile from )
@ -167,10 +167,10 @@ namespace Server.Mobiles
{
private ITownCrierEntryList m_Owner;
private TownCrierEntry m_Entry;
private List<String> m_Lines;
private List<string> m_Lines;
private TimeSpan m_Duration;
public TownCrierLinesPrompt( ITownCrierEntryList owner, TownCrierEntry entry, List<String> lines, TimeSpan duration )
public TownCrierLinesPrompt( ITownCrierEntryList owner, TownCrierEntry entry, List<string> lines, TimeSpan duration )
{
m_Owner = owner;
m_Entry = entry;
@ -235,7 +235,7 @@ namespace Server.Mobiles
m_From.SendMessage( "Editing entry #{0}.", index + 1 );
m_From.SendMessage( "Enter the first line to shout:" );
m_From.Prompt = new TownCrierLinesPrompt( m_Owner, tce, new List<String>(), ts );
m_From.Prompt = new TownCrierLinesPrompt( m_Owner, tce, new List<string>(), ts );
}
}
}

6
Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -430,12 +430,12 @@ namespace Server.Mobiles
continue;
if ( split[i].Length > 1 )
split[i] = Char.ToUpper( split[i][0] ) + split[i].Substring( 1 );
split[i] = char.ToUpper( split[i][0] ) + split[i].Substring( 1 );
else if ( split[i].Length > 0 )
split[i] = Char.ToUpper( split[i][0] ).ToString();
split[i] = char.ToUpper( split[i][0] ).ToString();
}
Title = String.Join( " ", split );
Title = string.Join( " ", split );
}
public virtual int GetHairHue()

4
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -241,7 +241,7 @@ namespace Server.Mobiles
else
item.LabelTo( from, 1043304, vi.FormattedPrice ); // Price: ~1_COST~
if ( !String.IsNullOrEmpty( vi.Description ) )
if ( !string.IsNullOrEmpty( vi.Description ) )
{
// The localized message (1043305) is no longer valid - <br>Seller's Description:<br>"~1_DESC~"
item.LabelTo( from, "Description: {0}", vi.Description );
@ -973,7 +973,7 @@ namespace Server.Mobiles
if ( vi != null )
{
string name;
if ( !String.IsNullOrEmpty( item.Name ) )
if ( !string.IsNullOrEmpty( item.Name ) )
name = item.Name;
else
name = "#" + item.LabelNumber.ToString();