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

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

24
Scripts/Engines/Quests/Ambitious Solen Queen/AmbitiousQueenQuest.cs
View file

@ -8,18 +8,18 @@ namespace Server.Engines.Quests.Ambitious
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Ambitious.DontOfferConversation ),
typeof( Ambitious.AcceptConversation ),
typeof( Ambitious.DuringKillQueensConversation ),
typeof( Ambitious.GatherFungiConversation ),
typeof( Ambitious.DuringFungiGatheringConversation ),
typeof( Ambitious.EndConversation ),
typeof( Ambitious.FullBackpackConversation ),
typeof( Ambitious.End2Conversation ),
typeof( Ambitious.KillQueensObjective ),
typeof( Ambitious.ReturnAfterKillsObjective ),
typeof( Ambitious.GatherFungiObjective ),
typeof( Ambitious.GetRewardObjective )
typeof( DontOfferConversation ),
typeof( AcceptConversation ),
typeof( DuringKillQueensConversation ),
typeof( GatherFungiConversation ),
typeof( DuringFungiGatheringConversation ),
typeof( EndConversation ),
typeof( FullBackpackConversation ),
typeof( End2Conversation ),
typeof( KillQueensObjective ),
typeof( ReturnAfterKillsObjective ),
typeof( GatherFungiObjective ),
typeof( GetRewardObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

10
Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs
View file

@ -30,9 +30,9 @@ namespace Server.Engines.Quests.Ambitious
public override void OnTalk( PlayerMobile player, bool contextMenu )
{
this.Direction = GetDirectionTo( player );
Direction = GetDirectionTo( player );
if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == this.RedSolen )
if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == RedSolen )
{
if ( qs.IsObjectiveInProgress( typeof( KillQueensObjective ) ) )
{
@ -78,7 +78,7 @@ namespace Server.Engines.Quests.Ambitious
}
else
{
QuestSystem newQuest = new AmbitiousQueenQuest( player, this.RedSolen );
QuestSystem newQuest = new AmbitiousQueenQuest( player, RedSolen );
if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( AmbitiousQueenQuest ) ) )
{
@ -93,11 +93,11 @@ namespace Server.Engines.Quests.Ambitious
public override bool OnDragDrop( Mobile from, Item dropped )
{
this.Direction = GetDirectionTo( from );
Direction = GetDirectionTo( from );
if ( from is PlayerMobile player )
{
if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == this.RedSolen )
if ( player.Quest is AmbitiousQueenQuest qs && qs.RedSolen == RedSolen )
{
QuestObjective obj = qs.FindObjective( typeof( GatherFungiObjective ) );

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 );

2
Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs
View file

@ -38,7 +38,7 @@ namespace Server.Engines.Quests
return false;
}
pm.SendLocalizedMessage( this.NotWorkingMessage );
pm.SendLocalizedMessage( NotWorkingMessage );
}
return base.OnMoveOver( m );

2
Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

@ -97,7 +97,7 @@ namespace Server.Engines.Quests
m_PlayTimer = null;
HornOfRetreatMoongate gate = new HornOfRetreatMoongate( this.DestLoc, this.DestMap, from, this.Hue );
HornOfRetreatMoongate gate = new HornOfRetreatMoongate( DestLoc, DestMap, from, Hue );
gate.MoveToWorld( from.Location, from.Map );

4
Scripts/Engines/Quests/Core/QuestObjective.cs
View file

@ -101,12 +101,12 @@ namespace Server.Engines.Quests
public virtual void RenderMessage( BaseQuestGump gump )
{
gump.AddHtmlObject( 70, 130, 300, 100, this.Message, BaseQuestGump.Blue, false, false );
gump.AddHtmlObject( 70, 130, 300, 100, Message, BaseQuestGump.Blue, false, false );
}
public virtual void RenderProgress( BaseQuestGump gump )
{
gump.AddHtmlObject( 70, 260, 270, 100, this.Completed ? 1049077 : 1049078, BaseQuestGump.Blue, false, false );
gump.AddHtmlObject( 70, 260, 270, 100, Completed ? 1049077 : 1049078, BaseQuestGump.Blue, false, false );
}
public virtual void CheckCompletionStatus()

