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

Rework buff duration formulas

Browse Source 
These are derived from the client

SE_IllusionPresistence will also set the duration to 10k tics like live
This commit is contained in:
Michael Cook (mackal) 2015-05-23 02:20:36 -04:00
parent 351e63ae72
commit 8aadc36320
16 changed files with 116 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/eq_packet_structs.h
View File

@ -553,7 +553,7 @@ struct SpellBuff_Struct
/*002*/ uint8 bard_modifier; /*002*/ uint8 bard_modifier;
/*003*/ uint8 effect; //not real /*003*/ uint8 effect; //not real
/*004*/ uint32 spellid; /*004*/ uint32 spellid;
/*008*/ uint32 duration; /*008*/ int32 duration;
/*012*/ uint32 counters; /*012*/ uint32 counters;
/*016*/ uint32 player_id; //'global' ID of the caster, for wearoff messages /*016*/ uint32 player_id; //'global' ID of the caster, for wearoff messages
/*020*/ /*020*/
@ -566,7 +566,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 num_hits; /*016*/ uint32 num_hits;
/*020*/ uint32 unknown020; //prolly global player ID /*020*/ uint32 unknown020; //prolly global player ID
/*024*/ uint32 slotid; /*024*/ uint32 slotid;
@ -584,14 +584,8 @@ struct BuffRemoveRequest_Struct
struct PetBuff_Struct { struct PetBuff_Struct {
/*000*/ uint32 petid; /*000*/ uint32 petid;
/*004*/ uint32 spellid[BUFF_COUNT]; /*004*/ uint32 spellid[BUFF_COUNT+5];
/*104*/ uint32 unknown700; /*124*/ int32 ticsremaining[BUFF_COUNT+5];
/*108*/ uint32 unknown701;
/*112*/ uint32 unknown702;
/*116*/ uint32 unknown703;
/*120*/ uint32 unknown704;
/*124*/ uint32 ticsremaining[BUFF_COUNT];
/*224*/ uchar unknown705[20];
/*244*/ uint32 buffcount; /*244*/ uint32 buffcount;
}; };
@ -4036,7 +4030,7 @@ struct MarkNPC_Struct
struct InspectBuffs_Struct { struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT]; /*000*/ uint32 spell_id[BUFF_COUNT];
/*100*/ uint32 tics_remaining[BUFF_COUNT]; /*100*/ int32 tics_remaining[BUFF_COUNT];
}; };
struct RaidGeneral_Struct { struct RaidGeneral_Struct {
@ -4737,7 +4731,7 @@ struct BuffIconEntry_Struct
{ {
uint32 buff_slot; uint32 buff_slot;
uint32 spell_id; uint32 spell_id;
uint32 tics_remaining; int32 tics_remaining;
uint32 num_hits; uint32 num_hits;
}; };

10
common/patches/rof2_structs.h
View File

@ -687,7 +687,7 @@ struct SpellBuff_Struct
/*005*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages /*005*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages
/*009*/ uint32 unknown016; /*009*/ uint32 unknown016;
/*013*/ uint8 bard_modifier; /*013*/ uint8 bard_modifier;
/*014*/ uint32 duration; /*014*/ int32 duration;
/*018*/ uint8 level; /*018*/ uint8 level;
/*019*/ uint32 spellid; /*019*/ uint32 spellid;
/*023*/ uint32 counters; /*023*/ uint32 counters;
@ -703,7 +703,7 @@ struct SpellBuff_Struct_Old
/*003*/ uint8 effect; // not real /*003*/ uint8 effect; // not real
/*004*/ float unknown004; // Seen 1 for no buff /*004*/ float unknown004; // Seen 1 for no buff
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages /*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages
/*024*/ uint32 counters; /*024*/ uint32 counters;
@ -720,7 +720,7 @@ struct SpellBuffFade_Struct_Live {
/*007*/ uint8 unknown007; /*007*/ uint8 unknown007;
/*008*/ float unknown008; /*008*/ float unknown008;
/*012*/ uint32 spellid; /*012*/ uint32 spellid;
/*016*/ uint32 duration; /*016*/ int32 duration;
/*020*/ uint32 playerId; // Global player ID? /*020*/ uint32 playerId; // Global player ID?
/*024*/ uint32 num_hits; /*024*/ uint32 num_hits;
/*028*/ uint8 unknown0028[64]; /*028*/ uint8 unknown0028[64];
@ -736,7 +736,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 num_hits; /*016*/ uint32 num_hits;
/*020*/ uint32 unknown020; // Global player ID? /*020*/ uint32 unknown020; // Global player ID?
/*024*/ uint32 playerId; // Player id who cast the buff /*024*/ uint32 playerId; // Player id who cast the buff
@ -2473,7 +2473,7 @@ struct GroupFollow_Struct { // Live Follow Struct
struct InspectBuffs_Struct { struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT]; /*000*/ uint32 spell_id[BUFF_COUNT];
/*168*/ uint32 tics_remaining[BUFF_COUNT]; /*168*/ int32 tics_remaining[BUFF_COUNT];
}; };
struct LFG_Struct { struct LFG_Struct {

10
common/patches/rof_structs.h
View File

@ -676,7 +676,7 @@ struct SpellBuff_Struct
/*005*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages /*005*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages
/*009*/ uint32 unknown016; /*009*/ uint32 unknown016;
/*013*/ uint8 bard_modifier; /*013*/ uint8 bard_modifier;
/*014*/ uint32 duration; /*014*/ int32 duration;
/*018*/ uint8 level; /*018*/ uint8 level;
/*019*/ uint32 spellid; /*019*/ uint32 spellid;
/*023*/ uint32 counters; /*023*/ uint32 counters;
@ -692,7 +692,7 @@ struct SpellBuff_Struct_Old
/*003*/ uint8 effect; // not real /*003*/ uint8 effect; // not real
/*004*/ float unknown004; // Seen 1 for no buff /*004*/ float unknown004; // Seen 1 for no buff
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages /*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages
/*024*/ uint32 counters; /*024*/ uint32 counters;
@ -709,7 +709,7 @@ struct SpellBuffFade_Struct_Live {
/*007*/ uint8 unknown007; /*007*/ uint8 unknown007;
/*008*/ float unknown008; /*008*/ float unknown008;
/*012*/ uint32 spellid; /*012*/ uint32 spellid;
/*016*/ uint32 duration; /*016*/ int32 duration;
/*020*/ uint32 playerId; // Global player ID? /*020*/ uint32 playerId; // Global player ID?
/*024*/ uint32 num_hits; /*024*/ uint32 num_hits;
/*028*/ uint8 unknown0028[64]; /*028*/ uint8 unknown0028[64];
@ -725,7 +725,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 num_hits; /*016*/ uint32 num_hits;
/*020*/ uint32 unknown020; // Global player ID? /*020*/ uint32 unknown020; // Global player ID?
/*024*/ uint32 playerId; // Player id who cast the buff /*024*/ uint32 playerId; // Player id who cast the buff
@ -2501,7 +2501,7 @@ struct GroupFollow_Struct { // Live Follow Struct
struct InspectBuffs_Struct { struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT]; /*000*/ uint32 spell_id[BUFF_COUNT];
/*168*/ uint32 tics_remaining[BUFF_COUNT]; /*168*/ int32 tics_remaining[BUFF_COUNT];
}; };
struct LFG_Struct { struct LFG_Struct {

4
common/patches/sod_structs.h
View File

@ -547,7 +547,7 @@ struct SpellBuff_Struct
/*002*/ uint8 bard_modifier; /*002*/ uint8 bard_modifier;
/*003*/ uint8 effect; //not real /*003*/ uint8 effect; //not real
/*004*/ uint32 spellid; /*004*/ uint32 spellid;
/*008*/ uint32 duration; /*008*/ int32 duration;
/*012*/ uint32 counters; /*012*/ uint32 counters;
/*016*/ uint32 unknown004; //Might need to be swapped with player_id /*016*/ uint32 unknown004; //Might need to be swapped with player_id
/*020*/ uint32 player_id; //'global' ID of the caster, for wearoff messages /*020*/ uint32 player_id; //'global' ID of the caster, for wearoff messages
@ -564,7 +564,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 unknown020; //prolly global player ID /*020*/ uint32 unknown020; //prolly global player ID
/*024*/ uint32 playerId; // Player id who cast the buff /*024*/ uint32 playerId; // Player id who cast the buff

4
common/patches/sof_structs.h
View File

@ -526,7 +526,7 @@ struct SpellBuff_Struct
/*002*/ uint8 bard_modifier; /*002*/ uint8 bard_modifier;
/*003*/ uint8 effect; //not real /*003*/ uint8 effect; //not real
/*004*/ uint32 spellid; /*004*/ uint32 spellid;
/*008*/ uint32 duration; /*008*/ int32 duration;
/*012*/ uint32 counters; /*012*/ uint32 counters;
/*016*/ uint32 unknown004; //Might need to be swapped with player_id /*016*/ uint32 unknown004; //Might need to be swapped with player_id
/*020*/ uint32 player_id; //'global' ID of the caster, for wearoff messages /*020*/ uint32 player_id; //'global' ID of the caster, for wearoff messages
@ -543,7 +543,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 unknown020; //prolly global player ID /*020*/ uint32 unknown020; //prolly global player ID
/*024*/ uint32 playerId; // Player id who cast the buff /*024*/ uint32 playerId; // Player id who cast the buff

4
common/patches/titanium_structs.h
View File

@ -445,7 +445,7 @@ struct SpellBuff_Struct
/*002*/ uint8 bard_modifier; /*002*/ uint8 bard_modifier;
/*003*/ uint8 effect; //not real /*003*/ uint8 effect; //not real
/*004*/ uint32 spellid; /*004*/ uint32 spellid;
/*008*/ uint32 duration; /*008*/ int32 duration;
/*012*/ uint32 counters; /*012*/ uint32 counters;
/*016*/ uint32 player_id; //'global' ID of the caster, for wearoff messages /*016*/ uint32 player_id; //'global' ID of the caster, for wearoff messages
}; };
@ -457,7 +457,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 unknown020; //prolly global player ID /*020*/ uint32 unknown020; //prolly global player ID
/*024*/ uint32 slotid; /*024*/ uint32 slotid;

8
common/patches/uf_structs.h
View File

@ -551,7 +551,7 @@ struct SpellBuff_Struct
/*003*/ uint8 effect; // not real /*003*/ uint8 effect; // not real
/*004*/ uint32 unknown004; // Seen 1 for no buff /*004*/ uint32 unknown004; // Seen 1 for no buff
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages /*020*/ uint32 player_id; // 'global' ID of the caster, for wearoff messages
/*024*/ uint32 counters; /*024*/ uint32 counters;
@ -568,7 +568,7 @@ struct SpellBuffFade_Struct_Underfoot {
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ float unknown008; /*008*/ float unknown008;
/*012*/ uint32 spellid; /*012*/ uint32 spellid;
/*016*/ uint32 duration; /*016*/ int32 duration;
/*020*/ uint32 num_hits; /*020*/ uint32 num_hits;
/*024*/ uint32 playerId; // Global player ID? /*024*/ uint32 playerId; // Global player ID?
/*028*/ uint32 unknown020; /*028*/ uint32 unknown020;
@ -585,7 +585,7 @@ struct SpellBuffFade_Struct {
/*006*/ uint8 effect; /*006*/ uint8 effect;
/*007*/ uint8 unknown7; /*007*/ uint8 unknown7;
/*008*/ uint32 spellid; /*008*/ uint32 spellid;
/*012*/ uint32 duration; /*012*/ int32 duration;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
/*020*/ uint32 unknown020; // Global player ID? /*020*/ uint32 unknown020; // Global player ID?
/*024*/ uint32 playerId; // Player id who cast the buff /*024*/ uint32 playerId; // Player id who cast the buff
@ -2188,7 +2188,7 @@ struct GroupFollow_Struct { // Underfoot Follow Struct
struct InspectBuffs_Struct { struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT]; /*000*/ uint32 spell_id[BUFF_COUNT];
/*100*/ uint32 filler100[5]; // BUFF_COUNT is really 30... /*100*/ uint32 filler100[5]; // BUFF_COUNT is really 30...
/*120*/ uint32 tics_remaining[BUFF_COUNT]; /*120*/ int32 tics_remaining[BUFF_COUNT];
/*220*/ uint32 filler220[5]; // BUFF_COUNT is really 30... /*220*/ uint32 filler220[5]; // BUFF_COUNT is really 30...
}; };

2
common/version.h
View File

@ -30,7 +30,7 @@
Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9078 #define CURRENT_BINARY_DATABASE_VERSION 9079
#define COMPILE_DATE __DATE__ #define COMPILE_DATE __DATE__
#define COMPILE_TIME __TIME__ #define COMPILE_TIME __TIME__
#ifndef WIN32 #ifndef WIN32

1
utils/sql/db_update_manifest.txt
View File

@ -332,6 +332,7 @@
9076|2015_02_04_average_coin.sql|SHOW COLUMNS FROM `loottable` WHERE Field = 'avgcoin'|contains|smallint 9076|2015_02_04_average_coin.sql|SHOW COLUMNS FROM `loottable` WHERE Field = 'avgcoin'|contains|smallint
9077|2015_02_12_zone_gravity.sql|SHOW COLUMNS FROM `zone` LIKE 'gravity'|empty| 9077|2015_02_12_zone_gravity.sql|SHOW COLUMNS FROM `zone` LIKE 'gravity'|empty|
9078|2015_05_20_BuffInstrumentMod.sql|SHOW COLUMNS FROM `character_buffs` LIKE 'instrument_mod'|empty| 9078|2015_05_20_BuffInstrumentMod.sql|SHOW COLUMNS FROM `character_buffs` LIKE 'instrument_mod'|empty|
9079|2015_05_23_BuffDurations.sql|SHOW COLUMNS FROM `character_buffs` LIKE 'ticsremaining'|contains|unsigned|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

2
utils/sql/git/required/2015_05_23_BuffDurations.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `character_buffs` CHANGE COLUMN `ticsremaining` `ticsremaining` INT(11) SIGNED NOT NULL;
ALTER TABLE `merc_buffs` CHANGE COLUMN `TicsRemaining` `TicsRemaining` INT(11) SIGNED NOT NULL DEFAULT 0;

2
zone/bonuses.cpp
View File

@ -1473,7 +1473,7 @@ void Mob::CalcSpellBonuses(StatBonuses* newbon)
} }
void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId, void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
uint8 WornType, uint32 ticsremaining, int buffslot, int instrument_mod, uint8 WornType, int32 ticsremaining, int buffslot, int instrument_mod,
bool IsAISpellEffect, uint16 effect_id, int32 se_base, int32 se_limit, int32 se_max) bool IsAISpellEffect, uint16 effect_id, int32 se_base, int32 se_limit, int32 se_max)
{ {
int i, effect_value, base2, max, effectid; int i, effect_value, base2, max, effectid;

24
zone/effects.cpp
View File

@ -89,7 +89,7 @@ int32 Mob::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
if (IsClient() && GetClass() == WIZARD) if (IsClient() && GetClass() == WIZARD)
ratio += RuleI(Spells, WizCritRatio); //Default is zero ratio += RuleI(Spells, WizCritRatio); //Default is zero
if (Critical){ if (Critical){
value = value_BaseEffect*ratio/100; value = value_BaseEffect*ratio/100;
@ -172,7 +172,7 @@ int32 Mob::GetActDoTDamage(uint16 spell_id, int32 value, Mob* target) {
value += int(value_BaseEffect*GetFocusEffect(focusImprovedDamage, spell_id)/100)*ratio/100; value += int(value_BaseEffect*GetFocusEffect(focusImprovedDamage, spell_id)/100)*ratio/100;
value += int(value_BaseEffect*GetFocusEffect(focusFcDamagePctCrit, spell_id)/100)*ratio/100; value += int(value_BaseEffect*GetFocusEffect(focusFcDamagePctCrit, spell_id)/100)*ratio/100;
value += int(value_BaseEffect*target->GetVulnerability(this, spell_id, 0)/100)*ratio/100; value += int(value_BaseEffect*target->GetVulnerability(this, spell_id, 0)/100)*ratio/100;
extra_dmg = target->GetFcDamageAmtIncoming(this, spell_id) + extra_dmg = target->GetFcDamageAmtIncoming(this, spell_id) +
int(GetFocusEffect(focusFcDamageAmtCrit, spell_id)*ratio/100) + int(GetFocusEffect(focusFcDamageAmtCrit, spell_id)*ratio/100) +
GetFocusEffect(focusFcDamageAmt, spell_id); GetFocusEffect(focusFcDamageAmt, spell_id);
@ -219,11 +219,11 @@ int32 Mob::GetExtraSpellAmt(uint16 spell_id, int32 extra_spell_amt, int32 base_s
total_cast_time = spells[spell_id].recovery_time + spells[spell_id].cast_time; total_cast_time = spells[spell_id].recovery_time + spells[spell_id].cast_time;
if (total_cast_time > 0 && total_cast_time <= 2500) if (total_cast_time > 0 && total_cast_time <= 2500)
extra_spell_amt = extra_spell_amt*25/100; extra_spell_amt = extra_spell_amt*25/100;
else if (total_cast_time > 2500 && total_cast_time < 7000) else if (total_cast_time > 2500 && total_cast_time < 7000)
extra_spell_amt = extra_spell_amt*(167*((total_cast_time - 1000)/1000)) / 1000; extra_spell_amt = extra_spell_amt*(167*((total_cast_time - 1000)/1000)) / 1000;
else else
extra_spell_amt = extra_spell_amt * total_cast_time / 7000; extra_spell_amt = extra_spell_amt * total_cast_time / 7000;
if(extra_spell_amt*2 < base_spell_dmg) if(extra_spell_amt*2 < base_spell_dmg)
return 0; return 0;
@ -281,7 +281,7 @@ int32 Mob::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
if (Critical) { if (Critical) {
entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits, entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits,
OTHER_CRIT_HEAL, GetName(), itoa(value)); OTHER_CRIT_HEAL, GetName(), itoa(value));
if (IsClient()) if (IsClient())
Message_StringID(MT_SpellCrits, YOU_CRIT_HEAL, itoa(value)); Message_StringID(MT_SpellCrits, YOU_CRIT_HEAL, itoa(value));
} }
@ -413,6 +413,10 @@ int32 Client::GetActSpellCost(uint16 spell_id, int32 cost)
int32 Mob::GetActSpellDuration(uint16 spell_id, int32 duration) int32 Mob::GetActSpellDuration(uint16 spell_id, int32 duration)
{ {
if ((aabonuses.IllusionPersistence || spellbonuses.IllusionPersistence || itembonuses.IllusionPersistence) &&
IsEffectInSpell(spell_id, SE_Illusion))
return 10000; // ~16h
if (spells[spell_id].not_extendable) if (spells[spell_id].not_extendable)
return duration; return duration;
@ -771,7 +775,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust); caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust);
} }
} else { } else {
if (spells[spell_id].aemaxtargets && iCounter < spells[spell_id].aemaxtargets) if (spells[spell_id].aemaxtargets && iCounter < spells[spell_id].aemaxtargets)
caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust); caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust);
if (!spells[spell_id].aemaxtargets) if (!spells[spell_id].aemaxtargets)
caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust); caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust);
@ -859,7 +863,7 @@ void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool aff
if (!center->CheckLosFN(curmob)) if (!center->CheckLosFN(curmob))
continue; continue;
} else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies... } else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
// See notes in AESpell() above for more info. // See notes in AESpell() above for more info.
if (caster->IsAttackAllowed(curmob, true)) if (caster->IsAttackAllowed(curmob, true))
continue; continue;
if (caster->CheckAggro(curmob)) if (caster->CheckAggro(curmob))

