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/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -55,7 +55,7 @@ namespace Server.Engines.Quests.Hag
public override void Open( Mobile from, bool checkSelfLoot )
{
if ( !from.InRange( this.GetWorldLocation(), 2 ) )
if ( !from.InRange( GetWorldLocation(), 2 ) )
return;
if ( from is PlayerMobile player )

2
Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs
View file

@ -90,7 +90,7 @@ namespace Server.Engines.Quests.Hag
private void Heave()
{
this.PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); // *hic*
PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); // *hic*
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 60, 180 ) ), new TimerCallback( Heave ) );
}

12
Scripts/Engines/Quests/Witch Apprentice/Mobiles/Grizelda.cs
View file

@ -107,7 +107,7 @@ namespace Server.Engines.Quests.Hag
cont.DropItem( new Cauldron() );
cont.DropItem( new MoonfireBrew() );
cont.DropItem( new TreasureMap( Utility.RandomMinMax( 1, 4 ), this.Map ) );
cont.DropItem( new TreasureMap( Utility.RandomMinMax( 1, 4 ), Map ) );
cont.DropItem( new Gold( 2000, 2200 ) );
if ( Utility.RandomBool() )
@ -120,9 +120,9 @@ namespace Server.Engines.Quests.Hag
}
else
{
weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 3 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 3 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 );
weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 3 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 3 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 3 );
}
cont.DropItem( weapon );
@ -145,8 +145,8 @@ namespace Server.Engines.Quests.Hag
BaseArmor armor = Loot.RandomArmorOrShield();
item = armor;
armor.ProtectionLevel = (ArmorProtectionLevel)BaseCreature.RandomMinMaxScaled( 2, 3 );
armor.Durability = (ArmorDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 3 );
armor.ProtectionLevel = (ArmorProtectionLevel)RandomMinMaxScaled( 2, 3 );
armor.Durability = (ArmorDurabilityLevel)RandomMinMaxScaled( 2, 3 );
}
cont.DropItem( item );

10
Scripts/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -314,7 +314,7 @@ namespace Server.Engines.Quests.Hag
{
get
{
IngredientInfo info = IngredientInfo.Get( this.Ingredient );
IngredientInfo info = IngredientInfo.Get( Ingredient );
return info.Quantity;
}
@ -359,7 +359,7 @@ namespace Server.Engines.Quests.Hag
{
if ( !Completed )
{
IngredientInfo info = IngredientInfo.Get( this.Ingredient );
IngredientInfo info = IngredientInfo.Get( Ingredient );
gump.AddHtmlLocalized( 70, 260, 270, 100, info.Name, BaseQuestGump.Blue, false, false );
gump.AddLabel( 70, 280, 0x64, CurProgress.ToString() );
@ -377,7 +377,7 @@ namespace Server.Engines.Quests.Hag
if ( Completed )
return false;
IngredientInfo info = IngredientInfo.Get( this.Ingredient );
IngredientInfo info = IngredientInfo.Get( Ingredient );
Type fromType = from.GetType();
for ( int i = 0; i < info.Creatures.Length; i++ )
@ -391,7 +391,7 @@ namespace Server.Engines.Quests.Hag
public override void OnKill( BaseCreature creature, Container corpse )
{
IngredientInfo info = IngredientInfo.Get( this.Ingredient );
IngredientInfo info = IngredientInfo.Get( Ingredient );
for ( int i = 0; i < info.Creatures.Length; i++ )
{
@ -410,7 +410,7 @@ namespace Server.Engines.Quests.Hag
public override void OnComplete()
{
if ( this.Ingredient != Ingredient.Whiskey )
if ( Ingredient != Ingredient.Whiskey )
{
NextStep();
}

44
Scripts/Engines/Quests/Witch Apprentice/WitchApprenticeQuest.cs
View file

@ -7,28 +7,28 @@ namespace Server.Engines.Quests.Hag
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Hag.FindApprenticeObjective ),
typeof( Hag.FindGrizeldaAboutMurderObjective ),
typeof( Hag.KillImpsObjective ),
typeof( Hag.FindZeefzorpulObjective ),
typeof( Hag.ReturnRecipeObjective ),
typeof( Hag.FindIngredientObjective ),
typeof( Hag.ReturnIngredientsObjective ),
typeof( Hag.DontOfferConversation ),
typeof( Hag.AcceptConversation ),
typeof( Hag.HagDuringCorpseSearchConversation ),
typeof( Hag.ApprenticeCorpseConversation ),
typeof( Hag.MurderConversation ),
typeof( Hag.HagDuringImpSearchConversation ),
typeof( Hag.ImpDeathConversation ),
typeof( Hag.ZeefzorpulConversation ),
typeof( Hag.RecipeConversation ),
typeof( Hag.HagDuringIngredientsConversation ),
typeof( Hag.BlackheartFirstConversation ),
typeof( Hag.BlackheartNoPirateConversation ),
typeof( Hag.BlackheartPirateConversation ),
typeof( Hag.EndConversation ),
typeof( Hag.RecentlyFinishedConversation )
typeof( FindApprenticeObjective ),
typeof( FindGrizeldaAboutMurderObjective ),
typeof( KillImpsObjective ),
typeof( FindZeefzorpulObjective ),
typeof( ReturnRecipeObjective ),
typeof( FindIngredientObjective ),
typeof( ReturnIngredientsObjective ),
typeof( DontOfferConversation ),
typeof( AcceptConversation ),
typeof( HagDuringCorpseSearchConversation ),
typeof( ApprenticeCorpseConversation ),
typeof( MurderConversation ),
typeof( HagDuringImpSearchConversation ),
typeof( ImpDeathConversation ),
typeof( ZeefzorpulConversation ),
typeof( RecipeConversation ),
typeof( HagDuringIngredientsConversation ),
typeof( BlackheartFirstConversation ),
typeof( BlackheartNoPirateConversation ),
typeof( BlackheartPirateConversation ),
typeof( EndConversation ),
typeof( RecentlyFinishedConversation )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;