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

fix: Adds name support for all mods (#1128)

Browse source
This commit is contained in:
Kamron Batman 2022-10-15 10:46:31 -07:00 • committed by GitHub
parent b1cf95f810
commit ffdc08259f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 404 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs
View file

@ -38,7 +38,7 @@ namespace Server.Items
}
else if (m_SkillMod == null && Parent is Mobile mobile)
{
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, "AncientSmithyHammer", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}
else if (m_SkillMod != null)
@ -59,7 +59,7 @@ namespace Server.Items
{
m_SkillMod?.Remove();
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, "AncientSmithyHammer", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}
}
@ -111,7 +111,7 @@ namespace Server.Items
{
m_SkillMod?.Remove();
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Blacksmith, "AncientSmithyHammer", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}

6
Projects/UOContent/Items/Special/Bulk Order Rewards/Blacksmithy/GlovesOfMining.cs
View file

@ -164,7 +164,7 @@ namespace Server.Items
}
else if (m_SkillMod == null && Parent is Mobile mobile)
{
m_SkillMod = new DefaultSkillMod(SkillName.Mining, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Mining, "MiningGloves", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}
else if (m_SkillMod != null)
@ -182,7 +182,7 @@ namespace Server.Items
{
m_SkillMod?.Remove();
m_SkillMod = new DefaultSkillMod(SkillName.Mining, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Mining, "MiningGloves", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}
}
@ -234,7 +234,7 @@ namespace Server.Items
{
m_SkillMod?.Remove();
m_SkillMod = new DefaultSkillMod(SkillName.Mining, true, m_Bonus);
m_SkillMod = new DefaultSkillMod(SkillName.Mining, "MiningGloves", true, m_Bonus);
mobile.AddSkillMod(m_SkillMod);
}
}

2
Projects/UOContent/Items/Weapons/Abilities/DefenseMastery.cs
View file

@ -36,7 +36,7 @@ namespace Server.Items
EndDefense(info);
}
var mod = new ResistanceMod(ResistanceType.Physical, 50 + modifier);
var mod = new ResistanceMod(ResistanceType.Physical, "PhysicalResistDefenseMastery", 50 + modifier);
attacker.AddResistanceMod(mod);
info = new DefenseMasteryInfo(attacker, 80 - modifier, mod);

12
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -439,7 +439,7 @@ namespace Server.Items
}
else if (m_SkillMod == null && Parent is Mobile mobile)
{
m_SkillMod = new DefaultSkillMod(AccuracySkill, true, (int)m_AccuracyLevel * 5);
m_SkillMod = new DefaultSkillMod(AccuracySkill, "WeaponAccuracy", true, (int)m_AccuracyLevel * 5);
mobile.AddSkillMod(m_SkillMod);
}
else if (m_SkillMod != null)
@ -966,7 +966,7 @@ namespace Server.Items
{
m_SkillMod?.Remove();
m_SkillMod = new DefaultSkillMod(AccuracySkill, true, (int)m_AccuracyLevel * 5);
m_SkillMod = new DefaultSkillMod(AccuracySkill, "WeaponAccuracy", true, (int)m_AccuracyLevel * 5);
from.AddSkillMod(m_SkillMod);
}
@ -974,7 +974,7 @@ namespace Server.Items
{
m_MageMod?.Remove();
m_MageMod = new DefaultSkillMod(SkillName.Magery, true, -30 + WeaponAttributes.MageWeapon);
m_MageMod = new DefaultSkillMod(SkillName.Magery, "MageWeapon", true, -30 + WeaponAttributes.MageWeapon);
from.AddSkillMod(m_MageMod);
}
@ -3944,7 +3944,7 @@ namespace Server.Items
if (UseSkillMod && m_AccuracyLevel != WeaponAccuracyLevel.Regular && parentMobile != null)
{
m_SkillMod = new DefaultSkillMod(AccuracySkill, true, (int)m_AccuracyLevel * 5);
m_SkillMod = new DefaultSkillMod(AccuracySkill, "WeaponAccuracy", true, (int)m_AccuracyLevel * 5);
parentMobile.AddSkillMod(m_SkillMod);
}
@ -3956,7 +3956,7 @@ namespace Server.Items
if (Core.AOS && WeaponAttributes.MageWeapon != 0 && WeaponAttributes.MageWeapon != 30 &&
parentMobile != null)
{
m_MageMod = new DefaultSkillMod(SkillName.Magery, true, -30 + WeaponAttributes.MageWeapon);
m_MageMod = new DefaultSkillMod(SkillName.Magery, "MageWeapon", true, -30 + WeaponAttributes.MageWeapon);
parentMobile.AddSkillMod(m_MageMod);
}
@ -4111,7 +4111,7 @@ namespace Server.Items
if (UseSkillMod && m_AccuracyLevel != WeaponAccuracyLevel.Regular && parentMobile != null)
{
m_SkillMod = new DefaultSkillMod(AccuracySkill, true, (int)m_AccuracyLevel * 5);
m_SkillMod = new DefaultSkillMod(AccuracySkill, "WeaponAccuracy", true, (int)m_AccuracyLevel * 5);
parentMobile.AddSkillMod(m_SkillMod);
}