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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Projects/Scripts/Engines/MLQuests/Gumps/BaseQuestGump.cs
View file

@ -29,11 +29,11 @@ namespace Server.Engines.MLQuests.Gumps
{
private struct ButtonInfo
{
public ButtonPosition Position{ get; }
public ButtonPosition Position { get; }
public ButtonGraphic Graphic{ get; }
public ButtonGraphic Graphic { get; }
public int ButtonID{ get; }
public int ButtonID { get; }
public ButtonInfo(ButtonPosition position, ButtonGraphic graphic, int buttonID)
{
@ -47,7 +47,7 @@ namespace Server.Engines.MLQuests.Gumps
private int m_MaxPages;
private int m_Label;
private string m_Title;
private List<ButtonInfo> m_Buttons;
private readonly List<ButtonInfo> m_Buttons;
// RunUO optimized version
public BaseQuestGump(int label)
@ -76,7 +76,7 @@ namespace Server.Engines.MLQuests.Gumps
AddImageTiled(51, 479, 392, 17, 0x2775);
AddImageTiled(415, 29, 44, 450, 0xA2D);
AddImageTiled(415, 29, 30, 450, 0x28DC);
//AddLabel( 100, 50, 0x481, "" );
// AddLabel( 100, 50, 0x481, "" );
AddImage(370, 50, 0x589);
AddImage(379, 60, 0x15A9);
AddImage(425, 0, 0x28C9);
@ -123,8 +123,6 @@ namespace Server.Engines.MLQuests.Gumps
m_Buttons.Add(new ButtonInfo(position, graphic, buttonID));
}
#region Elaborate Formatting Shortcuts
public void AddDescription(MLQuest quest)
{
AddHtmlLocalized(98, 140, 312, 16, quest.IsChainTriggered || quest.NextQuest != null ? 1075024 : 1072202, 0x2710); // Description [(quest chain)]
@ -212,8 +210,6 @@ namespace Server.Engines.MLQuests.Gumps
TextDefinition.AddHtmlText(this, 98, 140, 312, 180, text, false, true, 0x15F90, 0xBDE784);
}
#endregion
/* OSI gump IDs:
* 800 - QuestOfferGump
* 801 - QuestCancelConfirmGump
@ -233,7 +229,7 @@ namespace Server.Engines.MLQuests.Gumps
pm.CloseGump<QuestRewardGump>();
pm.CloseGump<QuestConversationGump>();
pm.CloseGump<QuestReportBackGump>();
//pm.CloseGump( typeof( UnknownGump807 ) );
// pm.CloseGump( typeof( UnknownGump807 ) );
pm.CloseGump<QuestCancelConfirmGump>();
}
}

20
Projects/Scripts/Engines/MLQuests/Gumps/QuestCancelConfirmGump.cs
View file

@ -5,8 +5,8 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestCancelConfirmGump : Gump
{
private bool m_CloseGumps;
private MLQuestInstance m_Instance;
private readonly bool m_CloseGumps;
private readonly MLQuestInstance m_Instance;
public QuestCancelConfirmGump(MLQuestInstance instance, bool closeGumps = true)
: base(120, 50)
@ -82,15 +82,15 @@ namespace Server.Engines.MLQuests.Gumps
switch (info.ButtonID)
{
case 7: // Okay
{
if (info.IsSwitched(2))
m_Instance.Cancel(true);
else if (info.IsSwitched(1))
m_Instance.Cancel(false);
{
if (info.IsSwitched(2))
m_Instance.Cancel(true);
else if (info.IsSwitched(1))
m_Instance.Cancel(false);
sender.Mobile.SendGump(new QuestLogGump(m_Instance.Player, m_CloseGumps));
break;
}
sender.Mobile.SendGump(new QuestLogGump(m_Instance.Player, m_CloseGumps));
break;
}
}
}
}

30
Projects/Scripts/Engines/MLQuests/Gumps/QuestLogDetailedGump.cs
View file

@ -6,8 +6,8 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestLogDetailedGump : BaseQuestGump
{
private bool m_CloseGumps;
private MLQuestInstance m_Instance;
private readonly bool m_CloseGumps;
private readonly MLQuestInstance m_Instance;
public QuestLogDetailedGump(MLQuestInstance instance, bool closeGumps = true)
: base(1046026) // Quest Log
@ -51,23 +51,23 @@ namespace Server.Engines.MLQuests.Gumps
switch (info.ButtonID)
{
case 1: // Resign
{
// TODO: Custom reward loss protection? OSI doesn't have this
//if ( m_Instance.ClaimReward )
// pm.SendMessage( "You cannot cancel a quest with rewards pending." );
//else
{
// TODO: Custom reward loss protection? OSI doesn't have this
// if (m_Instance.ClaimReward)
// pm.SendMessage( "You cannot cancel a quest with rewards pending." );
// else
sender.Mobile.SendGump(new QuestCancelConfirmGump(m_Instance, m_CloseGumps));
sender.Mobile.SendGump(new QuestCancelConfirmGump(m_Instance, m_CloseGumps));
break;
}
break;
}
case 2: // Okay
{
sender.Mobile.SendGump(new QuestLogGump(m_Instance.Player, m_CloseGumps));
{
sender.Mobile.SendGump(new QuestLogGump(m_Instance.Player, m_CloseGumps));
break;
}
break;
}
}
}
}
}
}

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

@ -7,8 +7,8 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestLogGump : BaseQuestGump
{
private bool m_CloseGumps;
private PlayerMobile m_Owner;
private readonly bool m_CloseGumps;
private readonly PlayerMobile m_Owner;
public QuestLogGump(PlayerMobile pm, bool closeGumps = true)
: base(1046026) // Quest Log

20
Projects/Scripts/Engines/MLQuests/Gumps/QuestOfferGump.cs
View file

@ -6,8 +6,8 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestOfferGump : BaseQuestGump
{
private MLQuest m_Quest;
private IQuestGiver m_Quester;
private readonly MLQuest m_Quest;
private readonly IQuestGiver m_Quester;
public QuestOfferGump(MLQuest quest, IQuestGiver quester, PlayerMobile pm)
: base(1049010) // Quest Offer
@ -42,15 +42,15 @@ namespace Server.Engines.MLQuests.Gumps
switch (info.ButtonID)
{
case 1: // Accept
{
m_Quest.OnAccept(m_Quester, pm);
break;
}
{
m_Quest.OnAccept(m_Quester, pm);
break;
}
case 2: // Refuse
{
m_Quest.OnRefuse(m_Quester, pm);
break;
}
{
m_Quest.OnRefuse(m_Quester, pm);
break;
}
}
}
}

2
Projects/Scripts/Engines/MLQuests/Gumps/QuestReportBackGump.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestReportBackGump : BaseQuestGump
{
private MLQuestInstance m_Instance;
private readonly MLQuestInstance m_Instance;
public QuestReportBackGump(MLQuestInstance instance)
: base(3006156) // Quest Conversation

2
Projects/Scripts/Engines/MLQuests/Gumps/QuestRewardGump.cs
View file

@ -6,7 +6,7 @@ namespace Server.Engines.MLQuests.Gumps
{
public class QuestRewardGump : BaseQuestGump
{
private MLQuestInstance m_Instance;
private readonly MLQuestInstance m_Instance;
public QuestRewardGump(MLQuestInstance instance)
: base(1072201) // Reward

58
Projects/Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -20,10 +20,10 @@ namespace Server.Engines.MLQuests.Gumps
public class RaceChangeConfirmGump : Gump
{
private static Dictionary<NetState, RaceChangeState> m_Pending;
private PlayerMobile m_From;
private readonly PlayerMobile m_From;
private IRaceChanger m_Owner;
private Race m_Race;
private readonly IRaceChanger m_Owner;
private readonly Race m_Race;
public RaceChangeConfirmGump(IRaceChanger owner, PlayerMobile from, Race targetRace)
: base(50, 50)
@ -53,18 +53,18 @@ namespace Server.Engines.MLQuests.Gumps
switch (info.ButtonID)
{
case 0: // Cancel
{
m_Owner?.OnCancel(m_From);
{
m_Owner?.OnCancel(m_From);
break;
}
break;
}
case 1: // Okay
{
if (m_Owner?.CheckComplete(m_From) != false)
Offer(m_Owner, m_From, m_Race);
{
if (m_Owner?.CheckComplete(m_From) != false)
Offer(m_Owner, m_From, m_Race);
break;
}
break;
}
}
}
@ -120,13 +120,13 @@ namespace Server.Engines.MLQuests.Gumps
case Layer.Backpack:
case Layer.Mount:
case Layer.Bank:
{
continue; // ignore
}
{
continue; // ignore
}
default:
{
return true;
}
{
return true;
}
}
return false;
@ -227,9 +227,9 @@ namespace Server.Engines.MLQuests.Gumps
{
private static readonly TimeSpan m_TimeoutDelay = TimeSpan.FromMinutes(1);
public IRaceChanger m_Owner;
public Race m_TargetRace;
public Timer m_Timeout;
public readonly IRaceChanger m_Owner;
public readonly Race m_TargetRace;
public readonly Timer m_Timeout;
public RaceChangeState(IRaceChanger owner, NetState ns, Race targetRace)
{
@ -247,9 +247,9 @@ namespace Server.Engines.MLQuests.Gumps
{
EnsureCapacity(7);
m_Stream.Write((short)0x2A);
m_Stream.Write((byte)(female ? 1 : 0));
m_Stream.Write((byte)(targetRace.RaceID + 1));
Stream.Write((short)0x2A);
Stream.Write((byte)(female ? 1 : 0));
Stream.Write((byte)(targetRace.RaceID + 1));
}
}
@ -262,14 +262,12 @@ namespace Server.Engines.MLQuests.Gumps
{
EnsureCapacity(7);
m_Stream.Write((short)0x2A);
m_Stream.Write((byte)0);
m_Stream.Write((byte)0xFF);
Stream.Write((short)0x2A);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
}
}
#region For testing
public class RaceChangeDeed : Item, IRaceChanger
{
[Constructible]
@ -330,6 +328,4 @@ namespace Server.Engines.MLQuests.Gumps
int version = reader.ReadInt();
}
}
#endregion
}