pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bots] Update ResistSpell to use temp_level_diff client formula (#2851)

Browse Source
This commit is contained in:
Aeadoin 2023-02-09 10:36:15 -05:00 committed by GitHub
parent 7064a4156f
commit a49fa42f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
zone/spells.cpp
View File

@ -1390,35 +1390,18 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
float channelchance, distance_moved, d_x, d_y, distancemod; float channelchance, distance_moved, d_x, d_y, distancemod;
if(IsClient()) if (IsOfClientBot()) {
{
float channelbonuses = 0.0f; float channelbonuses = 0.0f;
//AA that effect Spell channel chance are no longer on live. http://everquest.allakhazam.com/history/patches-2006-2.html //AA that effect Spell channel chance are no longer on live. http://everquest.allakhazam.com/history/patches-2006-2.html
//No harm in maintaining the effects regardless, since we do check for channel chance. //No harm in maintaining the effects regardless, since we do check for channel chance.
if (IsFromItem) channelbonuses += IsFromItem ?
channelbonuses += spellbonuses.ChannelChanceItems + itembonuses.ChannelChanceItems + aabonuses.ChannelChanceItems; spellbonuses.ChannelChanceItems + itembonuses.ChannelChanceItems + aabonuses.ChannelChanceItems :
else spellbonuses.ChannelChanceSpells + itembonuses.ChannelChanceSpells + aabonuses.ChannelChanceSpells;
channelbonuses += spellbonuses.ChannelChanceSpells + itembonuses.ChannelChanceSpells + aabonuses.ChannelChanceSpells;
// max 93% chance at 252 skill // max 93% chance at 252 skill
channelchance = 30 + GetSkill(EQ::skills::SkillChanneling) / 400.0f * 100; channelchance = 30 + GetSkill(EQ::skills::SkillChanneling) / 400.0f * 100;
channelchance -= attacked_count * 2; channelchance -= attacked_count * 2;
channelchance += channelchance * channelbonuses / 100.0f; channelchance += channelchance * channelbonuses / 100.0f;
} } else {
else if(IsBot()) {
float channelbonuses = 0.0f;
if (IsFromItem)
channelbonuses += spellbonuses.ChannelChanceItems + itembonuses.ChannelChanceItems + aabonuses.ChannelChanceItems;
else
channelbonuses += spellbonuses.ChannelChanceSpells + itembonuses.ChannelChanceSpells + aabonuses.ChannelChanceSpells;
// max 93% chance at 252 skill
channelchance = 30 + GetSkill(EQ::skills::SkillChanneling) / 400.0f * 100;
channelchance -= attacked_count * 2;
channelchance += channelchance * channelbonuses / 100.0f;
}
else {
// NPCs are just hard to interrupt, otherwise they get pwned // NPCs are just hard to interrupt, otherwise they get pwned
channelchance = 85; channelchance = 85;
channelchance -= attacked_count; channelchance -= attacked_count;
@ -2560,7 +2543,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
case CAHateList: case CAHateList:
{ {
if(!IsClient()) if(!IsOfClientBotMerc())
{ {
hate_list.SpellCast(this, spell_id, spells[spell_id].range > spells[spell_id].aoe_range ? spells[spell_id].range : spells[spell_id].aoe_range); hate_list.SpellCast(this, spell_id, spells[spell_id].range > spells[spell_id].aoe_range ? spells[spell_id].range : spells[spell_id].aoe_range);
} }
@ -3576,17 +3559,13 @@ bool Mob::SpellOnTarget(
) { ) {
if ( if (
spells[spell_id].pcnpc_only_flag == 1 && spells[spell_id].pcnpc_only_flag == 1 &&
!spelltar->IsClient() && !spelltar->IsOfClientBotMerc()
!spelltar->IsMerc() &&
!spelltar->IsBot()
) { ) {
return false; return false;
} else if ( } else if (
spells[spell_id].pcnpc_only_flag == 2 && spells[spell_id].pcnpc_only_flag == 2 &&
( (
spelltar->IsClient() || spelltar->IsOfClientBotMerc()
spelltar->IsMerc() ||
spelltar->IsBot()
) )
) { ) {
return false; return false;
@ -4956,7 +4935,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
} }
} }
if(IsClient() && level >= 21 && temp_level_diff > 15) if(IsOfClientBot()&& level >= 21 && temp_level_diff > 15)
{ {
temp_level_diff = 15; temp_level_diff = 15;
} }
@ -5181,7 +5160,7 @@ int16 Mob::CalcResistChanceBonus()
{ {
int resistchance = spellbonuses.ResistSpellChance + itembonuses.ResistSpellChance; int resistchance = spellbonuses.ResistSpellChance + itembonuses.ResistSpellChance;
if (IsClient() || IsBot()) { if (IsOfClientBot()) {
resistchance += aabonuses.ResistSpellChance; resistchance += aabonuses.ResistSpellChance;
} }
return resistchance; return resistchance;
@ -5190,7 +5169,7 @@ int16 Mob::CalcResistChanceBonus()
int16 Mob::CalcFearResistChance() int16 Mob::CalcFearResistChance()
{ {
int resistchance = spellbonuses.ResistFearChance + itembonuses.ResistFearChance; int resistchance = spellbonuses.ResistFearChance + itembonuses.ResistFearChance;
if (IsClient() || IsBot()) { if (IsOfClientBot()) {
resistchance += aabonuses.ResistFearChance; resistchance += aabonuses.ResistFearChance;
if (aabonuses.Fearless == true) { if (aabonuses.Fearless == true) {
resistchance = 100; resistchance = 100;
@ -5921,7 +5900,7 @@ bool Mob::IsCombatProc(uint16 spell_id) {
} }
} }
if (IsClient() || IsBot()) { if (IsOfClientBot()) {
for (int i = 0; i < MAX_AA_PROCS; i += 4) { for (int i = 0; i < MAX_AA_PROCS; i += 4) {
if (aabonuses.SpellProc[i + 1] == spell_id || if (aabonuses.SpellProc[i + 1] == spell_id ||
aabonuses.RangedProc[i + 1] == spell_id || aabonuses.RangedProc[i + 1] == spell_id ||