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

2
Scripts/Mobiles/Vendors/NPC/Alchemist.cs
View file

@ -27,7 +27,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) );
AddItem( new Items.Robe( Utility.RandomPinkHue() ) );
}
public Alchemist( Serial serial ) : base( serial )

6
Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -215,7 +215,7 @@ namespace Server.Mobiles
public void EndClaimList( Mobile from, BaseCreature pet )
{
if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
if ( pet == null || pet.Deleted || from.Map != Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
return;
if ( !from.InRange( this, 14 ) )
@ -322,7 +322,7 @@ namespace Server.Mobiles
pet.StabledBy = from;
if ( Core.SE )
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy
pet.Loyalty = MaxLoyalty; // Wonderfully happy
from.Stabled.Add( pet );
@ -416,7 +416,7 @@ namespace Server.Mobiles
pet.StabledBy = null;
if ( Core.SE )
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully Happy
pet.Loyalty = MaxLoyalty; // Wonderfully Happy
}
public override bool HandlesOnSpeech( Mobile from )

4
Scripts/Mobiles/Vendors/NPC/Armorer.cs
View file

@ -66,8 +66,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron( Utility.RandomYellowHue() ) );
AddItem( new Server.Items.Bascinet() );
AddItem( new Items.HalfApron( Utility.RandomYellowHue() ) );
AddItem( new Items.Bascinet() );
}
public Armorer( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Blacksmith.cs
View file

@ -58,7 +58,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() );
if ( item != null && !EquipItem( item ) )
{
@ -67,10 +67,10 @@ namespace Server.Mobiles
}
if ( item == null )
AddItem( new Server.Items.FullApron() );
AddItem( new Items.FullApron() );
AddItem( new Server.Items.Bascinet() );
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.Bascinet() );
AddItem( new Items.SmithHammer() );
}
#region Bulk Orders

4
Scripts/Mobiles/Vendors/NPC/Bowyer.cs
View file

@ -26,8 +26,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Bow() );
AddItem( new Server.Items.LeatherGorget() );
AddItem( new Items.Bow() );
AddItem( new Items.LeatherGorget() );
}
public override void InitSBInfo()

4
Scripts/Mobiles/Vendors/NPC/Butcher.cs
View file

@ -22,8 +22,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Server.Items.Cleaver() );
AddItem( new Items.HalfApron() );
AddItem( new Items.Cleaver() );
}
public Butcher( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Carpenter.cs
View file

@ -30,7 +30,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Carpenter( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Cook.cs
View file

@ -28,7 +28,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Cook( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -65,7 +65,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) );
AddItem( new Items.Robe( Utility.RandomPinkHue() ) );
}
public override void InitSBInfo()

2
Scripts/Mobiles/Vendors/NPC/Farmer.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.WideBrimHat( Utility.RandomNeutralHue() ) );
AddItem( new Items.WideBrimHat( Utility.RandomNeutralHue() ) );
}
public Farmer( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Fisherman.cs
View file

@ -24,7 +24,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.FishingPole() );
AddItem( new Items.FishingPole() );
}
public Fisherman( Serial serial ) : base( serial )

