pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into shieldability

Browse Source
This commit is contained in:
KayenEQ
2021-08-12 22:12:42 -04:00
parent aca19533e0 c821397367
commit 3a4727eaa7
9 changed files with 89 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+20
View File
@@ -472,6 +472,8 @@ Mob::Mob(
AssistAggro = false;
npc_assist_cap = 0;
use_double_melee_round_dmg_bonus = false;
#ifdef BOTS
m_manual_follow = false;
#endif
@@ -4842,6 +4844,10 @@ int16 Mob::GetMeleeDamageMod_SE(uint16 skill)
dmg_mod += itembonuses.DamageModifier3[EQ::skills::HIGHEST_SKILL + 1] + spellbonuses.DamageModifier3[EQ::skills::HIGHEST_SKILL + 1] + aabonuses.DamageModifier3[EQ::skills::HIGHEST_SKILL + 1] +
itembonuses.DamageModifier3[skill] + spellbonuses.DamageModifier3[skill] + aabonuses.DamageModifier3[skill];
if (GetUseDoubleMeleeRoundDmgBonus()) {
dmg_mod += itembonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_DMG_BONUS] + spellbonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_DMG_BONUS] + aabonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_DMG_BONUS];
}
if(dmg_mod < -100)
dmg_mod = -100;
@@ -4965,6 +4971,20 @@ void Mob::MeleeLifeTap(int32 damage) {
}
}
bool Mob::TryDoubleMeleeRoundEffect() {
auto chance = aabonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_CHANCE] + itembonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_CHANCE] +
spellbonuses.DoubleMeleeRound[SBIndex::DOUBLE_MELEE_ROUND_CHANCE];
if (chance && zone->random.Roll(chance)) {
SetUseDoubleMeleeRoundDmgBonus(true);
return true;
}
SetUseDoubleMeleeRoundDmgBonus(false);
return false;
}
bool Mob::TryReflectSpell(uint32 spell_id)
{
if (!spells[spell_id].reflectable)