diff options
| -rw-r--r-- | sql/updates/3331_world_spell.sql | 6 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/sql/updates/3331_world_spell.sql b/sql/updates/3331_world_spell.sql new file mode 100644 index 00000000000..bbad1797eb0 --- /dev/null +++ b/sql/updates/3331_world_spell.sql @@ -0,0 +1,6 @@ +DELETE FROM spell_script_target WHERE targetentry IN (8313,38968,21934); +DELETE FROM spell_proc_event WHERE entry in (19615); + +UPDATE creature_template SET spell2 = 0 WHERE entry IN (16474,30000); +UPDATE gameobject_template SET scriptname = 'go_najentus_spine' WHERE entry = 185584; +UPDATE gameobject_template SET scriptname = 'go_bridge_console' WHERE entry = 184568; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 3cd0c4fb2c7..d267a99b69d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2799,8 +2799,14 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell) if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED && IsRangedWeaponSpell(spell)) attType = RANGED_ATTACK; + int32 attackerWeaponSkill; + // skill value for these spells (for example judgements) is 5* level + if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED && !IsRangedWeaponSpell(spell)) + attackerWeaponSkill = getLevel() * 5; // bonus from skills is 0.04% per skill Diff - int32 attackerWeaponSkill = int32(GetWeaponSkillValue(attType,pVictim)); + else + attackerWeaponSkill = int32(GetWeaponSkillValue(attType,pVictim)); + int32 skillDiff = attackerWeaponSkill - int32(pVictim->GetMaxSkillValueForLevel(this)); int32 fullSkillDiff = attackerWeaponSkill - int32(pVictim->GetDefenseSkillValue(this)); |