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

add getStatusEffectBysource to lua_basenetity #6949

Merged
merged 1 commit into from
Feb 6, 2025
+36 −0
Merged

add getStatusEffectBysource to lua_basenetity #6949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 35 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 @@ -13234,6 +13234,40 @@ std::optional<CLuaStatusEffect> CLuaBaseEntity::getStatusEffect(uint16 StatusID,
return std::nullopt;
}

/************************************************************************
* Function: getStatusEffectBySource()
* Purpose : Returns the Object of a specified Status ID by source type and param
* Example : local aiming_gloves_enchantment = target:getStatusEffectBySource(xi.effect.ENCHANTMENT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.AIMING_GLOVES)
* Notes :
************************************************************************/

std::optional<CLuaStatusEffect> CLuaBaseEntity::getStatusEffectBySource(uint16 StatusID, EffectSourceType SourceType, uint16 SourceTypeParam)
{
if (m_PBaseEntity->objtype == TYPE_NPC)
{
ShowWarning("Invalid Entity (NPC: %s) calling function.", m_PBaseEntity->getName());
return std::nullopt;
}

auto* PBattleEntity = dynamic_cast<CBattleEntity*>(m_PBaseEntity);
if (!PBattleEntity)
{
return std::nullopt;
}

CStatusEffect* PStatusEffect = nullptr;
auto effect_StatusID = static_cast<EFFECT>(StatusID);

PStatusEffect = PBattleEntity->StatusEffectContainer->GetStatusEffectBySource(effect_StatusID, SourceType, SourceTypeParam);

if (PStatusEffect)
{
return std::optional<CLuaStatusEffect>(PStatusEffect);
}

return std::nullopt;
}

/************************************************************************
* Function: getStatusEffects()
* Purpose : Returns a Lua table of all Status Effects an Entity has
Expand Down Expand Up @@ -19398,6 +19432,7 @@ void CLuaBaseEntity::Register()
SOL_REGISTER("addStatusEffect", CLuaBaseEntity::addStatusEffect);
SOL_REGISTER("addStatusEffectEx", CLuaBaseEntity::addStatusEffectEx);
SOL_REGISTER("getStatusEffect", CLuaBaseEntity::getStatusEffect);
SOL_REGISTER("getStatusEffectBySource", CLuaBaseEntity::getStatusEffectBySource);
SOL_REGISTER("getStatusEffects", CLuaBaseEntity::getStatusEffects);
SOL_REGISTER("getStatusEffectElement", CLuaBaseEntity::getStatusEffectElement);
SOL_REGISTER("canGainStatusEffect", CLuaBaseEntity::canGainStatusEffect);
Expand Down
1 change: 1 addition & 0 deletions src/map/lua/lua_baseentity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ class CLuaBaseEntity
bool addStatusEffect(sol::variadic_args va);
bool addStatusEffectEx(sol::variadic_args va);
auto getStatusEffect(uint16 StatusID, sol::object const& SubType, sol::object const& SourceType, sol::object const& SourceTypeParam) -> std::optional<CLuaStatusEffect>;
auto getStatusEffectBySource(uint16 StatusID, EffectSourceType SourceType, uint16 SourceTypeParam) -> std::optional<CLuaStatusEffect>;
auto getStatusEffects() -> sol::table;
int16 getStatusEffectElement(uint16 statusId);
bool canGainStatusEffect(uint16 effect, sol::object const& powerObj);
Expand Down