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

Revert "Merge pull request #1101 from KinglyKrab/custom"

Browse Source 
This reverts commit 43108acae1, reversing
changes made to daa1db65b9.
This commit is contained in:
Akkadius
2020-08-03 22:21:51 -05:00
parent 43108acae1
commit bda13383ef
14 changed files with 20 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+2 -10
View File
@@ -87,7 +87,7 @@ EQ::skills::SkillType Mob::AttackAnimation(int Hand, const EQ::ItemInstance* wea
break;
case EQ::item::ItemType2HBlunt: // 2H Blunt
skillinuse = EQ::skills::Skill2HBlunt;
type = anim2HWeapon; //anim2HWeapon
type = anim2HSlashing; //anim2HWeapon
break;
case EQ::item::ItemType2HPiercing: // 2H Piercing
if (IsClient() && CastToClient()->ClientVersion() < EQ::versions::ClientVersion::RoF2)
@@ -121,7 +121,7 @@ EQ::skills::SkillType Mob::AttackAnimation(int Hand, const EQ::ItemInstance* wea
type = anim1HWeapon;
break;
case EQ::skills::Skill2HBlunt: // 2H Blunt
type = anim2HWeapon; //anim2HWeapon
type = anim2HSlashing; //anim2HWeapon
break;
case EQ::skills::Skill2HPiercing: // 2H Piercing
type = anim2HWeapon;
@@ -1532,14 +1532,6 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
SpellFinished(aabonuses.SkillAttackProc[2], other, EQ::spells::CastingSlot::Item, 0, -1,
spells[aabonuses.SkillAttackProc[2]].ResistDiff);
}
if (RuleB(Combat, CustomScaling) && IsClient()) {
int scale_value = itembonuses.STR;
float melee_damage_scale = RuleR(Combat, CustomScalingMeleeDamage);
if (scale_value > int(melee_damage_scale)) {
my_hit.damage_done = int(static_cast<float>(my_hit.damage_done) * static_cast<float>(scale_value / melee_damage_scale));
}
}
other->Damage(this, my_hit.damage_done, SPELL_UNKNOWN, my_hit.skill, true, -1, false, m_specialattacks);
if (IsDead()) return false;