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

10
Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs
View file

@ -284,12 +284,12 @@ namespace Server.Engines.MLQuests.Gumps
*/
public static void CloseOtherGumps(PlayerMobile pm)
{
pm.CloseGump(typeof(InfoNPCGump));
pm.CloseGump(typeof(QuestRewardGump));
pm.CloseGump(typeof(QuestConversationGump));
pm.CloseGump(typeof(QuestReportBackGump));
pm.CloseGump<InfoNPCGump>();
pm.CloseGump<QuestRewardGump>();
pm.CloseGump<QuestConversationGump>();
pm.CloseGump<QuestReportBackGump>();
//pm.CloseGump( typeof( UnknownGump807 ) );
pm.CloseGump(typeof(QuestCancelConfirmGump));
pm.CloseGump<QuestCancelConfirmGump>();
}
}
}

2
Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs
View file

@ -26,7 +26,7 @@ namespace Server.Engines.MLQuests.Gumps
if (closeGumps)
{
CloseOtherGumps(pm);
pm.CloseGump(typeof(QuestLogDetailedGump));
pm.CloseGump<QuestLogDetailedGump>();
}
SetTitle(quest.Title);

4
Scripts/Engines/MLQuests/Gumps/QuestLogGump.cs
View file

@ -23,8 +23,8 @@ namespace Server.Engines.MLQuests.Gumps
if (closeGumps)
{
pm.CloseGump(typeof(QuestLogGump));
pm.CloseGump(typeof(QuestLogDetailedGump));
pm.CloseGump<QuestLogGump>();
pm.CloseGump<QuestLogDetailedGump>();
}
RegisterButton(ButtonPosition.Right, ButtonGraphic.Okay, 3);

2
Scripts/Engines/MLQuests/Gumps/QuestOfferGump.cs
View file

@ -16,7 +16,7 @@ namespace Server.Engines.MLQuests.Gumps
m_Quester = quester;
CloseOtherGumps(pm);
pm.CloseGump(typeof(QuestOfferGump));
pm.CloseGump<QuestOfferGump>();
SetTitle(quest.Title);
RegisterButton(ButtonPosition.Left, ButtonGraphic.Accept, 1);

11
Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -19,8 +19,6 @@ namespace Server.Engines.MLQuests.Gumps
public class RaceChangeConfirmGump : Gump
{
public static readonly Type Type = typeof(RaceChangeConfirmGump);
private static Dictionary<NetState, RaceChangeState> m_Pending;
private PlayerMobile m_From;
@ -30,7 +28,7 @@ namespace Server.Engines.MLQuests.Gumps
public RaceChangeConfirmGump(IRaceChanger owner, PlayerMobile from, Race targetRace)
: base(50, 50)
{
from.CloseGump(Type);
from.CloseGump<RaceChangeConfirmGump>();
m_Owner = owner;
m_From = from;
@ -152,8 +150,8 @@ namespace Server.Engines.MLQuests.Gumps
from.SendLocalizedMessage(1073646); // Only the living may proceed...
else if (from.Mounted)
from.SendLocalizedMessage(1073647); // You may not continue while mounted...
else if (!from.CanBeginAction(typeof(PolymorphSpell)) || DisguiseTimers.IsDisguised(from) ||
AnimalForm.UnderTransformation(from) || !from.CanBeginAction(typeof(IncognitoSpell)) ||
else if (!from.CanBeginAction<PolymorphSpell>() || DisguiseTimers.IsDisguised(from) ||
AnimalForm.UnderTransformation(from) || !from.CanBeginAction<IncognitoSpell>() ||
from.IsBodyMod) // TODO: Does this cover everything?
from.SendLocalizedMessage(1073648); // You may only proceed while in your original state...
else if (from.Spell != null && from.Spell.IsCasting)
@ -233,7 +231,6 @@ namespace Server.Engines.MLQuests.Gumps
private class RaceChangeState
{
private static readonly TimeSpan m_TimeoutDelay = TimeSpan.FromMinutes(1);
private static readonly TimerStateCallback<NetState> m_TimeoutCallback = Timeout;
public IRaceChanger m_Owner;
public Race m_TargetRace;
@ -243,7 +240,7 @@ namespace Server.Engines.MLQuests.Gumps
{
m_Owner = owner;
m_TargetRace = targetRace;
m_Timeout = Timer.DelayCall(m_TimeoutDelay, m_TimeoutCallback, ns);
m_Timeout = Timer.DelayCall(m_TimeoutDelay, Timeout, ns);
}
}
}