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/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -59,9 +59,9 @@ namespace Server.Mobiles
public static int GetMaxStabled(Mobile from)
{
double taming = from.Skills[SkillName.AnimalTaming].Value;
double anlore = from.Skills[SkillName.AnimalLore].Value;
double vetern = from.Skills[SkillName.Veterinary].Value;
double taming = from.Skills.AnimalTaming.Value;
double anlore = from.Skills.AnimalLore.Value;
double vetern = from.Skills.Veterinary.Value;
double sklsum = taming + anlore + vetern;
int max;
@ -89,7 +89,7 @@ namespace Server.Mobiles
private void CloseClaimList(Mobile from)
{
from.CloseGump(typeof(ClaimListGump));
from.CloseGump<ClaimListGump>();
}
public void BeginClaimList(Mobile from)
@ -407,7 +407,7 @@ namespace Server.Mobiles
m_From = from;
m_List = list;
from.CloseGump(typeof(ClaimListGump));
from.CloseGump<ClaimListGump>();
AddPage(0);

4
Scripts/Mobiles/Vendors/NPC/Blacksmith.cs
View file

@ -99,7 +99,7 @@ namespace Server.Mobiles
{
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
{
double theirSkill = pm.Skills[SkillName.Blacksmith].Base;
double theirSkill = pm.Skills.Blacksmith.Base;
if (theirSkill >= 70.1)
pm.NextSmithBulkOrder = TimeSpan.FromHours(6.0);
@ -124,7 +124,7 @@ namespace Server.Mobiles
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills[SkillName.Blacksmith].Base > 0;
return from is PlayerMobile && from.Skills.Blacksmith.Base > 0;
}
public override TimeSpan GetNextBulkOrder(Mobile from)

18
Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -136,9 +136,9 @@ namespace Server.Mobiles
m_Vendor = vendor;
m_SellList = sellList;
from.CloseGump(typeof(HairstylistBuyGump));
from.CloseGump(typeof(ChangeHairHueGump));
from.CloseGump(typeof(ChangeHairstyleGump));
from.CloseGump<HairstylistBuyGump>();
from.CloseGump<ChangeHairHueGump>();
from.CloseGump<ChangeHairstyleGump>();
bool isFemale = from.Female || from.Body.IsFemale;
@ -282,9 +282,9 @@ namespace Server.Mobiles
m_FacialHair = facialHair;
m_Entries = entries;
from.CloseGump(typeof(HairstylistBuyGump));
from.CloseGump(typeof(ChangeHairHueGump));
from.CloseGump(typeof(ChangeHairstyleGump));
from.CloseGump<HairstylistBuyGump>();
from.CloseGump<ChangeHairHueGump>();
from.CloseGump<ChangeHairstyleGump>();
AddPage(0);
@ -434,9 +434,9 @@ namespace Server.Mobiles
m_FacialHair = facialHair;
m_Entries = entries;
from.CloseGump(typeof(HairstylistBuyGump));
from.CloseGump(typeof(ChangeHairHueGump));
from.CloseGump(typeof(ChangeHairstyleGump));
from.CloseGump<HairstylistBuyGump>();
from.CloseGump<ChangeHairHueGump>();
from.CloseGump<ChangeHairstyleGump>();
int tableWidth = m_FacialHair ? 2 : 3;
int tableHeight = (entries.Length + tableWidth - (m_FacialHair ? 1 : 2)) / tableWidth;

2
Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs
View file

@ -51,7 +51,7 @@ namespace Server.Mobiles
return false;
}
if (pm.Skills[SkillName.Stealing].Base < 60.0)
if (pm.Skills.Stealing.Base < 60.0)
{
SayTo(pm, 501051); // You must be at least a journeyman pickpocket to join this elite organization.
return false;

4
Scripts/Mobiles/Vendors/NPC/Tailor.cs
View file

@ -49,7 +49,7 @@ namespace Server.Mobiles
{
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
{
double theirSkill = pm.Skills[SkillName.Tailoring].Base;
double theirSkill = pm.Skills.Tailoring.Base;
if (theirSkill >= 70.1)
pm.NextTailorBulkOrder = TimeSpan.FromHours(6.0);
@ -74,7 +74,7 @@ namespace Server.Mobiles
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills[SkillName.Tailoring].Base > 0;
return from is PlayerMobile && from.Skills.Tailoring.Base > 0;
}
public override TimeSpan GetNextBulkOrder(Mobile from)

4
Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs
View file

@ -68,7 +68,7 @@ namespace Server.Mobiles
{
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
{
double theirSkill = pm.Skills[SkillName.Blacksmith].Base;
double theirSkill = pm.Skills.Blacksmith.Base;
if (theirSkill >= 70.1)
pm.NextSmithBulkOrder = TimeSpan.FromHours(6.0);
@ -93,7 +93,7 @@ namespace Server.Mobiles
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && Core.AOS && from.Skills[SkillName.Blacksmith].Base > 0;
return from is PlayerMobile && Core.AOS && from.Skills.Blacksmith.Base > 0;
}
public override TimeSpan GetNextBulkOrder(Mobile from)

4
Scripts/Mobiles/Vendors/NPC/Weaver.cs
View file

@ -49,7 +49,7 @@ namespace Server.Mobiles
{
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
{
double theirSkill = pm.Skills[SkillName.Tailoring].Base;
double theirSkill = pm.Skills.Tailoring.Base;
if (theirSkill >= 70.1)
pm.NextTailorBulkOrder = TimeSpan.FromHours(6.0);
@ -74,7 +74,7 @@ namespace Server.Mobiles
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills[SkillName.Tailoring].Base > 0;
return from is PlayerMobile && from.Skills.Tailoring.Base > 0;
}
public override TimeSpan GetNextBulkOrder(Mobile from)