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

Merge branch 'master' into aa

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-06-19 21:44:58 -04:00
commit 6621a125e6
7 changed files with 3177 additions and 5841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1035
common/ruletypes.h
View File

File diff suppressed because it is too large Load Diff

4
utils/patches/patch_RoF2.conf
View File

@ -295,8 +295,8 @@ OP_MarkNPC=0x1fb5
OP_MarkRaidNPC=0x5a58 #unimplemented OP_MarkRaidNPC=0x5a58 #unimplemented
OP_ClearNPCMarks=0x2003 OP_ClearNPCMarks=0x2003
OP_ClearRaidNPCMarks=0x20d3 #unimplemented OP_ClearRaidNPCMarks=0x20d3 #unimplemented
OP_DelegateAbility=0x4c9d OP_DelegateAbility=0x76b8
OP_SetGroupTarget=0x026 OP_SetGroupTarget=0x2814
OP_Charm=0x5d92 OP_Charm=0x5d92
OP_Stun=0x36a4 OP_Stun=0x36a4
OP_SendFindableNPCs=0x4613 OP_SendFindableNPCs=0x4613

2
zone/attack.cpp
View File

@ -4248,7 +4248,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
} }
#ifdef BOTS #ifdef BOTS
if (this->IsPet() && this->GetOwner()->IsBot()) { if (this->IsPet() && this->GetOwner() && this->GetOwner()->IsBot()) {
this->TryPetCriticalHit(defender,skill,damage); this->TryPetCriticalHit(defender,skill,damage);
return; return;
} }

7916
zone/bot.cpp
View File

File diff suppressed because it is too large Load Diff

3
zone/bot.h
View File

@ -465,6 +465,7 @@ public:
uint32 GetHealRotationNextHealTime() { return _healRotationNextHeal; } uint32 GetHealRotationNextHealTime() { return _healRotationNextHeal; }
uint32 GetHealRotationTimer () { return _healRotationTimer; } uint32 GetHealRotationTimer () { return _healRotationTimer; }
bool GetBardUseOutOfCombatSongs() { return _bardUseOutOfCombatSongs;} bool GetBardUseOutOfCombatSongs() { return _bardUseOutOfCombatSongs;}
bool GetShowHelm() { return _showhelm; }
inline virtual int32 GetAC() const { return AC; } inline virtual int32 GetAC() const { return AC; }
inline virtual int32 GetSTR() const { return STR; } inline virtual int32 GetSTR() const { return STR; }
inline virtual int32 GetSTA() const { return STA; } inline virtual int32 GetSTA() const { return STA; }
@ -548,6 +549,7 @@ public:
void SetHealRotationTimer( uint32 timer ) { _healRotationTimer = timer; } void SetHealRotationTimer( uint32 timer ) { _healRotationTimer = timer; }
void SetNumHealRotationMembers( uint8 numMembers ) { _numHealRotationMembers = numMembers; } void SetNumHealRotationMembers( uint8 numMembers ) { _numHealRotationMembers = numMembers; }
void SetBardUseOutOfCombatSongs(bool useOutOfCombatSongs) { _bardUseOutOfCombatSongs = useOutOfCombatSongs;} void SetBardUseOutOfCombatSongs(bool useOutOfCombatSongs) { _bardUseOutOfCombatSongs = useOutOfCombatSongs;}
void SetShowHelm(bool showhelm) { _showhelm = showhelm; }
// Class Destructors // Class Destructors
virtual ~Bot(); virtual ~Bot();
@ -620,6 +622,7 @@ private:
std::map<uint32, BotAA> botAAs; std::map<uint32, BotAA> botAAs;
InspectMessage_Struct _botInspectMessage; InspectMessage_Struct _botInspectMessage;
bool _bardUseOutOfCombatSongs; bool _bardUseOutOfCombatSongs;
bool _showhelm;
// Private "base stats" Members // Private "base stats" Members
int32 _baseMR; int32 _baseMR;

2
zone/mob_ai.cpp
View File

@ -1105,7 +1105,7 @@ void Mob::AI_Process() {
} }
#ifdef BOTS #ifdef BOTS
if (IsPet() && GetOwner()->IsBot() && target == GetOwner()) if (IsPet() && GetOwner() && GetOwner()->IsBot() && target == GetOwner())
{ {
// this blocks all pet attacks against owner..bot pet test (copied above check) // this blocks all pet attacks against owner..bot pet test (copied above check)
RemoveFromHateList(this); RemoveFromHateList(this);

4
zone/special_attacks.cpp
View File

@ -615,11 +615,11 @@ void Mob::RogueBackstab(Mob* other, bool min_damage, int ReuseTime)
if(primaryweapondamage > 0){ if(primaryweapondamage > 0){
if(level > 25){ if(level > 25){
max_hit = (((2*backstab_dmg) * GetDamageTable(SkillBackstab) / 100) * 10 * GetSkill(SkillBackstab) / 355) + ((level-25)/3) + 1; max_hit = (((((2*backstab_dmg) * GetDamageTable(SkillBackstab) / 100) * 10 * GetSkill(SkillBackstab) / 355) + ((level-25)/3) + 1) * ((100 + RuleI(Combat, BackstabBonus)) / 100));
hate = 20 * backstab_dmg * GetSkill(SkillBackstab) / 355; hate = 20 * backstab_dmg * GetSkill(SkillBackstab) / 355;
} }
else{ else{
max_hit = (((2*backstab_dmg) * GetDamageTable(SkillBackstab) / 100) * 10 * GetSkill(SkillBackstab) / 355) + 1;; max_hit = (((((2*backstab_dmg) * GetDamageTable(SkillBackstab) / 100) * 10 * GetSkill(SkillBackstab) / 355) + 1) * ((100 + RuleI(Combat, BackstabBonus)) / 100));
hate = 20 * backstab_dmg * GetSkill(SkillBackstab) / 355; hate = 20 * backstab_dmg * GetSkill(SkillBackstab) / 355;
} }