Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[lua] [core] Chi Blast: fix xi.ability.adjustDamage param fix, rename xi.ability.adjustDamage params, add safety to UpdateEnmityFromDamage #7091

Merged
merged 2 commits into from
Feb 20, 2025
Merged

[lua] [core] Chi Blast: fix xi.ability.adjustDamage param fix, rename xi.ability.adjustDamage params, add safety to UpdateEnmityFromDamage #7091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34dc4a
[lua] Adjust Chi Blast to use correct params on xi.ability.adjustDamage
WinterSolstice8 Feb 19, 2025
c210f96
[core] Add safety to updateEnmityFromDamage
WinterSolstice8 Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/globals/ability.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xi = xi or {}
xi.ability = xi.ability or {}

xi.ability.adjustDamage = function(dmg, mob, skill, target, skilltype, skillparam, shadowbehav) -- seems to only be used for Wyvern breaths and chi blast
xi.ability.adjustDamage = function(dmg, attacker, skill, target, skilltype, skillparam, shadowbehav) -- seems to only be used for Wyvern breaths and chi blast
-- physical attack missed, skip rest
local msg = skill:getMsg()
if
Expand Down Expand Up @@ -89,7 +89,7 @@ xi.ability.adjustDamage = function(dmg, mob, skill, target, skilltype, skillpara

if dmg > 0 then
target:wakeUp()
target:updateEnmityFromDamage(mob, dmg)
target:updateEnmityFromDamage(attacker, dmg)
end

return dmg
Expand Down
2 changes: 1 addition & 1 deletion scripts/globals/job_utils/monk.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ xi.job_utils.monk.useChiBlast = function(player, target, ability)

local dmg = math.floor(player:getStat(xi.mod.MND) * (0.5 + (math.random() / 2))) * multiplier

dmg = xi.ability.adjustDamage(dmg, target, ability, target, xi.attackType.BREATH, nil, xi.mobskills.shadowBehavior.IGNORE_SHADOWS)
dmg = xi.ability.adjustDamage(dmg, player, ability, target, xi.attackType.BREATH, nil, xi.mobskills.shadowBehavior.IGNORE_SHADOWS)
target:takeDamage(dmg, player, xi.attackType.BREATH, xi.damageType.ELEMENTAL)
target:updateClaim(player)
player:delStatusEffect(xi.effect.BOOST)
Expand Down
26 changes: 18 additions & 8 deletions src/map/enmity_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,27 @@ void CEnmityContainer::SetVE(CBattleEntity* PEntity, const int32 amount)
void CEnmityContainer::UpdateEnmityFromDamage(CBattleEntity* PEntity, int32 Damage)
{
TracyZoneScoped;
Damage = (Damage < 1 ? 1 : Damage);
int16 damageMod = battleutils::GetEnmityModDamage(m_EnmityHolder->GetMLevel());

int32 CE = (int32)(80.f / damageMod * Damage);
int32 VE = (int32)(240.f / damageMod * Damage);
if (PEntity && m_EnmityHolder)
{
// Don't add enmity to yourself
if (m_EnmityHolder->id == PEntity->id)
{
return;
}

UpdateEnmity(PEntity, CE, VE);
Damage = (Damage < 1 ? 1 : Damage);
int16 damageMod = battleutils::GetEnmityModDamage(m_EnmityHolder->GetMLevel());

if (m_EnmityHolder && m_EnmityHolder->m_HiPCLvl < PEntity->GetMLevel())
{
m_EnmityHolder->m_HiPCLvl = PEntity->GetMLevel();
int32 CE = (int32)(80.f / damageMod * Damage);
int32 VE = (int32)(240.f / damageMod * Damage);

UpdateEnmity(PEntity, CE, VE);

if (m_EnmityHolder->m_HiPCLvl < PEntity->GetMLevel())
{
m_EnmityHolder->m_HiPCLvl = PEntity->GetMLevel();
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/map/lua/lua_baseentity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12879,6 +12879,12 @@ void CLuaBaseEntity::updateEnmityFromDamage(CLuaBaseEntity* PEntity, int32 damag
{
auto* PBaseMob = static_cast<CMobEntity*>(m_PBaseEntity);

if (m_PBaseEntity->id == PEntity->getID())
{
ShowWarning(fmt::format("updateEnmityFromDamage(): Attempting to add enmity from damage to self ({}, {})!", PEntity->getName(), PEntity->getID()));
return;
}

// This is a mob attacking a target and losing enmity from doing damage
if (m_PBaseEntity->objtype == TYPE_PC || m_PBaseEntity->objtype == TYPE_PET || (m_PBaseEntity->objtype == TYPE_MOB && PBaseMob->isCharmed))
{
Expand Down