From 29ec6db3458f963d232117d69c2fc1811d2f339b Mon Sep 17 00:00:00 2001 From: SecretsOTheP Date: Mon, 3 Nov 2014 19:30:11 -0500 Subject: [PATCH] because fuck you mercs and bots --- zone/bot.h | 6 +++--- zone/merc.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zone/bot.h b/zone/bot.h index 7601dd00c..42f347997 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -172,8 +172,8 @@ public: virtual int GetMonkHandToHandDamage(void); virtual bool TryFinishingBlow(Mob *defender, SkillUseTypes skillinuse); virtual void DoRiposte(Mob* defender); - inline virtual int16 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK + ((GetSTR() + GetSkill(SkillOffense)) * 9 / 10); } - inline virtual int16 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } + inline virtual int32 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK + ((GetSTR() + GetSkill(SkillOffense)) * 9 / 10); } + inline virtual int32 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } uint16 GetTotalATK(); uint16 GetATKRating(); uint16 GetPrimarySkillValue(); @@ -465,7 +465,7 @@ public: uint32 GetHealRotationNextHealTime() { return _healRotationNextHeal; } uint32 GetHealRotationTimer () { return _healRotationTimer; } bool GetBardUseOutOfCombatSongs() { return _bardUseOutOfCombatSongs;} - inline virtual int16 GetAC() const { return AC; } + inline virtual int32 GetAC() const { return AC; } inline virtual int16 GetSTR() const { return STR; } inline virtual int16 GetSTA() const { return STA; } inline virtual int16 GetDEX() const { return DEX; } diff --git a/zone/merc.h b/zone/merc.h index dabf68789..5061d315c 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -178,9 +178,9 @@ public: // stat functions virtual void CalcBonuses(); int32 GetEndurance() const {return cur_end;} //This gets our current endurance - inline virtual int16 GetAC() const { return AC; } - inline virtual int16 GetATK() const { return ATK; } - inline virtual int16 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } + inline virtual int32 GetAC() const { return AC; } + inline virtual int32 GetATK() const { return ATK; } + inline virtual int32 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; } int GetRawACNoShield(int &shield_ac) const; inline virtual int16 GetSTR() const { return STR; }