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

feat: Adds reflect damage ability. Fixes magical barrier (#1184)

Browse source
This commit is contained in:
Kamron Batman 2022-10-08 10:39:28 -07:00 • committed by GitHub
parent 3c5e9eaec9
commit 2806e5d4b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 86 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Projects/UOContent/Misc/AOS.cs
View file

@ -194,24 +194,35 @@ namespace Server
totalDamage = m.Hits;
}
var bcFrom = from as BaseCreature;
if (from is { Deleted: false, Alive: true })
{
var reflectPhys = AosAttributes.GetValue(m, AosAttribute.ReflectPhysical);
var reflectPhysAbility = bcFrom?.GetAbility(MonsterAbilityType.ReflectPhysicalDamage) as ReflectPhysicalDamage;
if (reflectPhys != 0 && from is BaseCreature bcFrom)
if (reflectPhysAbility
?.CanTrigger(bcFrom, MonsterAbilityTrigger.CombatAction) == true)
{
var magicalBarrier = bcFrom.GetAbility(MonsterAbilityType.MagicalBarrier);
magicalBarrier.AlterMeleeDamageFrom(bcFrom, m, ref reflectPhys);
reflectPhys += reflectPhysAbility.PercentReflected;
m.SendLocalizedMessage(1070844); // The creature repels the attack back at you.
}
if (reflectPhys != 0)
if (reflectPhys > 0)
{
var reflectDamage = Scale(
damage * phys * (100 - (ignoreArmor ? 0 : m.PhysicalResistance)) / 10000,
reflectPhys
);
from.Damage(reflectDamage, m);
bcFrom
?.GetAbility(MonsterAbilityType.MagicalBarrier)
?.AlterMeleeDamageFrom(bcFrom, m, ref reflectDamage);
if (reflectDamage > 0)
{
from.Damage(reflectDamage, m);
}
}
}