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

Modernization Fixes & Updates to Default Values (#3)

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Engines/Quests/Dark Tides/Items/CrystalCaveBarrier.cs
View file

@ -30,7 +30,7 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(SpeakCavePasswordObjective));
QuestObjective obj = qs.FindObjective<SpeakCavePasswordObjective>();
if (obj != null && obj.Completed)
{

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

@ -58,9 +58,9 @@ namespace Server.Engines.Quests.Necro
{
if (pm.Map == m_WellOfTearsMap && m_WellOfTearsArea.Contains(pm))
{
QuestObjective obj = qs.FindObjective(typeof(UseCallingScrollObjective));
QuestObjective obj = qs.FindObjective<UseCallingScrollObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
Delete();

6
Scripts/Engines/Quests/Dark Tides/Items/KronusScrollBox.cs
View file

@ -31,9 +31,9 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(FindCallingScrollObjective));
QuestObjective obj = qs.FindObjective<FindCallingScrollObjective>();
if (obj != null && !obj.Completed || DarkTidesQuest.HasLostCallingScroll(from))
if (obj?.Completed == false || DarkTidesQuest.HasLostCallingScroll(from))
{
Item scroll = new KronusScroll();
@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Necro
pm.SendLocalizedMessage(1060120, "",
0x41); // You rummage through the scrolls until you find the Scroll of Calling. You quickly put it in your pack.
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
else

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

@ -34,14 +34,10 @@ namespace Server.Engines.Quests.Necro
if (Maabus != null || SpawnLocation == Point3D.Zero)
return;
foreach (MaabusCoffinComponent c in Components)
c.TurnToEmpty();
Maabus = new Maabus();
Maabus.Location = SpawnLocation;
Maabus.Map = Map;
foreach (AddonComponent c in Components)
(c as MaabusCoffinComponent)?.TurnToEmpty();
Maabus = new Maabus { Location = SpawnLocation, Map = Map };
Maabus.Direction = Maabus.GetDirectionTo(caller);
Timer.DelayCall(TimeSpan.FromSeconds(7.5), BeginSleep);

8
Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs
View file

@ -34,9 +34,9 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(RetrieveAbraxusScrollObjective));
QuestObjective obj = qs.FindObjective<RetrieveAbraxusScrollObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
}
@ -54,9 +54,9 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(ReadAbraxusScrollObjective));
QuestObjective obj = qs.FindObjective<ReadAbraxusScrollObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
}

20
Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs
View file

@ -62,9 +62,9 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(FindCrystalCaveObjective));
QuestObjective obj = qs.FindObjective<FindCrystalCaveObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
}
@ -79,17 +79,17 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(ReturnToCrystalCaveObjective));
QuestObjective obj = qs.FindObjective<ReturnToCrystalCaveObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
}
else
{
obj = qs.FindObjective(typeof(FindHorusAboutRewardObjective));
obj = qs.FindObjective<FindHorusAboutRewardObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
@ -127,8 +127,8 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(SpeakCavePasswordObjective));
bool enabled = obj != null && !obj.Completed;
QuestObjective obj = qs.FindObjective<SpeakCavePasswordObjective>();
bool enabled = obj?.Completed == false;
list.Add(new SpeakPasswordEntry(this, pm, enabled));
}
@ -141,9 +141,9 @@ namespace Server.Engines.Quests.Necro
if (qs is DarkTidesQuest)
{
QuestObjective obj = qs.FindObjective(typeof(SpeakCavePasswordObjective));
QuestObjective obj = qs.FindObjective<SpeakCavePasswordObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
return;

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

@ -90,7 +90,7 @@ namespace Server.Engines.Quests.Necro
if (!(to.Quest is DarkTidesQuest qs))
return to.Quest == null && QuestSystem.CanOfferQuest(to, typeof(DarkTidesQuest));
return qs.FindObjective(typeof(FindMardothAboutVaultObjective)) != null;
return qs.FindObjective<FindMardothAboutVaultObjective>() != null;
}
public override void OnTalk(PlayerMobile player, bool contextMenu)
@ -105,25 +105,25 @@ namespace Server.Engines.Quests.Necro
}
else
{
QuestObjective obj = qs.FindObjective(typeof(FindMardothAboutVaultObjective));
QuestObjective obj = qs.FindObjective<FindMardothAboutVaultObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
}
else
{
obj = qs.FindObjective(typeof(FindMardothAboutKronusObjective));
obj = qs.FindObjective<FindMardothAboutKronusObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
obj.Complete();
}
else
{
obj = qs.FindObjective(typeof(FindMardothEndObjective));
obj = qs.FindObjective<FindMardothEndObjective>();
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
{
Container cont = GetNewContainer();
@ -196,7 +196,7 @@ namespace Server.Engines.Quests.Necro
m.PlaySound(0x214);
m.FixedEffect(0x376A, 10, 16);
m.CloseGump(typeof(ResurrectGump));
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, ResurrectMessage.Healer));
}
}

4
Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs
View file

@ -78,7 +78,7 @@ namespace Server.Engines.Quests.Necro
{
QuestSystem qs = m_Necromancer.Quest;
if (qs is DarkTidesQuest && qs.FindObjective(typeof(FindMardothEndObjective)) == null)
if (qs is DarkTidesQuest && qs.FindObjective<FindMardothEndObjective>() == null)
qs.AddObjective(new FindMardothEndObjective(false));
Say(1060139, m_Necromancer.Name); // You have made my work easy for me, ~1_NAME~. My task here is done.
@ -113,7 +113,7 @@ namespace Server.Engines.Quests.Necro
QuestSystem qs = m_Necromancer.Quest;
if (qs is DarkTidesQuest && qs.FindObjective(typeof(FindMardothEndObjective)) == null)
if (qs is DarkTidesQuest && qs.FindObjective<FindMardothEndObjective>() == null)
qs.AddObjective(new FindMardothEndObjective(true));
}