mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-05 07:16:37 +00:00
int16/32 mismatch fixes. see changelog.txt
This commit is contained in:
SecretsOTheP
+99
-99
@@ -174,8 +174,8 @@ public:
|
||||
virtual void DoRiposte(Mob* defender);
|
||||
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();
|
||||
uint32 GetTotalATK();
|
||||
uint32 GetATKRating();
|
||||
uint16 GetPrimarySkillValue();
|
||||
uint16 MaxSkill(SkillUseTypes skillid, uint16 class_, uint16 level) const;
|
||||
inline uint16 MaxSkill(SkillUseTypes skillid) const { return MaxSkill(skillid, GetClass(), GetLevel()); }
|
||||
@@ -238,35 +238,35 @@ public:
|
||||
void ClearHealRotationLeader() { _healRotationLeader = 0; }
|
||||
void ClearHealRotationMembers();
|
||||
void ClearHealRotationTargets();
|
||||
inline virtual int16 GetMaxStat();
|
||||
inline virtual int16 GetMaxResist();
|
||||
inline virtual int16 GetMaxSTR();
|
||||
inline virtual int16 GetMaxSTA();
|
||||
inline virtual int16 GetMaxDEX();
|
||||
inline virtual int16 GetMaxAGI();
|
||||
inline virtual int16 GetMaxINT();
|
||||
inline virtual int16 GetMaxWIS();
|
||||
inline virtual int16 GetMaxCHA();
|
||||
inline virtual int16 GetMaxMR();
|
||||
inline virtual int16 GetMaxPR();
|
||||
inline virtual int16 GetMaxDR();
|
||||
inline virtual int16 GetMaxCR();
|
||||
inline virtual int16 GetMaxFR();
|
||||
inline virtual int16 GetMaxCorrup();
|
||||
int16 CalcATK();
|
||||
int16 CalcSTR();
|
||||
int16 CalcSTA();
|
||||
int16 CalcDEX();
|
||||
int16 CalcAGI();
|
||||
int16 CalcINT();
|
||||
int16 CalcWIS();
|
||||
int16 CalcCHA();
|
||||
int16 CalcMR();
|
||||
int16 CalcFR();
|
||||
int16 CalcDR();
|
||||
int16 CalcPR();
|
||||
int16 CalcCR();
|
||||
int16 CalcCorrup();
|
||||
inline virtual int32 GetMaxStat();
|
||||
inline virtual int32 GetMaxResist();
|
||||
inline virtual int32 GetMaxSTR();
|
||||
inline virtual int32 GetMaxSTA();
|
||||
inline virtual int32 GetMaxDEX();
|
||||
inline virtual int32 GetMaxAGI();
|
||||
inline virtual int32 GetMaxINT();
|
||||
inline virtual int32 GetMaxWIS();
|
||||
inline virtual int32 GetMaxCHA();
|
||||
inline virtual int32 GetMaxMR();
|
||||
inline virtual int32 GetMaxPR();
|
||||
inline virtual int32 GetMaxDR();
|
||||
inline virtual int32 GetMaxCR();
|
||||
inline virtual int32 GetMaxFR();
|
||||
inline virtual int32 GetMaxCorrup();
|
||||
int32 CalcATK();
|
||||
int32 CalcSTR();
|
||||
int32 CalcSTA();
|
||||
int32 CalcDEX();
|
||||
int32 CalcAGI();
|
||||
int32 CalcINT();
|
||||
int32 CalcWIS();
|
||||
int32 CalcCHA();
|
||||
int32 CalcMR();
|
||||
int32 CalcFR();
|
||||
int32 CalcDR();
|
||||
int32 CalcPR();
|
||||
int32 CalcCR();
|
||||
int32 CalcCorrup();
|
||||
int32 CalcHPRegenCap();
|
||||
int32 CalcManaRegenCap();
|
||||
int32 LevelRegen();
|
||||
@@ -466,56 +466,56 @@ public:
|
||||
uint32 GetHealRotationTimer () { return _healRotationTimer; }
|
||||
bool GetBardUseOutOfCombatSongs() { return _bardUseOutOfCombatSongs;}
|
||||
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; }
|
||||
inline virtual int16 GetAGI() const { return AGI; }
|
||||
inline virtual int16 GetINT() const { return INT; }
|
||||
inline virtual int16 GetWIS() const { return WIS; }
|
||||
inline virtual int16 GetCHA() const { return CHA; }
|
||||
inline virtual int16 GetMR() const { return MR; }
|
||||
inline virtual int16 GetFR() const { return FR; }
|
||||
inline virtual int16 GetDR() const { return DR; }
|
||||
inline virtual int16 GetPR() const { return PR; }
|
||||
inline virtual int16 GetCR() const { return CR; }
|
||||
inline virtual int16 GetCorrup() const { return Corrup; }
|
||||
inline virtual int32 GetSTR() const { return STR; }
|
||||
inline virtual int32 GetSTA() const { return STA; }
|
||||
inline virtual int32 GetDEX() const { return DEX; }
|
||||
inline virtual int32 GetAGI() const { return AGI; }
|
||||
inline virtual int32 GetINT() const { return INT; }
|
||||
inline virtual int32 GetWIS() const { return WIS; }
|
||||
inline virtual int32 GetCHA() const { return CHA; }
|
||||
inline virtual int32 GetMR() const { return MR; }
|
||||
inline virtual int32 GetFR() const { return FR; }
|
||||
inline virtual int32 GetDR() const { return DR; }
|
||||
inline virtual int32 GetPR() const { return PR; }
|
||||
inline virtual int32 GetCR() const { return CR; }
|
||||
inline virtual int32 GetCorrup() const { return Corrup; }
|
||||
//Heroic
|
||||
inline virtual int16 GetHeroicSTR() const { return itembonuses.HeroicSTR; }
|
||||
inline virtual int16 GetHeroicSTA() const { return itembonuses.HeroicSTA; }
|
||||
inline virtual int16 GetHeroicDEX() const { return itembonuses.HeroicDEX; }
|
||||
inline virtual int16 GetHeroicAGI() const { return itembonuses.HeroicAGI; }
|
||||
inline virtual int16 GetHeroicINT() const { return itembonuses.HeroicINT; }
|
||||
inline virtual int16 GetHeroicWIS() const { return itembonuses.HeroicWIS; }
|
||||
inline virtual int16 GetHeroicCHA() const { return itembonuses.HeroicCHA; }
|
||||
inline virtual int16 GetHeroicMR() const { return itembonuses.HeroicMR; }
|
||||
inline virtual int16 GetHeroicFR() const { return itembonuses.HeroicFR; }
|
||||
inline virtual int16 GetHeroicDR() const { return itembonuses.HeroicDR; }
|
||||
inline virtual int16 GetHeroicPR() const { return itembonuses.HeroicPR; }
|
||||
inline virtual int16 GetHeroicCR() const { return itembonuses.HeroicCR; }
|
||||
inline virtual int16 GetHeroicCorrup() const { return itembonuses.HeroicCorrup; }
|
||||
inline virtual int32 GetHeroicSTR() const { return itembonuses.HeroicSTR; }
|
||||
inline virtual int32 GetHeroicSTA() const { return itembonuses.HeroicSTA; }
|
||||
inline virtual int32 GetHeroicDEX() const { return itembonuses.HeroicDEX; }
|
||||
inline virtual int32 GetHeroicAGI() const { return itembonuses.HeroicAGI; }
|
||||
inline virtual int32 GetHeroicINT() const { return itembonuses.HeroicINT; }
|
||||
inline virtual int32 GetHeroicWIS() const { return itembonuses.HeroicWIS; }
|
||||
inline virtual int32 GetHeroicCHA() const { return itembonuses.HeroicCHA; }
|
||||
inline virtual int32 GetHeroicMR() const { return itembonuses.HeroicMR; }
|
||||
inline virtual int32 GetHeroicFR() const { return itembonuses.HeroicFR; }
|
||||
inline virtual int32 GetHeroicDR() const { return itembonuses.HeroicDR; }
|
||||
inline virtual int32 GetHeroicPR() const { return itembonuses.HeroicPR; }
|
||||
inline virtual int32 GetHeroicCR() const { return itembonuses.HeroicCR; }
|
||||
inline virtual int32 GetHeroicCorrup() const { return itembonuses.HeroicCorrup; }
|
||||
// Mod2
|
||||
inline virtual int16 GetShielding() const { return itembonuses.MeleeMitigation; }
|
||||
inline virtual int16 GetSpellShield() const { return itembonuses.SpellShield; }
|
||||
inline virtual int16 GetDoTShield() const { return itembonuses.DoTShielding; }
|
||||
inline virtual int16 GetStunResist() const { return itembonuses.StunResist; }
|
||||
inline virtual int16 GetStrikeThrough() const { return itembonuses.StrikeThrough; }
|
||||
inline virtual int16 GetAvoidance() const { return itembonuses.AvoidMeleeChance; }
|
||||
inline virtual int16 GetAccuracy() const { return itembonuses.HitChance; }
|
||||
inline virtual int16 GetCombatEffects() const { return itembonuses.ProcChance; }
|
||||
inline virtual int16 GetDS() const { return itembonuses.DamageShield; }
|
||||
inline virtual int32 GetShielding() const { return itembonuses.MeleeMitigation; }
|
||||
inline virtual int32 GetSpellShield() const { return itembonuses.SpellShield; }
|
||||
inline virtual int32 GetDoTShield() const { return itembonuses.DoTShielding; }
|
||||
inline virtual int32 GetStunResist() const { return itembonuses.StunResist; }
|
||||
inline virtual int32 GetStrikeThrough() const { return itembonuses.StrikeThrough; }
|
||||
inline virtual int32 GetAvoidance() const { return itembonuses.AvoidMeleeChance; }
|
||||
inline virtual int32 GetAccuracy() const { return itembonuses.HitChance; }
|
||||
inline virtual int32 GetCombatEffects() const { return itembonuses.ProcChance; }
|
||||
inline virtual int32 GetDS() const { return itembonuses.DamageShield; }
|
||||
// Mod3
|
||||
inline virtual int16 GetHealAmt() const { return itembonuses.HealAmt; }
|
||||
inline virtual int16 GetSpellDmg() const { return itembonuses.SpellDmg; }
|
||||
inline virtual int16 GetClair() const { return itembonuses.Clairvoyance; }
|
||||
inline virtual int16 GetDSMit() const { return itembonuses.DSMitigation; }
|
||||
inline virtual int32 GetHealAmt() const { return itembonuses.HealAmt; }
|
||||
inline virtual int32 GetSpellDmg() const { return itembonuses.SpellDmg; }
|
||||
inline virtual int32 GetClair() const { return itembonuses.Clairvoyance; }
|
||||
inline virtual int32 GetDSMit() const { return itembonuses.DSMitigation; }
|
||||
|
||||
inline virtual int16 GetSingMod() const { return itembonuses.singingMod; }
|
||||
inline virtual int16 GetBrassMod() const { return itembonuses.brassMod; }
|
||||
inline virtual int16 GetPercMod() const { return itembonuses.percussionMod; }
|
||||
inline virtual int16 GetStringMod() const { return itembonuses.stringedMod; }
|
||||
inline virtual int16 GetWindMod() const { return itembonuses.windMod; }
|
||||
inline virtual int32 GetSingMod() const { return itembonuses.singingMod; }
|
||||
inline virtual int32 GetBrassMod() const { return itembonuses.brassMod; }
|
||||
inline virtual int32 GetPercMod() const { return itembonuses.percussionMod; }
|
||||
inline virtual int32 GetStringMod() const { return itembonuses.stringedMod; }
|
||||
inline virtual int32 GetWindMod() const { return itembonuses.windMod; }
|
||||
|
||||
inline virtual int16 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath; }
|
||||
inline virtual int32 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath; }
|
||||
|
||||
inline InspectMessage_Struct& GetInspectMessage() { return _botInspectMessage; }
|
||||
inline const InspectMessage_Struct& GetInspectMessage() const { return _botInspectMessage; }
|
||||
@@ -556,13 +556,13 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void PetAIProcess();
|
||||
static NPCType FillNPCTypeStruct(uint32 botSpellsID, std::string botName, std::string botLastName, uint8 botLevel, uint16 botRace, uint8 botClass, uint8 gender, float size, uint32 face, uint32 hairStyle, uint32 hairColor, uint32 eyeColor, uint32 eyeColor2, uint32 beardColor, uint32 beard, uint32 drakkinHeritage, uint32 drakkinTattoo, uint32 drakkinDetails, int32 hp, int32 mana, int16 mr, int16 cr, int16 dr, int16 fr, int16 pr, int16 corrup, int16 ac, uint16 str, uint16 sta, uint16 dex, uint16 agi, uint16 _int, uint16 wis, uint16 cha, uint16 attack);
|
||||
static NPCType FillNPCTypeStruct(uint32 botSpellsID, std::string botName, std::string botLastName, uint8 botLevel, uint16 botRace, uint8 botClass, uint8 gender, float size, uint32 face, uint32 hairStyle, uint32 hairColor, uint32 eyeColor, uint32 eyeColor2, uint32 beardColor, uint32 beard, uint32 drakkinHeritage, uint32 drakkinTattoo, uint32 drakkinDetails, int32 hp, int32 mana, int32 mr, int32 cr, int32 dr, int32 fr, int32 pr, int32 corrup, int32 ac, uint32 str, uint32 sta, uint32 dex, uint32 agi, uint32 _int, uint32 wis, uint32 cha, uint32 attack);
|
||||
virtual void BotMeditate(bool isSitting);
|
||||
virtual void BotRangedAttack(Mob* other);
|
||||
virtual bool CheckBotDoubleAttack(bool Triple = false);
|
||||
virtual int16 GetBotFocusEffect(BotfocusType bottype, uint16 spell_id);
|
||||
virtual int16 CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus=false);
|
||||
virtual int16 CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint16 spell_id);
|
||||
virtual int32 GetBotFocusEffect(BotfocusType bottype, uint16 spell_id);
|
||||
virtual int32 CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus=false);
|
||||
virtual int32 CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint16 spell_id);
|
||||
virtual void PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* client);
|
||||
virtual bool AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0);
|
||||
virtual float GetMaxMeleeRangeToTarget(Mob* target);
|
||||
@@ -601,7 +601,7 @@ private:
|
||||
int32 base_end;
|
||||
int32 cur_end;
|
||||
int32 max_end;
|
||||
int16 end_regen;
|
||||
int32 end_regen;
|
||||
uint32 timers[MaxTimer];
|
||||
bool _hasBeenSummoned;
|
||||
float _preSummonX;
|
||||
@@ -626,26 +626,26 @@ private:
|
||||
bool _bardUseOutOfCombatSongs;
|
||||
|
||||
// Private "base stats" Members
|
||||
int16 _baseMR;
|
||||
int16 _baseCR;
|
||||
int16 _baseDR;
|
||||
int16 _baseFR;
|
||||
int16 _basePR;
|
||||
int16 _baseCorrup;
|
||||
int _baseAC;
|
||||
int16 _baseSTR;
|
||||
int16 _baseSTA;
|
||||
int16 _baseDEX;
|
||||
int16 _baseAGI;
|
||||
int16 _baseINT;
|
||||
int16 _baseWIS;
|
||||
int16 _baseCHA;
|
||||
int16 _baseATK;
|
||||
int32 _baseMR;
|
||||
int32 _baseCR;
|
||||
int32 _baseDR;
|
||||
int32 _baseFR;
|
||||
int32 _basePR;
|
||||
int32 _baseCorrup;
|
||||
int32 _baseAC;
|
||||
int32 _baseSTR;
|
||||
int32 _baseSTA;
|
||||
int32 _baseDEX;
|
||||
int32 _baseAGI;
|
||||
int32 _baseINT;
|
||||
int32 _baseWIS;
|
||||
int32 _baseCHA;
|
||||
int32 _baseATK;
|
||||
uint16 _baseRace; // Necessary to preserve the race otherwise bots get their race updated in the db when they get an illusion.
|
||||
uint8 _baseGender; // Bots gender. Necessary to preserve the original value otherwise it can be changed by illusions.
|
||||
|
||||
// Class Methods
|
||||
int16 acmod();
|
||||
int32 acmod();
|
||||
void GenerateBaseStats();
|
||||
void GenerateAppearance();
|
||||
void GenerateArmorClass();
|
||||
@@ -670,8 +670,8 @@ private:
|
||||
void SavePetBuffs(SpellBuff_Struct* petBuffs, uint32 botPetSaveId);
|
||||
void LoadPetItems(uint32* petItems, uint32 botPetSaveId);
|
||||
void SavePetItems(uint32* petItems, uint32 botPetSaveId);
|
||||
void LoadPetStats(std::string* petName, uint16* petMana, uint16* petHitPoints, uint32* botPetId, uint32 botPetSaveId);
|
||||
uint32 SavePetStats(std::string petName, uint16 petMana, uint16 petHitPoints, uint32 botPetId);
|
||||
void LoadPetStats(std::string* petName, uint32* petMana, uint32* petHitPoints, uint32* botPetId, uint32 botPetSaveId);
|
||||
uint32 SavePetStats(std::string petName, uint32 petMana, uint32 petHitPoints, uint32 botPetId);
|
||||
void LoadPet(); // Load and spawn bot pet if there is one
|
||||
void SavePet(); // Save and depop bot pet if there is one
|
||||
uint32 GetPetSaveId();
|
||||
|
||||
Reference in New Issue
Block a user