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

86
Scripts/Engines/Quests/Collector/CollectorQuest.cs
View file

@ -7,49 +7,49 @@ namespace Server.Engines.Quests.Collector
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Collector.DontOfferConversation ),
typeof( Collector.DeclineConversation ),
typeof( Collector.AcceptConversation ),
typeof( Collector.ElwoodDuringFishConversation ),
typeof( Collector.ReturnPearlsConversation ),
typeof( Collector.AlbertaPaintingConversation ),
typeof( Collector.AlbertaStoolConversation ),
typeof( Collector.AlbertaEndPaintingConversation ),
typeof( Collector.AlbertaAfterPaintingConversation ),
typeof( Collector.ElwoodDuringPainting1Conversation ),
typeof( Collector.ElwoodDuringPainting2Conversation ),
typeof( Collector.ReturnPaintingConversation ),
typeof( Collector.GabrielAutographConversation ),
typeof( Collector.GabrielNoSheetMusicConversation ),
typeof( Collector.NoSheetMusicConversation ),
typeof( Collector.GetSheetMusicConversation ),
typeof( Collector.GabrielSheetMusicConversation ),
typeof( Collector.GabrielIgnoreConversation ),
typeof( Collector.ElwoodDuringAutograph1Conversation ),
typeof( Collector.ElwoodDuringAutograph2Conversation ),
typeof( Collector.ElwoodDuringAutograph3Conversation ),
typeof( Collector.ReturnAutographConversation ),
typeof( Collector.TomasToysConversation ),
typeof( Collector.TomasDuringCollectingConversation ),
typeof( Collector.ReturnImagesConversation ),
typeof( Collector.ElwoodDuringToys1Conversation ),
typeof( Collector.ElwoodDuringToys2Conversation ),
typeof( Collector.ElwoodDuringToys3Conversation ),
typeof( Collector.FullEndConversation ),
typeof( Collector.FishPearlsObjective ),
typeof( Collector.ReturnPearlsObjective ),
typeof( Collector.FindAlbertaObjective ),
typeof( Collector.SitOnTheStoolObjective ),
typeof( Collector.ReturnPaintingObjective ),
typeof( Collector.FindGabrielObjective ),
typeof( Collector.FindSheetMusicObjective ),
typeof( Collector.ReturnSheetMusicObjective ),
typeof( Collector.ReturnAutographObjective ),
typeof( Collector.FindTomasObjective ),
typeof( Collector.CaptureImagesObjective ),
typeof( Collector.ReturnImagesObjective ),
typeof( Collector.ReturnToysObjective ),
typeof( Collector.MakeRoomObjective )
typeof( DontOfferConversation ),
typeof( DeclineConversation ),
typeof( AcceptConversation ),
typeof( ElwoodDuringFishConversation ),
typeof( ReturnPearlsConversation ),
typeof( AlbertaPaintingConversation ),
typeof( AlbertaStoolConversation ),
typeof( AlbertaEndPaintingConversation ),
typeof( AlbertaAfterPaintingConversation ),
typeof( ElwoodDuringPainting1Conversation ),
typeof( ElwoodDuringPainting2Conversation ),
typeof( ReturnPaintingConversation ),
typeof( GabrielAutographConversation ),
typeof( GabrielNoSheetMusicConversation ),
typeof( NoSheetMusicConversation ),
typeof( GetSheetMusicConversation ),
typeof( GabrielSheetMusicConversation ),
typeof( GabrielIgnoreConversation ),
typeof( ElwoodDuringAutograph1Conversation ),
typeof( ElwoodDuringAutograph2Conversation ),
typeof( ElwoodDuringAutograph3Conversation ),
typeof( ReturnAutographConversation ),
typeof( TomasToysConversation ),
typeof( TomasDuringCollectingConversation ),
typeof( ReturnImagesConversation ),
typeof( ElwoodDuringToys1Conversation ),
typeof( ElwoodDuringToys2Conversation ),
typeof( ElwoodDuringToys3Conversation ),
typeof( FullEndConversation ),
typeof( FishPearlsObjective ),
typeof( ReturnPearlsObjective ),
typeof( FindAlbertaObjective ),
typeof( SitOnTheStoolObjective ),
typeof( ReturnPaintingObjective ),
typeof( FindGabrielObjective ),
typeof( FindSheetMusicObjective ),
typeof( ReturnSheetMusicObjective ),
typeof( ReturnAutographObjective ),
typeof( FindTomasObjective ),
typeof( CaptureImagesObjective ),
typeof( ReturnImagesObjective ),
typeof( ReturnToysObjective ),
typeof( MakeRoomObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

14
Scripts/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -168,7 +168,7 @@ namespace Server.Engines.Quests.Collector
public override void OnClick()
{
Mobile from = Owner.From;
if ( !m_Obsidian.Deleted && m_Obsidian.Quantity >= Obsidian.m_Partial && m_Obsidian.Quantity < Obsidian.m_Completed && m_Obsidian.IsChildOf( from.Backpack ) && from.CheckAlive() )
if ( !m_Obsidian.Deleted && m_Obsidian.Quantity >= m_Partial && m_Obsidian.Quantity < m_Completed && m_Obsidian.IsChildOf( from.Backpack ) && from.CheckAlive() )
{
for ( int i = 0; i < m_Obsidian.Quantity - 1; i++ )
from.AddToBackpack( new Obsidian() );
@ -200,27 +200,27 @@ namespace Server.Engines.Quests.Collector
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_Obsidian.Deleted || m_Obsidian.Quantity >= Obsidian.m_Completed || !(targeted is Item targ) )
if ( m_Obsidian.Deleted || m_Obsidian.Quantity >= m_Completed || !(targeted is Item targ) )
return;
if ( m_Obsidian.IsChildOf( from.Backpack ) && targ.IsChildOf( from.Backpack ) && targ is Obsidian targObsidian && targ != m_Obsidian )
{
if ( targObsidian.Quantity < Obsidian.m_Completed )
if ( targObsidian.Quantity < m_Completed )
{
if ( targObsidian.Quantity + m_Obsidian.Quantity <= Obsidian.m_Completed )
if ( targObsidian.Quantity + m_Obsidian.Quantity <= m_Completed )
{
targObsidian.Quantity += m_Obsidian.Quantity;
m_Obsidian.Delete();
}
else
{
int delta = Obsidian.m_Completed - targObsidian.Quantity;
int delta = m_Completed - targObsidian.Quantity;
targObsidian.Quantity += delta;
m_Obsidian.Quantity -= delta;
}
if ( targObsidian.Quantity >= Obsidian.m_Completed )
targObsidian.StatueName = Obsidian.RandomName( from );
if ( targObsidian.Quantity >= m_Completed )
targObsidian.StatueName = RandomName( from );
from.Send( new AsciiMessage( targObsidian.Serial, targObsidian.ItemID, MessageType.Regular, 0x59, 3, m_Obsidian.Name, "Something Happened." ) );

10
Scripts/Engines/Quests/Collector/Mobiles/ElwoodMcCarrin.cs
View file

@ -179,9 +179,9 @@ namespace Server.Engines.Quests.Collector
}
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 );
}
bag.DropItem( weapon );
@ -204,8 +204,8 @@ namespace Server.Engines.Quests.Collector
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 );
}
bag.DropItem( item );