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

Update per discussion on bfb17a2fb53f3924cfaee2a271cb8be036cbae62

Browse Source
This commit is contained in:
JJ 2013-12-19 19:39:34 -05:00
parent 4512326fe8
commit 9fff694382
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/attack.cpp
View File

@ -446,15 +446,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte)
if(damage > 0 && HasShieldEquiped() && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock) if(damage > 0 && HasShieldEquiped() && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock)
&& (!other->BehindMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) { && (!other->BehindMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) {
/*
bool equiped = CastToClient()->m_inv.GetItem(14);
if(equiped) {
uint8 shield = CastToClient()->m_inv.GetItem(14)->GetItem()->ItemType;
float bonusShieldBlock = 0.0f;
if(shield == ItemTypeShield) {
*/
float bonusShieldBlock = 0.0f; float bonusShieldBlock = 0.0f;
bonusShieldBlock = aabonuses.ShieldBlock + spellbonuses.ShieldBlock + itembonuses.ShieldBlock; bonusShieldBlock = aabonuses.ShieldBlock + spellbonuses.ShieldBlock + itembonuses.ShieldBlock;
RollTable[1] += bonusShieldBlock; RollTable[1] += bonusShieldBlock;
@ -1142,7 +1134,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
} }
else{ else{
weapon = GetInv().GetItem(SLOT_PRIMARY); weapon = GetInv().GetItem(SLOT_PRIMARY);
OffHandAtk(false); OffHandAtk(false);
} }
if(weapon != nullptr) { if(weapon != nullptr) {
@ -3500,10 +3492,10 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons
attacker->SendAppearancePacket(AT_Sneak, 0); attacker->SendAppearancePacket(AT_Sneak, 0);
} }
//final damage has been determined. //final damage has been determined.
ReduceAllDamage(damage); ReduceAllDamage(damage);
SetHP(GetHP() - damage); SetHP(GetHP() - damage);
if(HasDied()) { if(HasDied()) {
bool IsSaved = false; bool IsSaved = false;

4
zone/spell_effects.cpp
View File

@ -3789,7 +3789,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
SetBodyType(GetOrigBodyType(), false); SetBodyType(GetOrigBodyType(), false);
break; break;
} }
case SE_MovementSpeed: case SE_MovementSpeed:
{ {
if(IsClient()) if(IsClient())
@ -5223,7 +5223,7 @@ bool Mob::CheckHitsRemaining(uint32 buff_slot, bool when_spell_done, bool negate
} }
return false; return false;
} }
// For spell buffs that are limited by the number of times it can successfully trigger a spell. // For spell buffs that are limited by the number of times it can successfully trigger a spell.
// Effects: SE_TriggerOnCast, SE_SympatheticProc,SE_DefensiveProc, SE_SkillProc, SE_RangedProc // Effects: SE_TriggerOnCast, SE_SympatheticProc,SE_DefensiveProc, SE_SkillProc, SE_RangedProc
if(spell_id){ if(spell_id){