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

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

@ -77,8 +77,7 @@ namespace Server.Engines.Quests
--Charges;
m_PlayTimer = Timer.DelayCall(TimeSpan.FromSeconds(5.0), new TimerStateCallback(PlayTimer_Callback),
from);
m_PlayTimer = Timer.DelayCall(TimeSpan.FromSeconds(5.0), () => PlayTimer_Callback(from));
}
else
{
@ -91,10 +90,8 @@ namespace Server.Engines.Quests
}
}
public virtual void PlayTimer_Callback(object state)
public virtual void PlayTimer_Callback(Mobile from)
{
Mobile from = (Mobile)state;
m_PlayTimer = null;
HornOfRetreatMoongate gate = new HornOfRetreatMoongate(DestLoc, DestMap, from, Hue);
@ -168,7 +165,7 @@ namespace Server.Engines.Quests
public override void UseGate(Mobile m)
{
if (m.Region.IsPartOf(typeof(Jail)))
if (m.Region.IsPartOf<Jail>())
{
m.SendLocalizedMessage(1114345); // You'll need a better jailbreak plan than that!
}

12
Scripts/Engines/Quests/Core/QuestConversation.cs
View file

@ -1,4 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using Server.Gumps;
using Server.Network;
@ -58,13 +58,13 @@ namespace Server.Engines.Quests
public class QuestConversationsGump : BaseQuestGump
{
private ArrayList m_Conversations;
private List<QuestConversation> m_Conversations;
public QuestConversationsGump(QuestConversation conv) : this(BuildList(conv))
public QuestConversationsGump(QuestConversation conv) : this(new List<QuestConversation>{ conv })
{
}
public QuestConversationsGump(ArrayList conversations) : base(30, 50)
public QuestConversationsGump(List<QuestConversation> conversations) : base(30, 50)
{
m_Conversations = conversations;
@ -101,7 +101,7 @@ namespace Server.Engines.Quests
for (int i = 0; i < conversations.Count; ++i)
{
QuestConversation conv = (QuestConversation)conversations[conversations.Count - 1 - i];
QuestConversation conv = conversations[conversations.Count - 1 - i];
if (i > 0)
{
@ -125,7 +125,7 @@ namespace Server.Engines.Quests
{
for (int i = m_Conversations.Count - 1; i >= 0; --i)
{
QuestConversation qc = (QuestConversation)m_Conversations[i];
QuestConversation qc = m_Conversations[i];
if (!qc.HasBeenRead)
{

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

@ -1,4 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
@ -164,13 +164,13 @@ namespace Server.Engines.Quests
public class QuestObjectivesGump : BaseQuestGump
{
private ArrayList m_Objectives;
private List<QuestObjective> m_Objectives;
public QuestObjectivesGump(QuestObjective obj) : this(BuildList(obj))
public QuestObjectivesGump(QuestObjective obj) : this(new List<QuestObjective>{ obj })
{
}
public QuestObjectivesGump(ArrayList objectives) : base(90, 50)
public QuestObjectivesGump(List<QuestObjective> objectives) : base(90, 50)
{
m_Objectives = objectives;
@ -217,7 +217,7 @@ namespace Server.Engines.Quests
for (int i = 0; i < objectives.Count; ++i)
{
QuestObjective obj = (QuestObjective)objectives[objectives.Count - 1 - i];
QuestObjective obj = objectives[objectives.Count - 1 - i];
if (i > 0)
{
@ -242,7 +242,7 @@ namespace Server.Engines.Quests
{
for (int i = m_Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = (QuestObjective)m_Objectives[i];
QuestObjective obj = m_Objectives[i];
if (!obj.HasBeenRead)
{

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

@ -44,7 +44,6 @@ namespace Server.Engines.Quests
switch (encoding)
{
default:
case 0x00: // null
{
return null;
}
@ -76,7 +75,6 @@ namespace Server.Engines.Quests
switch (encoding)
{
default:
case 0x00: // null
{
return null;
}
@ -116,7 +114,6 @@ namespace Server.Engines.Quests
switch (encoding)
{
default:
case 0x00: // null
{
return null;
}
@ -156,7 +153,6 @@ namespace Server.Engines.Quests
switch (encoding)
{
default:
case 0x00: // null
{
return null;
}

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

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.ContextMenus;
using Server.Engines.Quests.Ambitious;
@ -44,8 +43,8 @@ namespace Server.Engines.Quests
public QuestSystem(PlayerMobile from)
{
From = from;
Objectives = new ArrayList();
Conversations = new ArrayList();
Objectives = new List<QuestObjective>();
Conversations = new List<QuestConversation>();
}
public QuestSystem()
@ -64,9 +63,9 @@ namespace Server.Engines.Quests
public PlayerMobile From{ get; set; }
public ArrayList Objectives{ get; set; }
public List<QuestObjective> Objectives{ get; set; }
public ArrayList Conversations{ get; set; }
public List<QuestConversation> Conversations{ get; set; }
public virtual void StartTimer()
{
@ -87,7 +86,7 @@ namespace Server.Engines.Quests
{
for (int i = Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = (QuestObjective)Objectives[i];
QuestObjective obj = Objectives[i];
if (obj.GetTimerEvent())
obj.CheckProgress();
@ -98,7 +97,7 @@ namespace Server.Engines.Quests
{
for (int i = Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = (QuestObjective)Objectives[i];
QuestObjective obj = Objectives[i];
if (obj.GetKillEvent(creature, corpse))
obj.OnKill(creature, corpse);
@ -109,7 +108,7 @@ namespace Server.Engines.Quests
{
for (int i = Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = (QuestObjective)Objectives[i];
QuestObjective obj = Objectives[i];
if (obj.IgnoreYoungProtection(from))
return true;
@ -130,7 +129,7 @@ namespace Server.Engines.Quests
{
int count = reader.ReadEncodedInt();
Objectives = new ArrayList(count);
Objectives = new List<QuestObjective>(count);
for (int i = 0; i < count; ++i)
{
@ -145,7 +144,7 @@ namespace Server.Engines.Quests
count = reader.ReadEncodedInt();
Conversations = new ArrayList(count);
Conversations = new List<QuestConversation>(count);
for (int i = 0; i < count; ++i)
{
@ -179,12 +178,12 @@ namespace Server.Engines.Quests
writer.WriteEncodedInt(Objectives.Count);
for (int i = 0; i < Objectives.Count; ++i)
QuestSerializer.Serialize(referenceTable, (QuestObjective)Objectives[i], writer);
QuestSerializer.Serialize(referenceTable, Objectives[i], writer);
writer.WriteEncodedInt(Conversations.Count);
for (int i = 0; i < Conversations.Count; ++i)
QuestSerializer.Serialize(referenceTable, (QuestConversation)Conversations[i], writer);
QuestSerializer.Serialize(referenceTable, Conversations[i], writer);
ChildSerialize(writer);
}
@ -198,14 +197,27 @@ namespace Server.Engines.Quests
{
QuestObjective obj = FindObjective(type);
return obj != null && !obj.Completed;
return obj?.Completed == false;
}
public T FindObjective<T>() where T : QuestObjective
{
for (int i = Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = Objectives[i];
if (obj is T t)
return t;
}
return null;
}
public QuestObjective FindObjective(Type type)
{
for (int i = Objectives.Count - 1; i >= 0; --i)
{
QuestObjective obj = (QuestObjective)Objectives[i];
QuestObjective obj = Objectives[i];
if (obj.GetType() == type)
return obj;
@ -232,7 +244,7 @@ namespace Server.Engines.Quests
public virtual void ShowQuestLogUpdated()
{
From.CloseGump(typeof(QuestLogUpdatedGump));
From.CloseGump<QuestLogUpdatedGump>();
From.SendGump(new QuestLogUpdatedGump(this));
}
@ -240,14 +252,14 @@ namespace Server.Engines.Quests
{
if (Objectives.Count > 0)
{
From.CloseGump(typeof(QuestItemInfoGump));
From.CloseGump(typeof(QuestLogUpdatedGump));
From.CloseGump(typeof(QuestObjectivesGump));
From.CloseGump(typeof(QuestConversationsGump));
From.CloseGump<QuestItemInfoGump>();
From.CloseGump<QuestLogUpdatedGump>();
From.CloseGump<QuestObjectivesGump>();
From.CloseGump<QuestConversationsGump>();
From.SendGump(new QuestObjectivesGump(Objectives));
QuestObjective last = (QuestObjective)Objectives[Objectives.Count - 1];
QuestObjective last = Objectives[Objectives.Count - 1];
if (last.Info != null)
From.SendGump(new QuestItemInfoGump(last.Info));
@ -258,13 +270,13 @@ namespace Server.Engines.Quests
{
if (Conversations.Count > 0)
{
From.CloseGump(typeof(QuestItemInfoGump));
From.CloseGump(typeof(QuestObjectivesGump));
From.CloseGump(typeof(QuestConversationsGump));
From.CloseGump<QuestItemInfoGump>();
From.CloseGump<QuestObjectivesGump>();
From.CloseGump<QuestConversationsGump>();
From.SendGump(new QuestConversationsGump(Conversations));
QuestConversation last = (QuestConversation)Conversations[Conversations.Count - 1];
QuestConversation last = Conversations[Conversations.Count - 1];
if (last.Info != null)
From.SendGump(new QuestItemInfoGump(last.Info));
@ -348,14 +360,10 @@ namespace Server.Engines.Quests
if (conv.Logged)
Conversations.Add(conv);
From.CloseGump(typeof(QuestItemInfoGump));
From.CloseGump(typeof(QuestObjectivesGump));
From.CloseGump(typeof(QuestConversationsGump));
if (conv.Logged)
From.SendGump(new QuestConversationsGump(Conversations));
else
From.SendGump(new QuestConversationsGump(conv));
From.CloseGump<QuestItemInfoGump>();
From.CloseGump<QuestObjectivesGump>();
From.CloseGump<QuestConversationsGump>();
From.SendGump(conv.Logged ? new QuestConversationsGump(Conversations) : new QuestConversationsGump(conv));
if (conv.Info != null)
From.SendGump(new QuestItemInfoGump(conv.Info));
@ -387,9 +395,7 @@ namespace Server.Engines.Quests
public static bool CanOfferQuest(Mobile check, Type questType)
{
bool inRestartPeriod;
return CanOfferQuest(check, questType, out inRestartPeriod);
return CanOfferQuest(check, questType, out _);
}
public static bool CanOfferQuest(Mobile check, Type questType, out bool inRestartPeriod)
@ -399,7 +405,7 @@ namespace Server.Engines.Quests
if (!(check is PlayerMobile pm))
return false;
if (pm.HasGump(typeof(QuestOfferGump)))
if (pm.HasGump<QuestOfferGump>())
return false;
if (questType == typeof(DarkTidesQuest) && pm.Profession != 4) // necromancer
@ -653,11 +659,6 @@ namespace Server.Engines.Quests
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
public static ArrayList BuildList(object obj)
{
return new ArrayList { obj };
}
public void AddHtmlObject(int x, int y, int width, int height, object message, int color, bool back, bool scroll)
{
if (message is int html)
@ -666,4 +667,4 @@ namespace Server.Engines.Quests
AddHtml(x, y, width, height, Color(message.ToString(), C16232(color)), back, scroll);
}
}
}
}

2
Scripts/Engines/Quests/Core/Regions/CancelQuestRegion.cs
View file

@ -29,7 +29,7 @@ namespace Server.Engines.Quests
if (m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest)
{
if (!player.HasGump(typeof(QuestCancelGump)))
if (!player.HasGump<QuestCancelGump>())
player.Quest.BeginCancelQuest();
return false;

2
Scripts/Engines/Quests/Core/Regions/QuestCompleteObjectiveRegion.cs
View file

@ -30,7 +30,7 @@ namespace Server.Engines.Quests
{
QuestObjective obj = player.Quest.FindObjective(m_Objective);
if (obj != null && !obj.Completed)
if (obj?.Completed == false)
obj.Complete();
}
}