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

[Bug Fix] Invis vs. Undead/Animal Breaks Charm for Pets (#3587)

Browse Source 
* IVU & IVA break charm pets #2212

* fix typing

* fix tab spacing

* Formatting

* Formatting for CalcInvisibleLevel

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Clayton Dunwell 2023-09-19 10:16:12 -04:00 committed by GitHub
parent 7166fcc650
commit f395ee0508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
zone/mob.cpp
View File

@ -593,42 +593,49 @@ void Mob::CalcSeeInvisibleLevel()
see_invis = std::max({ spellbonuses.SeeInvis, itembonuses.SeeInvis, aabonuses.SeeInvis, innate_see_invis }); see_invis = std::max({ spellbonuses.SeeInvis, itembonuses.SeeInvis, aabonuses.SeeInvis, innate_see_invis });
} }
void Mob::CalcInvisibleLevel() bool Mob::HasAnInvisibilityEffect() {
{ return invisible || hidden || improved_hidden || invisible_animals || invisible_undead;
bool is_invisible = invisible; }
invisible = std::max({ spellbonuses.invisibility, nobuff_invisible }); void Mob::BreakCharmPetIfConditionsMet() {
invisible_undead = spellbonuses.invisibility_verse_undead; auto pet = GetPet();
invisible_animals = spellbonuses.invisibility_verse_animal; if (pet && pet->GetPetType() == petCharmed && HasAnInvisibilityEffect()) {
if (RuleB(Pets, LivelikeBreakCharmOnInvis) || IsInvisible(pet)) {
if (!is_invisible && invisible) { pet->BuffFadeByEffect(SE_Charm);
SetInvisible(Invisibility::Invisible, true); }
return; LogRules(
} "Pets:LivelikeBreakCharmOnInvis for [{}] invisible [{}] hidden [{}] improved_hidden (shroud of stealth) [{}] invisible_animals [{}] invisible_undead [{}]",
GetCleanName(),
if (is_invisible && !invisible) { invisible,
SetInvisible(invisible, true); hidden,
return; improved_hidden,
invisible_animals,
invisible_undead
);
} }
} }
void Mob::SetInvisible(uint8 state, bool set_on_bonus_calc) void Mob::CalcInvisibleLevel()
{ {
/* bool was_invisible = invisible;
If you set an NPC to invisible you will only be able to see it on
your client if your see invisible level is greater than equal to the invisible level.
Note, the clients spell file must match the servers see invisible level on the spell.
*/
invisible = std::max({spellbonuses.invisibility, nobuff_invisible});
invisible_undead = spellbonuses.invisibility_verse_undead;
invisible_animals = spellbonuses.invisibility_verse_animal;
if (was_invisible != invisible) {
SetInvisible(invisible, true);
return;
}
BreakCharmPetIfConditionsMet();
}
void Mob::SetInvisible(uint8 state, bool set_on_bonus_calc) {
if (state == Invisibility::Visible) { if (state == Invisibility::Visible) {
SendAppearancePacket(AT_Invis, Invisibility::Visible); SendAppearancePacket(AT_Invis, Invisibility::Visible);
ZeroInvisibleVars(InvisType::T_INVISIBLE); ZeroInvisibleVars(InvisType::T_INVISIBLE);
} } else {
else {
/*
if your setting invisible from a script, or escape/fading memories effect then
we use the internal invis variable which allows invisible without a buff on mob.
*/
if (!set_on_bonus_calc) { if (!set_on_bonus_calc) {
nobuff_invisible = state; nobuff_invisible = state;
CalcInvisibleLevel(); CalcInvisibleLevel();
@ -636,14 +643,7 @@ void Mob::SetInvisible(uint8 state, bool set_on_bonus_calc)
SendAppearancePacket(AT_Invis, invisible); SendAppearancePacket(AT_Invis, invisible);
} }
// Invis and hide breaks charms BreakCharmPetIfConditionsMet();
auto pet = GetPet();
if (pet && pet->GetPetType() == petCharmed && (invisible || hidden || improved_hidden || invisible_animals || invisible_undead)) {
if (RuleB(Pets, LivelikeBreakCharmOnInvis) || IsInvisible(pet)) {
pet->BuffFadeByEffect(SE_Charm);
}
LogRules("Pets:LivelikeBreakCharmOnInvis for [{}] | Invis [{}] - Hidden [{}] - Shroud of Stealth [{}] - IVA [{}] - IVU [{}]", GetCleanName(), invisible, hidden, improved_hidden, invisible_animals, invisible_undead);
}
} }
void Mob::ZeroInvisibleVars(uint8 invisible_type) void Mob::ZeroInvisibleVars(uint8 invisible_type)

2
zone/mob.h
View File

@ -269,6 +269,8 @@ public:
return; return;
} }
bool HasAnInvisibilityEffect();
void BreakCharmPetIfConditionsMet();
//Invisible //Invisible
bool IsInvisible(Mob* other = 0) const; bool IsInvisible(Mob* other = 0) const;
void SetInvisible(uint8 state, bool set_on_bonus_calc = false); void SetInvisible(uint8 state, bool set_on_bonus_calc = false);