Fixes ProcChance always being a 0
This commit is contained in:
@@ -2051,6 +2051,7 @@ namespace Framework.Constants
|
|||||||
HitTarget
|
HitTarget
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Flags]
|
||||||
public enum ProcFlags
|
public enum ProcFlags
|
||||||
{
|
{
|
||||||
None = 0x0,
|
None = 0x0,
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ namespace Game.DataStorage
|
|||||||
public uint ProcTypeMask;
|
public uint ProcTypeMask;
|
||||||
public uint ProcCategoryRecovery;
|
public uint ProcCategoryRecovery;
|
||||||
public ushort CumulativeAura;
|
public ushort CumulativeAura;
|
||||||
public byte SpellProcsPerMinuteID;
|
public ushort SpellProcsPerMinuteID;
|
||||||
public byte DifficultyID;
|
public byte DifficultyID;
|
||||||
public byte ProcChance;
|
public byte ProcChance;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1920,13 +1920,14 @@ namespace Game.Entities
|
|||||||
CalcAbsorbResist(dmgInfo);
|
CalcAbsorbResist(dmgInfo);
|
||||||
damageInfo.absorb = dmgInfo.GetAbsorb();
|
damageInfo.absorb = dmgInfo.GetAbsorb();
|
||||||
damageInfo.resist = dmgInfo.GetResist();
|
damageInfo.resist = dmgInfo.GetResist();
|
||||||
damageInfo.damage = dmgInfo.GetDamage();
|
|
||||||
|
|
||||||
if (damageInfo.absorb != 0)
|
if (damageInfo.absorb != 0)
|
||||||
damageInfo.HitInfo |= (damageInfo.damage - damageInfo.absorb == 0 ? HitInfo.FullAbsorb : HitInfo.PartialAbsorb);
|
damageInfo.HitInfo |= (damageInfo.damage - damageInfo.absorb == 0 ? HitInfo.FullAbsorb : HitInfo.PartialAbsorb);
|
||||||
|
|
||||||
if (damageInfo.resist != 0)
|
if (damageInfo.resist != 0)
|
||||||
damageInfo.HitInfo |= (damageInfo.damage - damageInfo.resist == 0 ? HitInfo.FullResist : HitInfo.PartialResist);
|
damageInfo.HitInfo |= (damageInfo.damage - damageInfo.resist == 0 ? HitInfo.FullResist : HitInfo.PartialResist);
|
||||||
|
|
||||||
|
damageInfo.damage = dmgInfo.GetDamage();
|
||||||
}
|
}
|
||||||
else // Impossible get negative result but....
|
else // Impossible get negative result but....
|
||||||
damageInfo.damage = 0;
|
damageInfo.damage = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user