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

106
Projects/Server/Mobiles/Mobile.cs
View file

@ -5761,6 +5761,11 @@ namespace Server
public virtual void Damage(int amount, Mobile from = null, bool informMount = true)
{
if (amount <= 0)
{
return;
}
if (!CanBeDamaged() || Deleted)
{
return;
@ -5771,67 +5776,64 @@ namespace Server
return;
}
if (amount > 0)
var oldHits = Hits;
var newHits = oldHits - amount;
m_Spell?.OnCasterHurt();
// if (m_Spell != null && m_Spell.State == SpellState.Casting)
// m_Spell.Disturb( DisturbType.Hurt, false, true );
if (from != null)
{
var oldHits = Hits;
var newHits = oldHits - amount;
RegisterDamage(amount, from);
}
m_Spell?.OnCasterHurt();
DisruptiveAction();
// if (m_Spell != null && m_Spell.State == SpellState.Casting)
// m_Spell.Disturb( DisturbType.Hurt, false, true );
Paralyzed = false;
if (from != null)
{
RegisterDamage(amount, from);
}
DisruptiveAction();
Paralyzed = false;
switch (VisibleDamageType)
{
case VisibleDamageType.Related:
{
SendVisibleDamageRelated(from, amount);
break;
}
case VisibleDamageType.Everyone:
{
SendVisibleDamageEveryone(amount);
break;
}
case VisibleDamageType.Selective:
{
SendVisibleDamageSelective(from, amount);
break;
}
}
OnDamage(amount, from, newHits < 0);
if (informMount)
{
Mount?.OnRiderDamaged(amount, from, newHits < 0);
}
if (newHits < 0)
{
LastKiller = from;
Hits = 0;
if (oldHits >= 0)
switch (VisibleDamageType)
{
case VisibleDamageType.Related:
{
Kill();
SendVisibleDamageRelated(from, amount);
break;
}
}
else
case VisibleDamageType.Everyone:
{
SendVisibleDamageEveryone(amount);
break;
}
case VisibleDamageType.Selective:
{
SendVisibleDamageSelective(from, amount);
break;
}
}
OnDamage(amount, from, newHits < 0);
if (informMount)
{
Mount?.OnRiderDamaged(amount, from, newHits < 0);
}
if (newHits < 0)
{
LastKiller = from;
Hits = 0;
if (oldHits >= 0)
{
Hits = newHits;
Kill();
}
}
else
{
Hits = newHits;
}
}
public void SendVisibleDamageRelated(Mobile from, int amount)