2
zone/mob.h
View File

@ -200,7 +200,7 @@ public:
bool IsBeneficialAllowed(Mob *target); bool IsBeneficialAllowed(Mob *target);
virtual int GetCasterLevel(uint16 spell_id); virtual int GetCasterLevel(uint16 spell_id);
void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0, void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0,
uint8 WornType = 0, uint32 ticsremaining = 0, int buffslot = -1, int instrument_mod = 10, uint8 WornType = 0, int32 ticsremaining = 0, int buffslot = -1, int instrument_mod = 10,
bool IsAISpellEffect = false, uint16 effect_id = 0, int32 se_base = 0, int32 se_limit = 0, int32 se_max = 0); bool IsAISpellEffect = false, uint16 effect_id = 0, int32 se_base = 0, int32 se_limit = 0, int32 se_max = 0);
void NegateSpellsBonuses(uint16 spell_id); void NegateSpellsBonuses(uint16 spell_id);
virtual float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false); virtual float GetActSpellRange(uint16 spell_id, float range, bool IsBard = false);

4
zone/spell_effects.cpp
View File

@ -83,7 +83,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
if(c_override) if(c_override)
{ {
int durat = CalcBuffDuration(caster, this, spell_id, caster_level); int durat = CalcBuffDuration(caster, this, spell_id, caster_level);
if(durat > 0) if(durat) // negatives are perma buffs
{ {
buffslot = AddBuff(caster, spell_id, durat, caster_level); buffslot = AddBuff(caster, spell_id, durat, caster_level);
if(buffslot == -1) // stacking failure if(buffslot == -1) // stacking failure
@ -3366,7 +3366,7 @@ void Mob::BuffProcess()
if(buffs[buffs_i].spellid == SPELL_UNKNOWN) if(buffs[buffs_i].spellid == SPELL_UNKNOWN)
continue; continue;
if(spells[buffs[buffs_i].spellid].buffdurationformula != DF_Permanent) if(buffs[buffs_i].ticsremaining > 0) // perma buffs will either be -1 or -4
{ {
if(!zone->BuffTimersSuspended() || !IsSuspendableSpell(buffs[buffs_i].spellid)) if(!zone->BuffTimersSuspended() || !IsSuspendableSpell(buffs[buffs_i].spellid))
{ {

129
zone/spells.cpp
View File

@ -2630,80 +2630,75 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste
Log.Out(Logs::Detail, Logs::Spells, "Spell %d: Casting level %d, formula %d, base_duration %d: result %d", Log.Out(Logs::Detail, Logs::Spells, "Spell %d: Casting level %d, formula %d, base_duration %d: result %d",
spell_id, castlevel, formula, duration, res); spell_id, castlevel, formula, duration, res);
return(res); return res;
} }
// the generic formula calculations // the generic formula calculations
int CalcBuffDuration_formula(int level, int formula, int duration) int CalcBuffDuration_formula(int level, int formula, int duration)
{ {
int i; // temp variable int temp;
switch(formula) switch (formula) {
{ case 1:
case 0: // not a buff temp = level > 3 ? level / 2 : 1;
return 0; break;
case 2:
case 1: temp = level > 3 ? level / 2 + 5 : 6;
i = (int)ceil(level / 2.0f); break;
return i < duration ? (i < 1 ? 1 : i) : duration; case 3:
temp = 30 * level;
case 2: break;
i = (int)ceil(level / 5.0f * 3); case 4: // only used by 'LowerElement'
return i < duration ? (i < 1 ? 1 : i) : duration; temp = 50;
break;
case 3: case 5:
i = level * 30; temp = 2;
return i < duration ? (i < 1 ? 1 : i) : duration; break;
case 6:
case 4: // only used by 'LowerElement' temp = level / 2 + 2;
return ((duration != 0) ? duration : 50); break;
case 7:
case 5: temp = level;
i = duration; break;
// 0 value results in a 3 tick spell, else its between 1-3 ticks. case 8:
return i < 3 ? (i < 1 ? 3 : i) : 3; temp = level + 10;
break;
case 6: case 9:
i = (int)ceil(level / 2.0f); temp = 2 * level + 10;
return i < duration ? (i < 1 ? 1 : i) : duration; break;
case 10:
case 7: temp = 3 * level + 10;
i = level; break;
return (duration == 0) ? (i < 1 ? 1 : i) : duration; case 11:
temp = 30 * (level + 3);
case 8: break;
i = level + 10; case 12:
return i < duration ? (i < 1 ? 1 : i) : duration; temp = level > 7 ? level / 4 : 1;
break;
case 9: case 13:
i = level * 2 + 10; temp = 4 * level + 10;
return i < duration ? (i < 1 ? 1 : i) : duration; break;
case 14:
case 10: temp = 5 * (level + 2);
i = level * 3 + 10; break;
return i < duration ? (i < 1 ? 1 : i) : duration; case 15:
temp = 10 * (level + 10);
case 11: break;
return std::min((level + 3) * 30, duration); case 50: // Permanent. Cancelled by casting/combat for perm invis, non-lev zones for lev, curing poison/curse
// counters, etc.
case 12: return -1;
case 13: case 51: // Permanent. Cancelled when out of range of aura.
case 14: return -4;
case 15: // Don't know what the real formula for this should be. Used by Skinspikes potion. default:
return duration; // the client function has another bool parameter that if true returns -2 -- unsure
if (formula < 200)
case 50: // Permanent. Cancelled by casting/combat for perm invis, non-lev zones for lev, curing poison/curse counters, etc.
return 72000; // 5 days until better method to make permanent
//case 51: // Permanent. Cancelled when out of range of aura. Placeholder until appropriate duration identified.
case 3600:
return duration ? duration : 3600;
default:
Log.Out(Logs::General, Logs::None, "CalcBuffDuration_formula: unknown formula %d", formula);
return 0; return 0;
temp = formula;
break;
} }
if (duration && duration < temp)
temp = duration;
return temp;
} }
// helper function for AddBuff to determine stacking // helper function for AddBuff to determine stacking
@ -3066,7 +3061,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
if (duration == 0) { if (duration == 0) {
duration = CalcBuffDuration(caster, this, spell_id); duration = CalcBuffDuration(caster, this, spell_id);
if (caster) if (caster && duration > 0) // negatives are perma buffs
duration = caster->GetActSpellDuration(spell_id, duration); duration = caster->GetActSpellDuration(spell_id, duration);
} }

12
zone/zonedb.cpp
View File

@ -2504,7 +2504,7 @@ void ZoneDatabase::SaveMercBuffs(Merc *merc) {
"TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, " "TicsRemaining, PoisonCounters, DiseaseCounters, CurseCounters, "
"CorruptionCounters, HitCount, MeleeRune, MagicRune, dot_rune, " "CorruptionCounters, HitCount, MeleeRune, MagicRune, dot_rune, "
"caston_x, Persistent, caston_y, caston_z, ExtraDIChance) " "caston_x, Persistent, caston_y, caston_z, ExtraDIChance) "
"VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %i, %u, %i, %i, %i);", "VALUES (%u, %u, %u, %u, %u, %d, %u, %u, %u, %u, %u, %u, %u, %i, %u, %i, %i, %i);",
merc->GetMercID(), buffs[buffCount].spellid, buffs[buffCount].casterlevel, merc->GetMercID(), buffs[buffCount].spellid, buffs[buffCount].casterlevel,
spells[buffs[buffCount].spellid].buffdurationformula, buffs[buffCount].ticsremaining, spells[buffs[buffCount].spellid].buffdurationformula, buffs[buffCount].ticsremaining,
CalculatePoisonCounters(buffs[buffCount].spellid) > 0 ? buffs[buffCount].counters : 0, CalculatePoisonCounters(buffs[buffCount].spellid) > 0 ? buffs[buffCount].counters : 0,
@ -2982,7 +2982,7 @@ void ZoneDatabase::SaveBuffs(Client *client) {
"caster_level, caster_name, ticsremaining, counters, numhits, melee_rune, " "caster_level, caster_name, ticsremaining, counters, numhits, melee_rune, "
"magic_rune, persistent, dot_rune, caston_x, caston_y, caston_z, ExtraDIChance, " "magic_rune, persistent, dot_rune, caston_x, caston_y, caston_z, ExtraDIChance, "
"instrument_mod) " "instrument_mod) "
"VALUES('%u', '%u', '%u', '%u', '%s', '%u', '%u', '%u', '%u', '%u', '%u', '%u', " "VALUES('%u', '%u', '%u', '%u', '%s', '%d', '%u', '%u', '%u', '%u', '%u', '%u', "
"'%i', '%i', '%i', '%i', '%i')", client->CharacterID(), index, buffs[index].spellid, "'%i', '%i', '%i', '%i', '%i')", client->CharacterID(), index, buffs[index].spellid,
buffs[index].casterlevel, buffs[index].caster_name, buffs[index].ticsremaining, buffs[index].casterlevel, buffs[index].caster_name, buffs[index].ticsremaining,
buffs[index].counters, buffs[index].numhits, buffs[index].melee_rune, buffs[index].counters, buffs[index].numhits, buffs[index].melee_rune,
@ -3023,7 +3023,7 @@ void ZoneDatabase::LoadBuffs(Client *client)
Client *caster = entity_list.GetClientByName(row[3]); Client *caster = entity_list.GetClientByName(row[3]);
uint32 caster_level = atoi(row[2]); uint32 caster_level = atoi(row[2]);
uint32 ticsremaining = atoul(row[4]); int32 ticsremaining = atoi(row[4]);
uint32 counters = atoul(row[5]); uint32 counters = atoul(row[5]);
uint32 numhits = atoul(row[6]); uint32 numhits = atoul(row[6]);
uint32 melee_rune = atoul(row[7]); uint32 melee_rune = atoul(row[7]);
@ -3128,12 +3128,12 @@ void ZoneDatabase::SavePetInfo(Client *client)
query = StringFormat("INSERT INTO `character_pet_buffs` " query = StringFormat("INSERT INTO `character_pet_buffs` "
"(`char_id`, `pet`, `slot`, `spell_id`, `caster_level`, " "(`char_id`, `pet`, `slot`, `spell_id`, `caster_level`, "
"`ticsremaining`, `counters`) " "`ticsremaining`, `counters`) "
"VALUES (%u, %u, %u, %u, %u, %u, %d)", "VALUES (%u, %u, %u, %u, %u, %d, %d)",
client->CharacterID(), pet, index, petinfo->Buffs[index].spellid, client->CharacterID(), pet, index, petinfo->Buffs[index].spellid,
petinfo->Buffs[index].level, petinfo->Buffs[index].duration, petinfo->Buffs[index].level, petinfo->Buffs[index].duration,
petinfo->Buffs[index].counters); petinfo->Buffs[index].counters);
else else
query += StringFormat(", (%u, %u, %u, %u, %u, %u, %d)", query += StringFormat(", (%u, %u, %u, %u, %u, %d, %d)",
client->CharacterID(), pet, index, petinfo->Buffs[index].spellid, client->CharacterID(), pet, index, petinfo->Buffs[index].spellid,
petinfo->Buffs[index].level, petinfo->Buffs[index].duration, petinfo->Buffs[index].level, petinfo->Buffs[index].duration,
petinfo->Buffs[index].counters); petinfo->Buffs[index].counters);
@ -3238,7 +3238,7 @@ void ZoneDatabase::LoadPetInfo(Client *client) {
uint32 caster_level = atoi(row[3]); uint32 caster_level = atoi(row[3]);
int caster_id = 0; int caster_id = 0;
// The castername field is currently unused // The castername field is currently unused
uint32 ticsremaining = atoul(row[5]); int32 ticsremaining = atoi(row[5]);
uint32 counters = atoul(row[6]); uint32 counters = atoul(row[6]);
pi->Buffs[slot_id].spellid = spell_id; pi->Buffs[slot_id].spellid = spell_id;