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

variable fix

Browse Source
This commit is contained in:
KayenEQ
2021-08-13 18:39:04 -04:00
parent 3a4727eaa7
commit 3e046233b5
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+5 -5
View File
@@ -12876,11 +12876,11 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
} }
//AA to increase SPA 230 extended shielding //AA to increase SPA 230 extended shielding
int m_shielder_max_distance = 15; int shielder_max_distance = 15;
m_shielder_max_distance += aabonuses.ExtendedShielding + itembonuses.ExtendedShielding + spellbonuses.ExtendedShielding; shielder_max_distance += aabonuses.ExtendedShielding + itembonuses.ExtendedShielding + spellbonuses.ExtendedShielding;
m_shielder_max_distance = std::max(m_shielder_max_distance, 0); shielder_max_distance = std::max(shielder_max_distance, 0);
if (shield_target->CalculateDistance(GetX(), GetY(), GetZ()) > static_cast<float>(m_shielder_max_distance)) { if (shield_target->CalculateDistance(GetX(), GetY(), GetZ()) > static_cast<float>(shielder_max_distance)) {
return; //Too far away, no message is given thoughh. return; //Too far away, no message is given thoughh.
} }
@@ -12888,7 +12888,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
SetShieldTargetID(shield_target->GetID()); SetShieldTargetID(shield_target->GetID());
SetShielderMitigation(25); SetShielderMitigation(25);
SetShielerMaxDistance(m_shielder_max_distance); SetShielerMaxDistance(shielder_max_distance);
shield_target->SetShielderID(GetID()); shield_target->SetShielderID(GetID());
shield_target->SetShieldTargetMitigation(50); shield_target->SetShieldTargetMitigation(50);
zone/mob.cpp
+10 -10
View File
@@ -377,11 +377,11 @@ Mob::Mob(
inWater = false; inWater = false;
shield_timer.Disable(); shield_timer.Disable();
shield_target_id = 0; m_shield_target_id = 0;
shielder_id = 0; m_shielder_id = 0;
shield_target_mitigation = 0; m_shield_target_mitigation = 0;
shielder_mitigation = 0; m_shielder_mitigation = 0;
shielder_max_distance = 0; m_shielder_max_distance = 0;
destructibleobject = false; destructibleobject = false;
wandertype = 0; wandertype = 0;
@@ -6197,7 +6197,7 @@ float Mob::GetDefaultRaceSize() const {
return GetRaceGenderDefaultHeight(race, gender); return GetRaceGenderDefaultHeight(race, gender);
} }
void Mob::ShieldAbility(uint32 target_id, int m_max_shielder_distance, int shield_duration, int m_shield_target_mitigation, int m_shielder_mitigation) void Mob::ShieldAbility(uint32 target_id, int max_shielder_distance, int shield_duration, int shield_target_mitigation, int shielder_mitigation)
{ {
Mob* shield_target = entity_list.GetMob(target_id); Mob* shield_target = entity_list.GetMob(target_id);
@@ -6228,7 +6228,7 @@ void Mob::ShieldAbility(uint32 target_id, int m_max_shielder_distance, int shiel
} }
} }
if (shield_target->CalculateDistance(GetX(), GetY(), GetZ()) > static_cast<float>(m_max_shielder_distance)) { if (shield_target->CalculateDistance(GetX(), GetY(), GetZ()) > static_cast<float>(max_shielder_distance)) {
if (IsClient()) { if (IsClient()) {
MessageString(Chat::White, TARGET_TOO_FAR); //Live doesn't give any message for failure, for the quest ability lets allow it. MessageString(Chat::White, TARGET_TOO_FAR); //Live doesn't give any message for failure, for the quest ability lets allow it.
} }
@@ -6238,11 +6238,11 @@ void Mob::ShieldAbility(uint32 target_id, int m_max_shielder_distance, int shiel
entity_list.MessageCloseString(this, false, 100, 0, START_SHIELDING, GetCleanName(), shield_target->GetCleanName()); entity_list.MessageCloseString(this, false, 100, 0, START_SHIELDING, GetCleanName(), shield_target->GetCleanName());
SetShieldTargetID(shield_target->GetID()); SetShieldTargetID(shield_target->GetID());
SetShielderMitigation(m_shield_target_mitigation); SetShielderMitigation(shield_target_mitigation);
SetShielerMaxDistance(m_max_shielder_distance); SetShielerMaxDistance(max_shielder_distance);
shield_target->SetShielderID(GetID()); shield_target->SetShielderID(GetID());
shield_target->SetShieldTargetMitigation(m_shield_target_mitigation); shield_target->SetShieldTargetMitigation(shield_target_mitigation);
shield_timer.Start(shield_duration); shield_timer.Start(shield_duration);
} }
zone/mob.h
+16 -16
View File
@@ -1133,20 +1133,20 @@ public:
Trade* trade; Trade* trade;
void ShieldAbility(uint32 target_id, int m_shielder_max_distance = 15, int shield_duration = 12000, int m_shielld_target_mitigation = 50, int m_shielder_mitigation = 75); void ShieldAbility(uint32 target_id, int shielder_max_distance = 15, int shield_duration = 12000, int shielld_target_mitigation = 50, int shielder_mitigation = 75);
void DoShieldDamageOnShielder(Mob* shield_target, int hit_damage_done, EQ::skills::SkillType skillInUse); void DoShieldDamageOnShielder(Mob* shield_target, int hit_damage_done, EQ::skills::SkillType skillInUse);
void ShieldAbilityFinish(); void ShieldAbilityFinish();
void ShieldAbilityClearVariables(); void ShieldAbilityClearVariables();
inline uint32 GetShielderID() const { return shielder_id; } inline uint32 GetShielderID() const { return m_shielder_id; }
inline void SetShielderID(uint32 val) { shielder_id = val; } inline void SetShielderID(uint32 val) { m_shielder_id = val; }
inline uint32 GetShieldTargetID() const { return shield_target_id; } inline uint32 GetShieldTargetID() const { return m_shield_target_id; }
inline void SetShieldTargetID(uint32 val) { shield_target_id = val; } inline void SetShieldTargetID(uint32 val) { m_shield_target_id = val; }
inline int GetShieldTargetMitigation() const { return shield_target_mitigation; } inline int GetShieldTargetMitigation() const { return m_shield_target_mitigation; }
inline void SetShieldTargetMitigation(int val) { shield_target_mitigation = val; } inline void SetShieldTargetMitigation(int val) { m_shield_target_mitigation = val; }
inline int GetShielderMitigation() const { return shielder_mitigation; } inline int GetShielderMitigation() const { return m_shielder_mitigation; }
inline void SetShielderMitigation(int val) { shielder_mitigation = val; } inline void SetShielderMitigation(int val) { m_shielder_mitigation = val; }
inline int GetMaxShielderDistance() const { return shielder_max_distance; } inline int GetMaxShielderDistance() const { return m_shielder_max_distance; }
inline void SetShielerMaxDistance(int val) { shielder_max_distance = val; } inline void SetShielerMaxDistance(int val) { m_shielder_max_distance = val; }
WeaponStance_Struct weaponstance; WeaponStance_Struct weaponstance;
bool IsWeaponStanceEnabled() const { return weaponstance.enabled; } bool IsWeaponStanceEnabled() const { return weaponstance.enabled; }
@@ -1453,11 +1453,11 @@ protected:
Timer focus_proc_limit_timer; Timer focus_proc_limit_timer;
Timer shield_timer; Timer shield_timer;
uint32 shield_target_id; uint32 m_shield_target_id;
uint32 shielder_id; uint32 m_shielder_id;
int shield_target_mitigation; int m_shield_target_mitigation;
int shielder_mitigation; int m_shielder_mitigation;
int shielder_max_distance; int m_shielder_max_distance;
//spell casting vars //spell casting vars
Timer spellend_timer; Timer spellend_timer;