pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take in elem/bane dmg in BS calc

Browse Source
This commit is contained in:
Michael Cook (mackal) 2016-10-13 23:55:44 -04:00
parent 343c41bb18
commit 1e865a5246
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
zone/special_attacks.cpp
View File

@ -577,32 +577,29 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
int32 backstab_dmg = 0;
if (IsClient()) {
const ItemInst *wpn = nullptr;
wpn = CastToClient()->GetInv().GetItem(EQEmu::legacy::SlotPrimary);
const ItemInst *wpn = CastToClient()->GetInv().GetItem(EQEmu::legacy::SlotPrimary);
if (wpn) {
primaryweapondamage = GetWeaponDamage(other, wpn);
backstab_dmg = wpn->GetItem()->BackstabDmg;
for (int i = 0; i < EQEmu::legacy::ITEM_COMMON_SIZE; ++i)
{
ItemInst *aug = wpn->GetAugment(i);
if(aug)
{
backstab_dmg += aug->GetItem()->BackstabDmg;
if (primaryweapondamage) {
backstab_dmg = wpn->GetItemBackstabDamage(true);
backstab_dmg += other->ResistElementalWeaponDmg(wpn);
if (wpn->GetItemBaneDamageBody(true) || wpn->GetItemBaneDamageRace(true))
backstab_dmg += other->CheckBaneDamage(wpn);
}
}
}
}
else{
primaryweapondamage = (GetLevel()/7)+1; // fallback incase it's a npc without a weapon, 2 dmg at 10, 10 dmg at 65
} else {
primaryweapondamage =
(GetLevel() / 7) + 1; // fallback incase it's a npc without a weapon, 2 dmg at 10, 10 dmg at 65
backstab_dmg = primaryweapondamage;
}
// ex. bane can make this false
if (primaryweapondamage > 0) {
// this is very wrong but not worth it until we fix the full dmg
if (level > 25) {
max_hit = (((((2 * backstab_dmg) * GetDamageTable(EQEmu::skills::SkillBackstab) / 100) * 10 * GetSkill(EQEmu::skills::SkillBackstab) / 355) + ((level - 25) / 3) + 1) * ((100 + RuleI(Combat, BackstabBonus)) / 100));
hate = 20 * backstab_dmg * GetSkill(EQEmu::skills::SkillBackstab) / 355;
}
else{
} else {
max_hit = (((((2 * backstab_dmg) * GetDamageTable(EQEmu::skills::SkillBackstab) / 100) * 10 * GetSkill(EQEmu::skills::SkillBackstab) / 355) + 1) * ((100 + RuleI(Combat, BackstabBonus)) / 100));
hate = 20 * backstab_dmg * GetSkill(EQEmu::skills::SkillBackstab) / 355;
}
@ -610,20 +607,17 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
// determine minimum hits
if (level < 51) {
min_hit = (level*15/10);
}
else {
} else {
// Trumpcard: Replaced switch statement with formula calc. This will give minhit increases all the way to 65.
min_hit = (level * ( level*5 - 105)) / 100;
}
if (!other->CheckHitChance(this, EQEmu::skills::SkillBackstab, 0)) {
ndamage = 0;
}
else{
} else {
if (min_damage) {
ndamage = min_hit;
}
else {
} else {
if (max_hit < min_hit)
max_hit = min_hit;
@ -633,8 +627,7 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
ndamage = zone->random.Int(min_hit, max_hit);
}
}
}
else{
} else {
ndamage = -5;
}