Modernization Fixes & Updates to Default Values (#3)

This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions

View file

@ -23,9 +23,9 @@ namespace Server.Engines.Quests.Haven
if (qs is UzeraanTurmoilQuest)
{
QuestObjective obj = qs.FindObjective(typeof(GetDaemonBloodObjective));
QuestObjective obj = qs.FindObjective<GetDaemonBloodObjective>();
if (obj != null && !obj.Completed || UzeraanTurmoilQuest.HasLostDaemonBlood(player))
if (obj?.Completed == false || UzeraanTurmoilQuest.HasLostDaemonBlood(player))
{
Item vial = new QuestDaemonBlood();
@ -34,7 +34,7 @@ namespace Server.Engines.Quests.Haven
player.SendLocalizedMessage(1049331, "",
0x22); // You take a vial of blood from the chest and put it in your pack.
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
else

View file

@ -17,11 +17,10 @@ namespace Server.Engines.Quests.Haven
{
Direction = Direction.West;
foreach (Item item in EquipItems) DropItem(item);
foreach (Item item in EquipItems)
DropItem(item);
m_Lantern = new Lantern();
m_Lantern.Movable = false;
m_Lantern.Protected = true;
m_Lantern = new Lantern { Movable = false, Protected = true };
m_Lantern.Ignite();
}
@ -29,11 +28,12 @@ namespace Server.Engines.Quests.Haven
{
}
// TODO: What is this? Why are we creating and deleting a mobile?
private static Mobile GetOwner()
{
Mobile apprentice = new Mobile();
apprentice.Hue = Utility.RandomSkinHue();
apprentice.Hue = Race.Human.RandomSkinHue();
apprentice.Female = false;
apprentice.Body = 0x190;
apprentice.Name = NameList.RandomName("male");
@ -50,32 +50,6 @@ namespace Server.Engines.Quests.Haven
list.Add(new Robe(QuestSystem.RandomBrightHue()));
list.Add(new WizardsHat(Utility.RandomNeutralHue()));
list.Add(new Shoes(Utility.RandomNeutralHue()));
/*
int hairHue = Utility.RandomHairHue();
switch ( Utility.Random( 8 ) )
{
case 0: list.Add( new Afro( hairHue ) ); break;
case 1: list.Add( new KrisnaHair( hairHue ) ); break;
case 2: list.Add( new PageboyHair( hairHue ) ); break;
case 3: list.Add( new PonyTail( hairHue ) ); break;
case 4: list.Add( new ReceedingHair( hairHue ) ); break;
case 5: list.Add( new TwoPigTails( hairHue ) ); break;
case 6: list.Add( new ShortHair( hairHue ) ); break;
case 7: list.Add( new LongHair( hairHue ) ); break;
}
switch ( Utility.Random( 5 ) )
{
case 0: list.Add( new LongBeard( hairHue ) ); break;
case 1: list.Add( new MediumLongBeard( hairHue ) ); break;
case 2: list.Add( new Vandyke( hairHue ) ); break;
case 3: list.Add( new Mustache( hairHue ) ); break;
case 4: list.Add( new Goatee( hairHue ) ); break;
}
* */
list.Add(new Spellbook());
return list;
@ -84,7 +58,6 @@ namespace Server.Engines.Quests.Haven
private static HairInfo GetHair()
{
m_HairHue = Race.Human.RandomHairHue();
return new HairInfo(Race.Human.RandomHair(false), m_HairHue);
}
@ -131,9 +104,9 @@ namespace Server.Engines.Quests.Haven
if (qs is UzeraanTurmoilQuest)
{
QuestObjective obj = qs.FindObjective(typeof(FindApprenticeObjective));
QuestObjective obj = qs.FindObjective<FindApprenticeObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Item scroll = new SchmendrickScrollOfPower();

View file

@ -63,7 +63,7 @@ namespace Server.Engines.Quests.Haven
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective(typeof(FindDryadObjective)) != null;
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindDryadObjective>() != null;
}
public override void OnTalk(PlayerMobile player, bool contextMenu)
@ -79,9 +79,9 @@ namespace Server.Engines.Quests.Haven
}
else
{
QuestObjective obj = qs.FindObjective(typeof(FindDryadObjective));
QuestObjective obj = qs.FindObjective<FindDryadObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);

View file

@ -18,7 +18,7 @@ namespace Server.Engines.Quests.Haven
{
InitStats(100, 100, 25);
Hue = Utility.RandomSkinHue();
Hue = Race.Human.RandomSkinHue();
Female = false;
Body = 0x190;

View file

@ -22,7 +22,7 @@ namespace Server.Engines.Quests.Haven
{
InitStats(100, 125, 25);
Hue = Utility.RandomSkinHue();
Hue = Race.Human.RandomSkinHue();
Female = false;
Body = 0x190;

View file

@ -16,7 +16,7 @@ namespace Server.Engines.Quests.Haven
SpeechHue = Utility.RandomDyedHue();
Hue = Utility.RandomSkinHue();
Hue = Race.Human.RandomSkinHue();
Female = false;
Body = 0x190;

View file

@ -55,7 +55,7 @@ namespace Server.Engines.Quests.Haven
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective(typeof(FindSchmendrickObjective)) != null;
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindSchmendrickObjective>() != null;
}
public override void OnTalk(PlayerMobile player, bool contextMenu)
@ -71,9 +71,9 @@ namespace Server.Engines.Quests.Haven
}
else
{
QuestObjective obj = qs.FindObjective(typeof(FindSchmendrickObjective));
QuestObjective obj = qs.FindObjective<FindSchmendrickObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);
obj.Complete();
@ -129,7 +129,7 @@ namespace Server.Engines.Quests.Haven
m.PlaySound(0x214);
m.FixedEffect(0x376A, 10, 16);
m.CloseGump(typeof(ResurrectGump));
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, ResurrectMessage.Healer));
}
}

