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

fix: Removes duplicate CheckTransform static method (#1384)

Browse source
This commit is contained in:
romanlysenko 2023-04-04 09:03:40 +03:00 • committed by GitHub
parent 5c6525de46
commit 3c86af4ff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Projects/UOContent/Items/Weapons/Abilities/InfusedThrow.cs
View file

@ -1,5 +1,6 @@
using Server.Mobiles;
using System;
using Server.Spells.Ninjitsu;
namespace Server.Items;
@ -27,7 +28,7 @@ public class InfusedThrow : WeaponAbility
IMount mount = defender.Mount;
if ((defender.Mounted || defender.Flying || Spells.Ninjitsu.AnimalForm.UnderTransformation(defender)) &&
if ((defender.Mounted || defender.Flying || AnimalForm.UnderTransformation(defender)) &&
!attacker.Mounted && !attacker.Flying && defender is not ChaosDragoon && defender is not ChaosDragoonElite)
{
defender.PlaySound(0x140);

10
Projects/UOContent/Misc/RegenRates.cs
View file

@ -41,8 +41,6 @@ namespace Server.Misc
m.CheckSkill(skill, n);
}
private static bool CheckTransform(Mobile m, Type type) => TransformationSpellHelper.UnderTransformation(m, type);
private static TimeSpan Mobile_HitsRegenRate(Mobile from)
{
var points = AosAttributes.GetValue(from, AosAttribute.RegenHits);
@ -74,7 +72,7 @@ namespace Server.Misc
points = 0;
}
if (CheckTransform(from, typeof(HorrificBeastSpell)))
if (TransformationSpellHelper.UnderTransformation(from, typeof(HorrificBeastSpell)))
{
points += 20;
}
@ -105,7 +103,7 @@ namespace Server.Misc
var cappedPoints = AosAttributes.GetValue(from, AosAttribute.RegenStam);
if (CheckTransform(from, typeof(VampiricEmbraceSpell)))
if (TransformationSpellHelper.UnderTransformation(from, typeof(VampiricEmbraceSpell)))
{
cappedPoints += 15;
}
@ -169,11 +167,11 @@ namespace Server.Misc
var cappedPoints = AosAttributes.GetValue(from, AosAttribute.RegenMana);
if (CheckTransform(from, typeof(VampiricEmbraceSpell)))
if (TransformationSpellHelper.UnderTransformation(from, typeof(VampiricEmbraceSpell)))
{
cappedPoints += 3;
}
else if (CheckTransform(from, typeof(LichFormSpell)))
else if (TransformationSpellHelper.UnderTransformation(from, typeof(LichFormSpell)))
{
cappedPoints += 13;
}