14
Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -47,14 +47,14 @@ namespace Server.Mobiles
public virtual bool WasNamed( string speech )
{
string name = this.Name;
string name = Name;
return ( name != null && Insensitive.StartsWith( speech, name ) );
}
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 2 ) )
if ( from.InRange( Location, 2 ) )
return true;
return base.HandlesOnSpeech( from );
@ -64,13 +64,13 @@ namespace Server.Mobiles
{
Mobile from = e.Mobile;
if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && WasNamed( e.Speech ) )
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && WasNamed( e.Speech ) )
{
PlayerMobile pm = (PlayerMobile)from;
if ( e.HasKeyword( 0x0004 ) ) // *join* | *member*
{
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
SayTo( from, 501047 ); // Thou art already a member of our guild.
else if ( pm.NpcGuild != NpcGuild.None )
SayTo( from, 501046 ); // Thou must resign from thy other guild first.
@ -83,7 +83,7 @@ namespace Server.Mobiles
}
else if ( e.HasKeyword( 0x0005 ) ) // *resign* | *quit*
{
if ( pm.NpcGuild != this.NpcGuild )
if ( pm.NpcGuild != NpcGuild )
{
SayTo( from, 501052 ); // Thou dost not belong to my guild!
}
@ -110,7 +110,7 @@ namespace Server.Mobiles
{
PlayerMobile pm = (PlayerMobile)from;
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
{
SayTo( from, 501047 ); // Thou art already a member of our guild.
}
@ -126,7 +126,7 @@ namespace Server.Mobiles
{
SayWelcomeTo( from );
pm.NpcGuild = this.NpcGuild;
pm.NpcGuild = NpcGuild;
pm.NpcGuildJoinTime = DateTime.UtcNow;
pm.NpcGuildGameTime = pm.GameTime;

8
Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs
View file

@ -27,7 +27,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() );
if ( item != null && !EquipItem( item ) )
{
@ -36,10 +36,10 @@ namespace Server.Mobiles
}
if ( item == null )
AddItem( new Server.Items.FullApron() );
AddItem( new Items.FullApron() );
AddItem( new Server.Items.Bascinet() );
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.Bascinet() );
AddItem( new Items.SmithHammer() );
}
public BlacksmithGuildmaster( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs
View file

@ -20,7 +20,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomYellowHue() ) );
AddItem( new Items.Robe( Utility.RandomYellowHue() ) );
}
public HealerGuildmaster( Serial serial ) : base( serial )

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs
View file

@ -22,8 +22,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Server.Items.GnarledStaff() );
AddItem( new Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Items.GnarledStaff() );
}
public MageGuildmaster( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs
View file

@ -28,9 +28,9 @@ namespace Server.Mobiles
base.InitOutfit();
if ( Utility.RandomBool() )
AddItem( new Server.Items.Kryss() );
AddItem( new Kryss() );
else
AddItem( new Server.Items.Dagger() );
AddItem( new Dagger() );
}
public override bool CheckCustomReqs( PlayerMobile pm )
@ -61,7 +61,7 @@ namespace Server.Mobiles
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 2 ) )
if ( from.InRange( Location, 2 ) )
return true;
return base.HandlesOnSpeech( from );
@ -71,7 +71,7 @@ namespace Server.Mobiles
{
Mobile from = e.Mobile;
if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise*
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise*
{
PlayerMobile pm = (PlayerMobile)from;

2
Scripts/Mobiles/Vendors/NPC/IronWorker.cs
View file

@ -46,7 +46,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new RingmailChest() );
if ( item != null && !EquipItem( item ) )
{

2
Scripts/Mobiles/Vendors/NPC/Mage.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Items.Robe( Utility.RandomBlueHue() ) );
}
public Mage( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Miner.cs
View file

@ -22,10 +22,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.FancyShirt( 0x3E4 ) );
AddItem( new Server.Items.LongPants( 0x192 ) );
AddItem( new Server.Items.Pickaxe() );
AddItem( new Server.Items.ThighBoots( 0x283 ) );
AddItem( new Items.FancyShirt( 0x3E4 ) );
AddItem( new Items.LongPants( 0x192 ) );
AddItem( new Items.Pickaxe() );
AddItem( new Items.ThighBoots( 0x283 ) );
}
public Miner( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Ranger.cs
View file

@ -27,10 +27,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.Bow() );
AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) );
AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Items.Bow() );
AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) );
}
public Ranger( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Scribe.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomNeutralHue() ) );
AddItem( new Items.Robe( Utility.RandomNeutralHue() ) );
}
public override bool HandlesOnSpeech( Mobile from )

2
Scripts/Mobiles/Vendors/NPC/Shipwright.cs
View file

@ -23,7 +23,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.SmithHammer() );
}
public Shipwright( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs
View file

@ -21,7 +21,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public TavernKeeper( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Thief.cs
View file

@ -27,10 +27,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.Dagger() );
AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) );
AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Items.Dagger() );
AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) );
}
public Thief( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Waiter.cs
View file

@ -22,7 +22,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Waiter( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs
View file

@ -39,7 +39,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
#region Bulk Orders