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

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Mobiles/Townfolk/Actor.cs
View file

@ -13,17 +13,17 @@ namespace Server.Mobiles
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
AddItem( new FancyDress( Utility.RandomDyedHue() ) );
Title = "the actress";
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
AddItem( new LongPants( Utility.RandomNeutralHue() ) );
AddItem( new FancyShirt( Utility.RandomDyedHue() ) );
Title = "the actor";

10
Scripts/Mobiles/Townfolk/Artist.cs
View file

@ -20,15 +20,15 @@ namespace Server.Mobiles
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
}
AddItem( new Doublet( Utility.RandomDyedHue() ) );
AddItem( new Sandals( Utility.RandomNeutralHue() ) );

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

@ -272,7 +272,7 @@ namespace Server.Mobiles
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 12 ) )
if ( from.InRange( Location, 12 ) )
return true;
return base.HandlesOnSpeech( from );
@ -280,7 +280,7 @@ namespace Server.Mobiles
public override void OnSpeech( SpeechEventArgs e )
{
if ( !e.Handled && e.Mobile.InRange( this.Location, 12 ) )
if ( !e.Handled && e.Mobile.InRange( Location, 12 ) )
{
for ( int i = 0; i < e.Keywords.Length; ++i )
{
@ -294,7 +294,7 @@ namespace Server.Mobiles
if ( e.Mobile.Criminal )
{
this.Say( 500389 ); // I will not do business with a criminal!
Say( 500389 ); // I will not do business with a criminal!
break;
}
@ -311,11 +311,11 @@ namespace Server.Mobiles
if ( (!Core.ML && amount > 5000) || (Core.ML && amount > 60000) )
{
this.Say( 500381 ); // Thou canst not withdraw so much at one time!
Say( 500381 ); // Thou canst not withdraw so much at one time!
}
else if (pack == null || pack.Deleted || !(pack.TotalWeight < pack.MaxWeight) || !(pack.TotalItems < pack.MaxItems))
{
this.Say(1048147); // Your backpack can't hold anything else.
Say(1048147); // Your backpack can't hold anything else.
}
else if (amount > 0)
{
@ -323,13 +323,13 @@ namespace Server.Mobiles
if (box == null || !Withdraw(e.Mobile, amount))
{
this.Say(500384); // Ah, art thou trying to fool me? Thou hast not so much gold!
Say(500384); // Ah, art thou trying to fool me? Thou hast not so much gold!
}
else
{
pack.DropItem(new Gold(amount));
this.Say(1010005); // Thou hast withdrawn gold from thy account.
Say(1010005); // Thou hast withdrawn gold from thy account.
}
}
}
@ -342,17 +342,17 @@ namespace Server.Mobiles
if ( e.Mobile.Criminal )
{
this.Say( 500389 ); // I will not do business with a criminal!
Say( 500389 ); // I will not do business with a criminal!
break;
}
if ( AccountGold.Enabled && e.Mobile.Account != null )
{
this.Say( 1155855, String.Format("{0:#,0}\t{1:#,0}", e.Mobile.Account.TotalPlat, e.Mobile.Account.TotalGold) ); // Thy current bank balance is ~1_AMOUNT~ platinum and ~2_AMOUNT~ gold.
Say( 1155855, String.Format("{0:#,0}\t{1:#,0}", e.Mobile.Account.TotalPlat, e.Mobile.Account.TotalGold) ); // Thy current bank balance is ~1_AMOUNT~ platinum and ~2_AMOUNT~ gold.
}
else
{
this.Say( 1042759, GetBalance(e.Mobile).ToString("#,0") ); // Thy current bank balance is ~1_AMOUNT~ gold.
Say( 1042759, GetBalance(e.Mobile).ToString("#,0") ); // Thy current bank balance is ~1_AMOUNT~ gold.
}
break;
@ -363,7 +363,7 @@ namespace Server.Mobiles
if ( e.Mobile.Criminal )
{
this.Say( 500378 ); // Thou art a criminal and cannot access thy bank box.
Say( 500378 ); // Thou art a criminal and cannot access thy bank box.
break;
}
@ -380,7 +380,7 @@ namespace Server.Mobiles
if ( e.Mobile.Criminal )
{
this.Say( 500389 ); // I will not do business with a criminal!
Say( 500389 ); // I will not do business with a criminal!
break;
}
@ -395,11 +395,11 @@ namespace Server.Mobiles
if ( amount < 5000 )
{
this.Say( 1010006 ); // We cannot create checks for such a paltry amount of gold!
Say( 1010006 ); // We cannot create checks for such a paltry amount of gold!
}
else if ( amount > 1000000 )
{
this.Say( 1010007 ); // Our policies prevent us from creating checks worth that much!
Say( 1010007 ); // Our policies prevent us from creating checks worth that much!
}
else
{
@ -409,17 +409,17 @@ namespace Server.Mobiles
if ( !box.TryDropItem( e.Mobile, check, false ) )
{
this.Say( 500386 ); // There's not enough room in your bankbox for the check!
Say( 500386 ); // There's not enough room in your bankbox for the check!
check.Delete();
}
else if ( !box.ConsumeTotal( typeof( Gold ), amount ) )
{
this.Say( 500384 ); // Ah, art thou trying to fool me? Thou hast not so much gold!
Say( 500384 ); // Ah, art thou trying to fool me? Thou hast not so much gold!
check.Delete();
}
else
{
this.Say( 1042673, AffixType.Append, amount.ToString(), "" ); // Into your bank box I have placed a check in the amount of:
Say( 1042673, AffixType.Append, amount.ToString(), "" ); // Into your bank box I have placed a check in the amount of:
}
}
}

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

@ -282,7 +282,7 @@ namespace Server.Mobiles
if ( MLQuestSystem.Enabled )
return false;
if (from.InRange(this.Location, 3))
if (from.InRange(Location, 3))
return true;
return base.HandlesOnSpeech(from);
@ -294,7 +294,7 @@ namespace Server.Mobiles
EDI dest = GetDestination();
if (dest != null && !e.Handled && e.Mobile.InRange(this.Location, 3))
if (dest != null && !e.Handled && e.Mobile.InRange(Location, 3))
{
if (e.HasKeyword(0x1D)) // *destination*
e.Handled = SayDestinationTo(e.Mobile);
@ -377,7 +377,7 @@ namespace Server.Mobiles
if ( MLQuestSystem.Enabled || master == null )
return master;
if (master.Deleted || master.Map != this.Map || !master.InRange(Location, 30) || !master.Alive)
if (master.Deleted || master.Map != Map || !master.InRange(Location, 30) || !master.Alive)
{
StopFollow();
@ -475,7 +475,7 @@ namespace Server.Mobiles
{
pm.SendLocalizedMessage(1053004); // You must wait about a day before you can gain in compassion again.
}
else if (VirtueHelper.Award(pm, VirtueName.Compassion, this.IsPrisoner ? 400 : 200, ref gainedPath))
else if (VirtueHelper.Award(pm, VirtueName.Compassion, IsPrisoner ? 400 : 200, ref gainedPath))
{
if (gainedPath)
pm.SendLocalizedMessage(1053005); // You have achieved a path in compassion!

2
Scripts/Mobiles/Townfolk/BrideGroom.cs
View file

@ -52,7 +52,7 @@ namespace Server.Mobiles
else
HairItemID = 0x203C;
HairHue = this.Race.RandomHairHue();
HairHue = Race.RandomHairHue();
PackGold( 200, 250 );
}

10
Scripts/Mobiles/Townfolk/Gypsy.cs
View file

@ -20,10 +20,10 @@ namespace Server.Mobiles
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
AddItem( new Kilt( Utility.RandomDyedHue() ) );
AddItem( new Shirt( Utility.RandomDyedHue() ) );
AddItem( new ThighBoots() );
@ -31,8 +31,8 @@ namespace Server.Mobiles
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
AddItem( new ShortPants( Utility.RandomNeutralHue() ) );
AddItem( new Shirt( Utility.RandomDyedHue() ) );
AddItem( new Sandals() );

10
Scripts/Mobiles/Townfolk/HarborMaster.cs
View file

@ -20,16 +20,16 @@ namespace Server.Mobiles
Blessed = true;
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
Title = "the Harbor Mistress";
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
Title = "the Harbor Master";
}
AddItem( new Shirt( Utility.RandomDyedHue() ) );

10
Scripts/Mobiles/Townfolk/Sculptor.cs
View file

@ -14,16 +14,16 @@ namespace Server.Mobiles
Title = "the sculptor";
Hue = Utility.RandomSkinHue();
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
AddItem( new Kilt( Utility.RandomNeutralHue() ) );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
AddItem( new LongPants( Utility.RandomNeutralHue() ) );
}

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

@ -481,15 +481,15 @@ namespace Server.Mobiles
if ( !Core.AOS )
NameHue = 0x35;
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
}
AddItem( new FancyShirt( Utility.RandomBlueHue() ) );