pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 23:56:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Merge Client::Attack and Bot::Attack into Mob::Attack (#2756)

Browse Source 
* [Cleanup] Merge Client::Attack and Bot::Attack into Mob::Attack (#11)

* Remove #ifdef Bots to go along with KK fix

* Remove method in logging

* remove method from logging

* Fixes

* Rename
This commit is contained in:
Aeadoin
2023-01-20 15:52:45 -05:00
committed by GitHub
parent 5c095ab87a
commit 886f80117c
10 changed files with 82 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.h
+2 -1
View File
@@ -199,7 +199,7 @@ public:
virtual void ThrowingAttack(Mob* other) { }
// 13 = Primary (default), 14 = secondary
virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) = 0;
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr);
void DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts = nullptr, bool FromRiposte = false);
int MonkSpecialAttack(Mob* other, uint8 skill_used);
virtual void TryBackstab(Mob *other,int ReuseTime = 10);
@@ -1413,6 +1413,7 @@ public:
void ResetAssistCap() { npc_assist_cap = 0; }
int64 GetWeaponDamage(Mob *against, const EQ::ItemData *weapon_item);
int64 GetWeaponDamage(Mob *against, const EQ::ItemInstance *weapon_item, int64 *hate = nullptr);
int64 DoDamageCaps(int64 base_damage);
int64 GetHPRegen() const;
int64 GetManaRegen() const;