pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 08:21:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix for sympathetic proc code to allow for it to be properly checked from spell buffs.

Browse Source
This commit is contained in:
KayenEQ 2015-03-24 01:42:34 -04:00
parent 0cf5cca415
commit 340ed6c59d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/spdat.h
View File

@ -38,6 +38,7 @@
#define MAX_RESISTABLE_EFFECTS 12 // Number of effects that are typcially checked agianst resists. #define MAX_RESISTABLE_EFFECTS 12 // Number of effects that are typcially checked agianst resists.
#define MaxLimitInclude 16 //Number(x 0.5) of focus Limiters that have inclusive checks used when calcing focus effects #define MaxLimitInclude 16 //Number(x 0.5) of focus Limiters that have inclusive checks used when calcing focus effects
#define MAX_SKILL_PROCS 4 //Number of spells to check skill procs from. (This is arbitrary) [Single spell can have multiple proc checks] #define MAX_SKILL_PROCS 4 //Number of spells to check skill procs from. (This is arbitrary) [Single spell can have multiple proc checks]
#define MAX_SYMPATHETIC_PROCS 10 // Number of sympathetic procs a client can have (This is arbitrary)
const int Z_AGGRO=10; const int Z_AGGRO=10;

11
zone/spell_effects.cpp
View File

@ -5183,7 +5183,6 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
return 0; return 0;
uint16 proc_spellid = 0; uint16 proc_spellid = 0;
uint8 MAX_SYMPATHETIC = 10;
float ProcChance = 0.0f; float ProcChance = 0.0f;
std::vector<int> SympatheticProcList; std::vector<int> SympatheticProcList;
@ -5195,7 +5194,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++) for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++)
{ {
if (SympatheticProcList.size() > MAX_SYMPATHETIC) if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS)
continue; continue;
TempItem = nullptr; TempItem = nullptr;
@ -5215,7 +5214,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
for (int y = AUG_BEGIN; y < EmuConstants::ITEM_COMMON_SIZE; ++y) for (int y = AUG_BEGIN; y < EmuConstants::ITEM_COMMON_SIZE; ++y)
{ {
if (SympatheticProcList.size() > MAX_SYMPATHETIC) if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS)
continue; continue;
ItemInst *aug = nullptr; ItemInst *aug = nullptr;
@ -5243,11 +5242,11 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
int buff_max = GetMaxTotalSlots(); int buff_max = GetMaxTotalSlots();
for (buff_slot = 0; buff_slot < buff_max; buff_slot++) { for (buff_slot = 0; buff_slot < buff_max; buff_slot++) {
if (SympatheticProcList.size() > MAX_SYMPATHETIC) if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS)
continue; continue;
focusspellid = buffs[buff_slot].spellid; focusspellid = buffs[buff_slot].spellid;
if (IsValidSpell(focusspellid)) if (!IsValidSpell(focusspellid))
continue; continue;
proc_spellid = CalcFocusEffect(type, focusspellid, spell_id); proc_spellid = CalcFocusEffect(type, focusspellid, spell_id);
@ -5275,7 +5274,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
if (aa_AA < 1 || aa_value < 1) if (aa_AA < 1 || aa_value < 1)
continue; continue;
if (SympatheticProcList.size() > MAX_SYMPATHETIC) if (SympatheticProcList.size() > MAX_SYMPATHETIC_PROCS)
continue; continue;
proc_spellid = CalcAAFocus(type, aa_AA, spell_id); proc_spellid = CalcAAFocus(type, aa_AA, spell_id);