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

[Bug Fix] DI/Death Pact Fix (#3867)

Browse Source 
* [Bug Fix] DI/Death Pact Fix

Divine Intervention/Death Pact buffs were always fading the moment a person dropped below 16% regardless if it healed or not.  It will now only fade if it succeeds in healing, and it will only check to heal when a person drops below 16%

* Requested Updates
This commit is contained in:
Fryguy 2024-01-07 02:05:16 -05:00 committed by GitHub
parent 7923d7bc6c
commit 70a4b6a2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zone/attack.cpp
View File

@ -3810,6 +3810,8 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
if (damage > 0) { if (damage > 0) {
//if there is some damage being done and theres an attacker involved //if there is some damage being done and theres an attacker involved
int previous_hp_ratio = GetHPRatio();
if (attacker) { if (attacker) {
// if spell is lifetap add hp to the caster // if spell is lifetap add hp to the caster
if (IsValidSpell(spell_id) && IsLifetapSpell(spell_id)) { if (IsValidSpell(spell_id) && IsLifetapSpell(spell_id)) {
@ -4035,9 +4037,10 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
} }
} }
else { else {
if (GetHPRatio() < 16) if (GetHPRatio() < 16 && previous_hp_ratio >= 16) {
TryDeathSave(); TryDeathSave();
} }
}
TryTriggerOnCastRequirement(); TryTriggerOnCastRequirement();

5
zone/mob.h
View File

@ -62,6 +62,11 @@ namespace EQ
class ItemInstance; class ItemInstance;
} }
namespace DeathSave {
constexpr uint32 HP300 = 1;
constexpr uint32 HP8000 = 2;
}
enum class eSpecialAttacks : int { enum class eSpecialAttacks : int {
None, None,
Rampage, Rampage,

59
zone/spell_effects.cpp
View File

@ -6970,8 +6970,9 @@ bool Mob::TryDivineSave()
-If desired, additional spells can be triggered from the AA/item/spell effect, generally a heal. -If desired, additional spells can be triggered from the AA/item/spell effect, generally a heal.
*/ */
int32 SuccessChance = aabonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE] + itembonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE] + spellbonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE]; int32 success_chance = aabonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE] + itembonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE] + spellbonuses.DivineSaveChance[SBIndex::DIVINE_SAVE_CHANCE];
if (SuccessChance && zone->random.Roll(SuccessChance))
if (success_chance && zone->random.Roll(success_chance))
{ {
SetHP(1); SetHP(1);
@ -7016,36 +7017,37 @@ bool Mob::TryDeathSave() {
if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE]){ if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE]){
int SuccessChance = 0; int success_chance = 0;
int buffSlot = spellbonuses.DeathSave[SBIndex::DEATH_SAVE_BUFFSLOT]; int buffSlot = spellbonuses.DeathSave[SBIndex::DEATH_SAVE_BUFFSLOT];
int32 UD_HealMod = 0; int32 UD_HealMod = 0;
int64 HealAmt = 300; //Death Pact max Heal int64 HealAmt = 300; //Death Pact max Heal
if(buffSlot >= 0){ if(buffSlot >= 0){
UD_HealMod = buffs[buffSlot].ExtraDIChance; UD_HealMod = buffs[buffSlot].ExtraDIChance;
success_chance = ((GetCHA() * (RuleI(Spells, DeathSaveCharismaMod))) + 1) / 10; //(CHA Mod Default = 3)
SuccessChance = ( (GetCHA() * (RuleI(Spells, DeathSaveCharismaMod))) + 1) / 10; //(CHA Mod Default = 3) if (success_chance > 95) {
success_chance = 95;
}
if (SuccessChance > 95) if(zone->random.Roll(success_chance)) {
SuccessChance = 95; if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == DeathSave::HP8000) {
if(zone->random.Roll(SuccessChance)) {
if(spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == 2)
HealAmt = RuleI(Spells, DivineInterventionHeal); //8000HP is how much LIVE Divine Intervention max heals HealAmt = RuleI(Spells, DivineInterventionHeal); //8000HP is how much LIVE Divine Intervention max heals
}
//Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit) //Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit)
if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT] && (GetLevel() >= spellbonuses.DeathSave[SBIndex::DEATH_SAVE_MIN_LEVEL_FOR_HEAL])) if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT] && (GetLevel() >= spellbonuses.DeathSave[SBIndex::DEATH_SAVE_MIN_LEVEL_FOR_HEAL])) {
HealAmt += spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT]; HealAmt += spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT];
}
if ((GetMaxHP() - GetHP()) < HealAmt) if ((GetMaxHP() - GetHP()) < HealAmt) {
HealAmt = GetMaxHP() - GetHP(); HealAmt = GetMaxHP() - GetHP();
}
SetHP((GetHP()+HealAmt)); SetHP((GetHP()+HealAmt));
Message(Chat::Emote, "The gods have healed you for %i points of damage.", HealAmt); Message(Chat::Emote, "The gods have healed you for %i points of damage.", HealAmt);
if(spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == 2) if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == DeathSave::HP8000) {
entity_list.MessageCloseString( entity_list.MessageCloseString(
this, this,
false, false,
@ -7053,38 +7055,40 @@ bool Mob::TryDeathSave() {
Chat::MeleeCrit, Chat::MeleeCrit,
DIVINE_INTERVENTION, DIVINE_INTERVENTION,
GetCleanName()); GetCleanName());
else } else {
entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName()); entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
}
SendHPUpdate(); SendHPUpdate();
BuffFadeBySlot(buffSlot);
return true; return true;
} }
else if (UD_HealMod) { else if (UD_HealMod) {
success_chance = ((GetCHA() * (RuleI(Spells, DeathSaveCharismaMod))) + 1) / 10;
SuccessChance = ((GetCHA() * (RuleI(Spells, DeathSaveCharismaMod))) + 1) / 10; if (success_chance > 95) {
success_chance = 95;
}
if (SuccessChance > 95) if (zone->random.Roll(success_chance)) {
SuccessChance = 95; if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == DeathSave::HP8000) {
if(zone->random.Roll(SuccessChance)) {
if(spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == 2)
HealAmt = RuleI(Spells, DivineInterventionHeal); HealAmt = RuleI(Spells, DivineInterventionHeal);
}
//Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit) //Check if bonus Heal amount can be applied ([3] Bonus Heal [2] Level limit)
if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT] && (GetLevel() >= spellbonuses.DeathSave[SBIndex::DEATH_SAVE_MIN_LEVEL_FOR_HEAL])) if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT] && (GetLevel() >= spellbonuses.DeathSave[SBIndex::DEATH_SAVE_MIN_LEVEL_FOR_HEAL])) {
HealAmt += spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT]; HealAmt += spellbonuses.DeathSave[SBIndex::DEATH_SAVE_HEAL_AMT];
}
HealAmt = HealAmt*UD_HealMod/100; HealAmt = HealAmt*UD_HealMod/100;
if ((GetMaxHP() - GetHP()) < HealAmt) if ((GetMaxHP() - GetHP()) < HealAmt) {
HealAmt = GetMaxHP() - GetHP(); HealAmt = GetMaxHP() - GetHP();
}
SetHP((GetHP()+HealAmt)); SetHP((GetHP()+HealAmt));
Message(Chat::Emote, "The gods have healed you for %i points of damage.", HealAmt); Message(Chat::Emote, "The gods have healed you for %i points of damage.", HealAmt);
if(spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == 2) if (spellbonuses.DeathSave[SBIndex::DEATH_SAVE_TYPE] == DeathSave::HP8000) {
entity_list.MessageCloseString( entity_list.MessageCloseString(
this, this,
false, false,
@ -7092,8 +7096,9 @@ bool Mob::TryDeathSave() {
Chat::MeleeCrit, Chat::MeleeCrit,
DIVINE_INTERVENTION, DIVINE_INTERVENTION,
GetCleanName()); GetCleanName());
else } else {
entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName()); entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
}
SendHPUpdate(); SendHPUpdate();
BuffFadeBySlot(buffSlot); BuffFadeBySlot(buffSlot);