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/Factions/Gumps/FactionGump.cs
View file

@ -32,7 +32,7 @@ namespace Server.Factions
public static bool Exists(Mobile mob)
{
return mob.FindGump(typeof(FactionGump)) != null;
return mob.HasGump<FactionGump>();
}
public void AddHtmlText(int x, int y, int width, int height, TextDefinition text, bool back, bool scroll)

4
Scripts/Engines/Factions/Gumps/FactionImbueGump.cs
View file

@ -14,7 +14,6 @@ namespace Server.Factions
private Item m_Item;
private Mobile m_Mobile;
private object m_Notice;
private int m_Quality;
private BaseTool m_Tool;
public FactionImbueGump(int quality, Item item, Mobile from, CraftSystem craftSystem, BaseTool tool, object notice,
@ -26,7 +25,6 @@ namespace Server.Factions
m_CraftSystem = craftSystem;
m_Tool = tool;
m_Notice = notice;
m_Quality = quality;
m_Definition = def;
AddPage(0);
@ -38,7 +36,7 @@ namespace Server.Factions
AddHtmlLocalized(20, 60, 170, 25, 1018302, false, false); // Item quality:
AddHtmlLocalized(175, 60, 100, 25, 1018305 - m_Quality, false, false); // Exceptional, Average, Low
AddHtmlLocalized(175, 60, 100, 25, 1018305 - quality, false, false); // Exceptional, Average, Low
AddHtmlLocalized(20, 80, 170, 25, 1011572, false, false); // Item Cost :
AddLabel(175, 80, 0x34, def.SilverCost.ToString("N0")); // NOTE: Added 'N0'

4
Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
View file

@ -267,9 +267,7 @@ namespace Server.Factions
public override void OnResponse(NetState sender, RelayInfo info)
{
int type, index;
if (!FromButtonID(info.ButtonID, out type, out index))
if (!FromButtonID(info.ButtonID, out int type, out int index))
return;
switch (type)

6
Scripts/Engines/Factions/Gumps/FinanceGump.cs
View file

@ -190,9 +190,7 @@ namespace Server.Factions
return;
}
int type, index;
if (!FromButtonID(info.ButtonID, out type, out index))
if (!FromButtonID(info.ButtonID, out int type, out int index))
return;
switch (type)
@ -259,8 +257,6 @@ namespace Server.Factions
{
VendorList vendorList = vendorLists[index];
Town town = Town.FromRegion(m_From.Region);
if (Town.FromRegion(m_From.Region) != m_Town)
{
m_From.SendLocalizedMessage(1010305); // You must be in your controlled city to buy Items

1
Scripts/Engines/Factions/Gumps/SheriffGump.cs
View file

@ -153,7 +153,6 @@ namespace Server.Factions
if (index >= 0 && index < m_Town.GuardLists.Count)
{
GuardList guardList = m_Town.GuardLists[index];
Town town = Town.FromRegion(m_From.Region);
if (Town.FromRegion(m_From.Region) != m_Town)
{