View file

@ -94,25 +94,25 @@ namespace Server.Engines.Quests.Haven
qs.AddConversation(new FewReagentsConversation());
}
QuestObjective obj = qs.FindObjective(typeof(FindUzeraanBeginObjective));
QuestObjective obj = qs.FindObjective<FindUzeraanBeginObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
}
else
{
obj = qs.FindObjective(typeof(FindUzeraanFirstTaskObjective));
obj = qs.FindObjective<FindUzeraanFirstTaskObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
}
else
{
obj = qs.FindObjective(typeof(FindUzeraanAboutReportObjective));
obj = qs.FindObjective<FindUzeraanAboutReportObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
@ -145,36 +145,36 @@ namespace Server.Engines.Quests.Haven
}
else
{
obj = qs.FindObjective(typeof(ReturnScrollOfPowerObjective));
obj = qs.FindObjective<ReturnScrollOfPowerObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);
SayTo(player, 1049378); // Hand me the scroll, if you have it.
}
else
{
obj = qs.FindObjective(typeof(ReturnFertileDirtObjective));
obj = qs.FindObjective<ReturnFertileDirtObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);
SayTo(player, 1049381); // Hand me the Fertile Dirt, if you have it.
}
else
{
obj = qs.FindObjective(typeof(ReturnDaemonBloodObjective));
obj = qs.FindObjective<ReturnDaemonBloodObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);
SayTo(player, 1049379); // Hand me the Vial of Blood, if you have it.
}
else
{
obj = qs.FindObjective(typeof(ReturnDaemonBoneObjective));
obj = qs.FindObjective<ReturnDaemonBoneObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
FocusTo(player);
SayTo(player, 1049380); // Hand me the Daemon Bone, if you have it.
@ -225,9 +225,9 @@ namespace Server.Engines.Quests.Haven
if (dropped is SchmendrickScrollOfPower)
{
QuestObjective obj = qs.FindObjective(typeof(ReturnScrollOfPowerObjective));
QuestObjective obj = qs.FindObjective<ReturnScrollOfPowerObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
@ -250,9 +250,9 @@ namespace Server.Engines.Quests.Haven
}
else if (dropped is QuestFertileDirt)
{
QuestObjective obj = qs.FindObjective(typeof(ReturnFertileDirtObjective));
QuestObjective obj = qs.FindObjective<ReturnFertileDirtObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
@ -294,9 +294,9 @@ namespace Server.Engines.Quests.Haven
}
else if (dropped is QuestDaemonBlood)
{
QuestObjective obj = qs.FindObjective(typeof(ReturnDaemonBloodObjective));
QuestObjective obj = qs.FindObjective<ReturnDaemonBloodObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Item reward;
@ -365,9 +365,9 @@ namespace Server.Engines.Quests.Haven
}
else if (dropped is QuestDaemonBone)
{
QuestObjective obj = qs.FindObjective(typeof(ReturnDaemonBoneObjective));
QuestObjective obj = qs.FindObjective<ReturnDaemonBoneObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
cont.DropItem(new BankCheck(2000));
@ -409,7 +409,7 @@ namespace Server.Engines.Quests.Haven
m.PlaySound(0x214);
m.FixedEffect(0x376A, 10, 16);
m.CloseGump(typeof(ResurrectGump));
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, ResurrectMessage.Healer));
}
}