8
Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -125,7 +125,7 @@ namespace Server.Engines.Quests
public virtual void BaseDeserialize( GenericReader reader )
{
Type[] referenceTable = this.TypeReferenceTable;
Type[] referenceTable = TypeReferenceTable;
int version = reader.ReadEncodedInt();
@ -177,7 +177,7 @@ namespace Server.Engines.Quests
public virtual void BaseSerialize( GenericWriter writer )
{
Type[] referenceTable = this.TypeReferenceTable;
Type[] referenceTable = TypeReferenceTable;
writer.WriteEncodedInt( (int) 0 ); // version
@ -315,7 +315,7 @@ namespace Server.Engines.Quests
{
m_From.Quest = null;
TimeSpan restartDelay = this.RestartDelay;
TimeSpan restartDelay = RestartDelay;
if ( ( completed && restartDelay > TimeSpan.Zero ) || ( !completed && restartDelay == TimeSpan.MaxValue ) )
{
@ -326,7 +326,7 @@ namespace Server.Engines.Quests
bool found = false;
Type ourQuestType = this.GetType();
Type ourQuestType = GetType();
for ( int i = 0; i < doneQuests.Count; ++i )
{

2
Scripts/Engines/Quests/Dark Tides/Conversations.cs
View file

@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Necro
public override void OnRead()
{
Container bag = Mardoth.GetNewContainer();
Container bag = BaseQuester.GetNewContainer();
bag.DropItem( new DarkTidesHorn() );

70
Scripts/Engines/Quests/Dark Tides/DarkTidesQuest.cs
View file

@ -7,41 +7,41 @@ namespace Server.Engines.Quests.Necro
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Necro.AcceptConversation ),
typeof( Necro.AnimateMaabusCorpseObjective ),
typeof( Necro.BankerConversation ),
typeof( Necro.CashBankCheckObjective ),
typeof( Necro.FetchAbraxusScrollObjective ),
typeof( Necro.FindBankObjective ),
typeof( Necro.FindCallingScrollObjective ),
typeof( Necro.FindCityOfLightObjective ),
typeof( Necro.FindCrystalCaveObjective ),
typeof( Necro.FindMaabusCorpseObjective ),
typeof( Necro.FindMaabusTombObjective ),
typeof( Necro.FindMardothAboutKronusObjective ),
typeof( Necro.FindMardothAboutVaultObjective ),
typeof( Necro.FindMardothEndObjective ),
typeof( Necro.FindVaultOfSecretsObjective ),
typeof( Necro.FindWellOfTearsObjective ),
typeof( Necro.HorusConversation ),
typeof( Necro.LostCallingScrollConversation ),
typeof( Necro.MaabasConversation ),
typeof( Necro.MardothEndConversation ),
typeof( Necro.MardothKronusConversation ),
typeof( Necro.MardothVaultConversation ),
typeof( Necro.RadarConversation ),
typeof( Necro.ReadAbraxusScrollConversation ),
typeof( Necro.ReadAbraxusScrollObjective ),
typeof( Necro.ReanimateMaabusConversation ),
typeof( Necro.RetrieveAbraxusScrollObjective ),
typeof( Necro.ReturnToCrystalCaveObjective ),
typeof( Necro.SecondHorusConversation ),
typeof( Necro.SpeakCavePasswordObjective ),
typeof( Necro.UseCallingScrollObjective ),
typeof( Necro.VaultOfSecretsConversation ),
typeof( Necro.FindHorusAboutRewardObjective ),
typeof( Necro.HealConversation ),
typeof( Necro.HorusRewardConversation )
typeof( AcceptConversation ),
typeof( AnimateMaabusCorpseObjective ),
typeof( BankerConversation ),
typeof( CashBankCheckObjective ),
typeof( FetchAbraxusScrollObjective ),
typeof( FindBankObjective ),
typeof( FindCallingScrollObjective ),
typeof( FindCityOfLightObjective ),
typeof( FindCrystalCaveObjective ),
typeof( FindMaabusCorpseObjective ),
typeof( FindMaabusTombObjective ),
typeof( FindMardothAboutKronusObjective ),
typeof( FindMardothAboutVaultObjective ),
typeof( FindMardothEndObjective ),
typeof( FindVaultOfSecretsObjective ),
typeof( FindWellOfTearsObjective ),
typeof( HorusConversation ),
typeof( LostCallingScrollConversation ),
typeof( MaabasConversation ),
typeof( MardothEndConversation ),
typeof( MardothKronusConversation ),
typeof( MardothVaultConversation ),
typeof( RadarConversation ),
typeof( ReadAbraxusScrollConversation ),
typeof( ReadAbraxusScrollObjective ),
typeof( ReanimateMaabusConversation ),
typeof( RetrieveAbraxusScrollObjective ),
typeof( ReturnToCrystalCaveObjective ),
typeof( SecondHorusConversation ),
typeof( SpeakCavePasswordObjective ),
typeof( UseCallingScrollObjective ),
typeof( VaultOfSecretsConversation ),
typeof( FindHorusAboutRewardObjective ),
typeof( HealConversation ),
typeof( HorusRewardConversation )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

10
Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs
View file

@ -103,11 +103,11 @@ namespace Server.Engines.Quests.Necro
if ( m_Step == 4 )
{
int baseX = KronusScroll.m_WellOfTearsArea.X;
int baseY = KronusScroll.m_WellOfTearsArea.Y;
int width = KronusScroll.m_WellOfTearsArea.Width;
int height = KronusScroll.m_WellOfTearsArea.Height;
Map map = KronusScroll.m_WellOfTearsMap;
int baseX = m_WellOfTearsArea.X;
int baseY = m_WellOfTearsArea.Y;
int width = m_WellOfTearsArea.Width;
int height = m_WellOfTearsArea.Height;
Map map = m_WellOfTearsMap;
Effects.SendLocationParticles( EffectItem.Create( m_Player.Location, m_Player.Map, TimeSpan.FromSeconds( 1.0 ) ), 0, 0, 0, 0x13C4 );
Effects.PlaySound( m_Player.Location, m_Player.Map, 0x243 );

6
Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs
View file

@ -141,9 +141,9 @@ namespace Server.Engines.Quests.Necro
}
else
{
weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 4 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 4 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 4 );
}
cont.DropItem( weapon );

66
Scripts/Engines/Quests/Emino's Undertaking/EminosUndertakingQuest.cs
View file

@ -7,39 +7,39 @@ namespace Server.Engines.Quests.Ninja
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Ninja.AcceptConversation ),
typeof( Ninja.FindZoelConversation ),
typeof( Ninja.RadarConversation ),
typeof( Ninja.EnterCaveConversation ),
typeof( Ninja.SneakPastGuardiansConversation ),
typeof( Ninja.NeedToHideConversation ),
typeof( Ninja.UseTeleporterConversation ),
typeof( Ninja.GiveZoelNoteConversation ),
typeof( Ninja.LostNoteConversation ),
typeof( Ninja.GainInnInformationConversation ),
typeof( Ninja.ReturnFromInnConversation ),
typeof( Ninja.SearchForSwordConversation ),
typeof( Ninja.HallwayWalkConversation ),
typeof( Ninja.ReturnSwordConversation ),
typeof( Ninja.SlayHenchmenConversation ),
typeof( Ninja.ContinueSlayHenchmenConversation ),
typeof( Ninja.GiveEminoSwordConversation ),
typeof( Ninja.LostSwordConversation ),
typeof( Ninja.EarnGiftsConversation ),
typeof( Ninja.EarnLessGiftsConversation ),
typeof( Ninja.FindEminoBeginObjective ),
typeof( Ninja.FindZoelObjective ),
typeof( Ninja.EnterCaveObjective ),
typeof( Ninja.SneakPastGuardiansObjective ),
typeof( Ninja.UseTeleporterObjective ),
typeof( Ninja.GiveZoelNoteObjective ),
typeof( Ninja.GainInnInformationObjective ),
typeof( Ninja.ReturnFromInnObjective ),
typeof( Ninja.SearchForSwordObjective ),
typeof( Ninja.HallwayWalkObjective ),
typeof( Ninja.ReturnSwordObjective ),
typeof( Ninja.SlayHenchmenObjective ),
typeof( Ninja.GiveEminoSwordObjective )
typeof( AcceptConversation ),
typeof( FindZoelConversation ),
typeof( RadarConversation ),
typeof( EnterCaveConversation ),
typeof( SneakPastGuardiansConversation ),
typeof( NeedToHideConversation ),
typeof( UseTeleporterConversation ),
typeof( GiveZoelNoteConversation ),
typeof( LostNoteConversation ),
typeof( GainInnInformationConversation ),
typeof( ReturnFromInnConversation ),
typeof( SearchForSwordConversation ),
typeof( HallwayWalkConversation ),
typeof( ReturnSwordConversation ),
typeof( SlayHenchmenConversation ),
typeof( ContinueSlayHenchmenConversation ),
typeof( GiveEminoSwordConversation ),
typeof( LostSwordConversation ),
typeof( EarnGiftsConversation ),
typeof( EarnLessGiftsConversation ),
typeof( FindEminoBeginObjective ),
typeof( FindZoelObjective ),
typeof( EnterCaveObjective ),
typeof( SneakPastGuardiansObjective ),
typeof( UseTeleporterObjective ),
typeof( GiveZoelNoteObjective ),
typeof( GainInnInformationObjective ),
typeof( ReturnFromInnObjective ),
typeof( SearchForSwordObjective ),
typeof( HallwayWalkObjective ),
typeof( ReturnSwordObjective ),
typeof( SlayHenchmenObjective ),
typeof( GiveEminoSwordObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

4
Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs
View file

@ -23,8 +23,8 @@ namespace Server.Engines.Quests.Ninja
private void GenerateTreasure()
{
for ( int i = this.Items.Count - 1; i >= 0; i-- )
this.Items[i].Delete();
for ( int i = Items.Count - 1; i >= 0; i-- )
Items[i].Delete();
for ( int i = 0; i < 75; i++ )
{

4
Scripts/Engines/Quests/Emino's Undertaking/Items/GuardianBarrier.cs
View file

@ -17,7 +17,7 @@ namespace Server.Engines.Quests.Ninja
return true;
// If the mobile is to the north of the barrier, allow him to pass
if ( this.Y >= m.Y )
if ( Y >= m.Y )
return true;
if ( m is BaseCreature creature )
@ -25,7 +25,7 @@ namespace Server.Engines.Quests.Ninja
Mobile master = creature.GetMaster();
// Allow creatures to cross from the south to the north only if their master is near to the north
return master != null && this.Y >= master.Y && master.InRange(this, 4);
return master != null && Y >= master.Y && master.InRange(this, 4);
}
if ( m is PlayerMobile pm )

72
Scripts/Engines/Quests/Haochi's Trials/HaochisTrialsQuest.cs
View file

@ -7,42 +7,42 @@ namespace Server.Engines.Quests.Samurai
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Samurai.AcceptConversation ),
typeof( Samurai.RadarConversation ),
typeof( Samurai.FirstTrialIntroConversation ),
typeof( Samurai.FirstTrialKillConversation ),
typeof( Samurai.GainKarmaConversation ),
typeof( Samurai.SecondTrialIntroConversation ),
typeof( Samurai.SecondTrialAttackConversation ),
typeof( Samurai.ThirdTrialIntroConversation ),
typeof( Samurai.ThirdTrialKillConversation ),
typeof( Samurai.FourthTrialIntroConversation ),
typeof( Samurai.FourthTrialCatsConversation ),
typeof( Samurai.FifthTrialIntroConversation ),
typeof( Samurai.FifthTrialReturnConversation ),
typeof( Samurai.LostSwordConversation ),
typeof( Samurai.SixthTrialIntroConversation ),
typeof( Samurai.SeventhTrialIntroConversation ),
typeof( Samurai.EndConversation ),
typeof( Samurai.FindHaochiObjective ),
typeof( Samurai.FirstTrialIntroObjective ),
typeof( Samurai.FirstTrialKillObjective ),
typeof( Samurai.FirstTrialReturnObjective ),
typeof( Samurai.SecondTrialIntroObjective ),
typeof( Samurai.SecondTrialAttackObjective ),
typeof( Samurai.SecondTrialReturnObjective ),
typeof( Samurai.ThirdTrialIntroObjective ),
typeof( Samurai.ThirdTrialKillObjective ),
typeof( Samurai.ThirdTrialReturnObjective ),
typeof( Samurai.FourthTrialIntroObjective ),
typeof( Samurai.FourthTrialCatsObjective ),
typeof( Samurai.FourthTrialReturnObjective ),
typeof( Samurai.FifthTrialIntroObjective ),
typeof( Samurai.FifthTrialReturnObjective ),
typeof( Samurai.SixthTrialIntroObjective ),
typeof( Samurai.SixthTrialReturnObjective ),
typeof( Samurai.SeventhTrialIntroObjective ),
typeof( Samurai.SeventhTrialReturnObjective )
typeof( AcceptConversation ),
typeof( RadarConversation ),
typeof( FirstTrialIntroConversation ),
typeof( FirstTrialKillConversation ),
typeof( GainKarmaConversation ),
typeof( SecondTrialIntroConversation ),
typeof( SecondTrialAttackConversation ),
typeof( ThirdTrialIntroConversation ),
typeof( ThirdTrialKillConversation ),
typeof( FourthTrialIntroConversation ),
typeof( FourthTrialCatsConversation ),
typeof( FifthTrialIntroConversation ),
typeof( FifthTrialReturnConversation ),
typeof( LostSwordConversation ),
typeof( SixthTrialIntroConversation ),
typeof( SeventhTrialIntroConversation ),
typeof( EndConversation ),
typeof( FindHaochiObjective ),
typeof( FirstTrialIntroObjective ),
typeof( FirstTrialKillObjective ),
typeof( FirstTrialReturnObjective ),
typeof( SecondTrialIntroObjective ),
typeof( SecondTrialAttackObjective ),
typeof( SecondTrialReturnObjective ),
typeof( ThirdTrialIntroObjective ),
typeof( ThirdTrialKillObjective ),
typeof( ThirdTrialReturnObjective ),
typeof( FourthTrialIntroObjective ),
typeof( FourthTrialCatsObjective ),
typeof( FourthTrialReturnObjective ),
typeof( FifthTrialIntroObjective ),
typeof( FifthTrialReturnObjective ),
typeof( SixthTrialIntroObjective ),
typeof( SixthTrialReturnObjective ),
typeof( SeventhTrialIntroObjective ),
typeof( SeventhTrialReturnObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

4
Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs
View file

@ -23,8 +23,8 @@ namespace Server.Engines.Quests.Samurai
private void GenerateTreasure()
{
for ( int i = this.Items.Count - 1; i >= 0; i-- )
this.Items[i].Delete();
for ( int i = Items.Count - 1; i >= 0; i-- )
Items[i].Delete();
for ( int i = 0; i < 75; i++ )
{

2
Scripts/Engines/Quests/Haochi's Trials/Items/HonorCandle.cs
View file

@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Samurai
if ( obj != null && !obj.Completed )
obj.Complete();
this.SendLocalizedMessageTo( from, 1063251 ); // You light a candle in honor.
SendLocalizedMessageTo( from, 1063251 ); // You light a candle in honor.
}
}
}

24
Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs
View file

@ -30,17 +30,17 @@ namespace Server.Engines.Quests.Matriarch
public override bool CanTalkTo( PlayerMobile to )
{
if ( SolenMatriarchQuest.IsFriend( to, this.RedSolen ) )
if ( SolenMatriarchQuest.IsFriend( to, RedSolen ) )
return true;
return to.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen;
return to.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen;
}
public override void OnTalk( PlayerMobile player, bool contextMenu )
{
this.Direction = GetDirectionTo( player );
Direction = GetDirectionTo( player );
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen )
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen )
{
if ( qs.IsObjectiveInProgress( typeof( KillInfiltratorsObjective ) ) )
{
@ -89,9 +89,9 @@ namespace Server.Engines.Quests.Matriarch
}
}
}
else if ( SolenMatriarchQuest.IsFriend( player, this.RedSolen ) )
else if ( SolenMatriarchQuest.IsFriend( player, RedSolen ) )
{
QuestSystem newQuest = new SolenMatriarchQuest( player, this.RedSolen );
QuestSystem newQuest = new SolenMatriarchQuest( player, RedSolen );
if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( SolenMatriarchQuest ) ) )
{
@ -110,13 +110,13 @@ namespace Server.Engines.Quests.Matriarch
{
if ( dropped is Seed )
{
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen )
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen )
{
SayTo( player, 1054080 ); // Thank you for that plant seed. Those have such wonderful flavor.
}
else
{
QuestSystem newQuest = new SolenMatriarchQuest( player, this.RedSolen );
QuestSystem newQuest = new SolenMatriarchQuest( player, RedSolen );
if ( player.Quest == null && QuestSystem.CanOfferQuest( player, typeof( SolenMatriarchQuest ) ) )
{
@ -124,7 +124,7 @@ namespace Server.Engines.Quests.Matriarch
}
else
{
newQuest.AddConversation( new DontOfferConversation( SolenMatriarchQuest.IsFriend( player, this.RedSolen ) ) );
newQuest.AddConversation( new DontOfferConversation( SolenMatriarchQuest.IsFriend( player, RedSolen ) ) );
}
}
@ -150,7 +150,7 @@ namespace Server.Engines.Quests.Matriarch
{
if ( from is PlayerMobile pm )
{
if ( pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen )
if ( pm.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen )
{
if ( qs.IsObjectiveInProgress( typeof( ProcessFungiObjective ) ) )
{
@ -209,9 +209,9 @@ namespace Server.Engines.Quests.Matriarch
public void OnGivenFungi( PlayerMobile player, ZoogiFungus fungi )
{
this.Direction = GetDirectionTo( player );
Direction = GetDirectionTo( player );
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == this.RedSolen )
if ( player.Quest is SolenMatriarchQuest qs && qs.RedSolen == RedSolen )
{
QuestObjective obj = qs.FindObjective( typeof( ProcessFungiObjective ) );

30
Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs
View file

@ -8,21 +8,21 @@ namespace Server.Engines.Quests.Matriarch
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Matriarch.DontOfferConversation ),
typeof( Matriarch.AcceptConversation ),
typeof( Matriarch.DuringKillInfiltratorsConversation ),
typeof( Matriarch.GatherWaterConversation ),
typeof( Matriarch.DuringWaterGatheringConversation ),
typeof( Matriarch.ProcessFungiConversation ),
typeof( Matriarch.DuringFungiProcessConversation ),
typeof( Matriarch.FullBackpackConversation ),
typeof( Matriarch.EndConversation ),
typeof( Matriarch.KillInfiltratorsObjective ),
typeof( Matriarch.ReturnAfterKillsObjective ),
typeof( Matriarch.GatherWaterObjective ),
typeof( Matriarch.ReturnAfterWaterObjective ),
typeof( Matriarch.ProcessFungiObjective ),
typeof( Matriarch.GetRewardObjective )
typeof( DontOfferConversation ),
typeof( AcceptConversation ),
typeof( DuringKillInfiltratorsConversation ),
typeof( GatherWaterConversation ),
typeof( DuringWaterGatheringConversation ),
typeof( ProcessFungiConversation ),
typeof( DuringFungiProcessConversation ),
typeof( FullBackpackConversation ),
typeof( EndConversation ),
typeof( KillInfiltratorsObjective ),
typeof( ReturnAfterKillsObjective ),
typeof( GatherWaterObjective ),
typeof( ReturnAfterWaterObjective ),
typeof( ProcessFungiObjective ),
typeof( GetRewardObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

6
Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -86,8 +86,8 @@ namespace Server.Engines.Quests.Doom
if ( Deleted )
return;
Point3D loc = this.Location;
Map map = this.Map;
Point3D loc = Location;
Map map = Map;
Effects.SendLocationParticles( EffectItem.Create( loc, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 0, 0, 2023, 0 );
Effects.PlaySound( loc, map, 0x1FE );
@ -170,7 +170,7 @@ namespace Server.Engines.Quests.Doom
Effects.SendLocationParticles( EffectItem.Create( loc, map, EffectItem.DefaultDuration ), 0x3728, 10, 10, 0, 0, 2023, 0 );
Effects.PlaySound( loc, map, 0x1FE );
BaseCreature.TeleportPets( from, loc, map );
TeleportPets( from, loc, map );
from.MoveToWorld( loc, map );
}

2
Scripts/Engines/Quests/The Summoning/Mobiles/Victoria.cs
View file

@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Doom
{
get
{
if ( m_Altar == null || m_Altar.Deleted || m_Altar.Map != this.Map || !Utility.InRange( m_Altar.Location, this.Location, AltarRange ) )
if ( m_Altar == null || m_Altar.Deleted || m_Altar.Map != Map || !Utility.InRange( m_Altar.Location, Location, AltarRange ) )
{
foreach ( Item item in GetItemsInRange( AltarRange ) )
{

8
Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs
View file

@ -8,10 +8,10 @@ namespace Server.Engines.Quests.Doom
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Doom.AcceptConversation ),
typeof( Doom.CollectBonesObjective ),
typeof( Doom.VanquishDaemonConversation ),
typeof( Doom.VanquishDaemonObjective )
typeof( AcceptConversation ),
typeof( CollectBonesObjective ),
typeof( VanquishDaemonConversation ),
typeof( VanquishDaemonObjective )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

10
Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs
View file

@ -101,7 +101,7 @@ namespace Server.Engines.Quests.Haven
if ( ItemID == 0x2006 ) // Corpse form
{
list.Add( "a human corpse" );
list.Add( 1049144, this.Name ); // the remains of ~1_NAME~ the apprentice
list.Add( 1049144, Name ); // the remains of ~1_NAME~ the apprentice
}
else
{
@ -111,7 +111,7 @@ namespace Server.Engines.Quests.Haven
public override void OnSingleClick( Mobile from )
{
int hue = Notoriety.GetHue( Server.Misc.NotorietyHandlers.CorpseNotoriety( from, this ) );
int hue = Notoriety.GetHue( Misc.NotorietyHandlers.CorpseNotoriety( from, this ) );
if ( ItemID == 0x2006 ) // Corpse form
from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, 1049144, "", Name ) ); // the remains of ~1_NAME~ the apprentice
@ -121,7 +121,7 @@ namespace Server.Engines.Quests.Haven
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 )
@ -158,13 +158,13 @@ namespace Server.Engines.Quests.Haven
public override void OnLocationChange( Point3D oldLoc )
{
if ( m_Lantern != null && !m_Lantern.Deleted )
m_Lantern.Location = new Point3D( this.X, this.Y + 1, this.Z );
m_Lantern.Location = new Point3D( X, Y + 1, Z );
}
public override void OnMapChange()
{
if ( m_Lantern != null && !m_Lantern.Deleted )
m_Lantern.Map = this.Map;
m_Lantern.Map = Map;
}
public override void OnAfterDelete()

6
Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs
View file

@ -99,7 +99,7 @@ namespace Server.Engines.Quests.Haven
if ( ItemID == 0x2006 ) // Corpse form
{
list.Add( "a human corpse" );
list.Add( 1049318, this.Name ); // the remains of ~1_NAME~ the militia fighter
list.Add( 1049318, Name ); // the remains of ~1_NAME~ the militia fighter
}
else
{
@ -109,7 +109,7 @@ namespace Server.Engines.Quests.Haven
public override void OnSingleClick( Mobile from )
{
int hue = Notoriety.GetHue( Server.Misc.NotorietyHandlers.CorpseNotoriety( from, this ) );
int hue = Notoriety.GetHue( Misc.NotorietyHandlers.CorpseNotoriety( from, this ) );
if ( ItemID == 0x2006 ) // Corpse form
from.Send( new MessageLocalized( Serial, ItemID, MessageType.Label, hue, 3, 1049318, "", Name ) ); // the remains of ~1_NAME~ the militia fighter
@ -119,7 +119,7 @@ namespace Server.Engines.Quests.Haven
public override void Open( Mobile from, bool checkSelfLoot )
{
if ( from.InRange( this.GetWorldLocation(), 2 ) )
if ( from.InRange( GetWorldLocation(), 2 ) )
{
from.SendLocalizedMessage( 1049661, "", 0x22 ); // Thinking about his sacrifice, you can't bring yourself to loot the body of this militia fighter.
}

6
Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs
View file

@ -326,9 +326,9 @@ namespace Server.Engines.Quests.Haven
}
else
{
weapon.DamageLevel = (WeaponDamageLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)BaseCreature.RandomMinMaxScaled( 2, 4 );
weapon.DamageLevel = (WeaponDamageLevel)RandomMinMaxScaled( 2, 4 );
weapon.AccuracyLevel = (WeaponAccuracyLevel)RandomMinMaxScaled( 2, 4 );
weapon.DurabilityLevel = (WeaponDurabilityLevel)RandomMinMaxScaled( 2, 4 );
}
weapon.Slayer = SlayerName.Silver;

66
Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs
View file

@ -7,39 +7,39 @@ namespace Server.Engines.Quests.Haven
{
private static Type[] m_TypeReferenceTable = new[]
{
typeof( Haven.AcceptConversation ),
typeof( Haven.UzeraanTitheConversation ),
typeof( Haven.UzeraanFirstTaskConversation ),
typeof( Haven.UzeraanReportConversation ),
typeof( Haven.SchmendrickConversation ),
typeof( Haven.UzeraanScrollOfPowerConversation ),
typeof( Haven.DryadConversation ),
typeof( Haven.UzeraanFertileDirtConversation ),
typeof( Haven.UzeraanDaemonBloodConversation ),
typeof( Haven.UzeraanDaemonBoneConversation ),
typeof( Haven.BankerConversation ),
typeof( Haven.RadarConversation ),
typeof( Haven.LostScrollOfPowerConversation ),
typeof( Haven.LostFertileDirtConversation ),
typeof( Haven.DryadAppleConversation ),
typeof( Haven.LostDaemonBloodConversation ),
typeof( Haven.LostDaemonBoneConversation ),
typeof( Haven.FindUzeraanBeginObjective ),
typeof( Haven.TitheGoldObjective ),
typeof( Haven.FindUzeraanFirstTaskObjective ),
typeof( Haven.KillHordeMinionsObjective ),
typeof( Haven.FindUzeraanAboutReportObjective ),
typeof( Haven.FindSchmendrickObjective ),
typeof( Haven.FindApprenticeObjective ),
typeof( Haven.ReturnScrollOfPowerObjective ),
typeof( Haven.FindDryadObjective ),
typeof( Haven.ReturnFertileDirtObjective ),
typeof( Haven.GetDaemonBloodObjective ),
typeof( Haven.ReturnDaemonBloodObjective ),
typeof( Haven.GetDaemonBoneObjective ),
typeof( Haven.ReturnDaemonBoneObjective ),
typeof( Haven.CashBankCheckObjective ),
typeof( Haven.FewReagentsConversation )
typeof( AcceptConversation ),
typeof( UzeraanTitheConversation ),
typeof( UzeraanFirstTaskConversation ),
typeof( UzeraanReportConversation ),
typeof( SchmendrickConversation ),
typeof( UzeraanScrollOfPowerConversation ),
typeof( DryadConversation ),
typeof( UzeraanFertileDirtConversation ),
typeof( UzeraanDaemonBloodConversation ),
typeof( UzeraanDaemonBoneConversation ),
typeof( BankerConversation ),
typeof( RadarConversation ),
typeof( LostScrollOfPowerConversation ),
typeof( LostFertileDirtConversation ),
typeof( DryadAppleConversation ),
typeof( LostDaemonBloodConversation ),
typeof( LostDaemonBoneConversation ),
typeof( FindUzeraanBeginObjective ),
typeof( TitheGoldObjective ),
typeof( FindUzeraanFirstTaskObjective ),
typeof( KillHordeMinionsObjective ),
typeof( FindUzeraanAboutReportObjective ),
typeof( FindSchmendrickObjective ),
typeof( FindApprenticeObjective ),
typeof( ReturnScrollOfPowerObjective ),
typeof( FindDryadObjective ),
typeof( ReturnFertileDirtObjective ),
typeof( GetDaemonBloodObjective ),
typeof( ReturnDaemonBloodObjective ),
typeof( GetDaemonBoneObjective ),
typeof( ReturnDaemonBoneObjective ),
typeof( CashBankCheckObjective ),
typeof( FewReagentsConversation )
};
public override Type[] TypeReferenceTable => m_TypeReferenceTable;

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;