Skip to content
This repository has been archived by the owner on Apr 29, 2020. It is now read-only.

Fixed useMobAbility with self-targeting abilities #3359

Closed
wants to merge 2 commits into from
Closed

Fixed useMobAbility with self-targeting abilities #3359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbc9150
Fixed useMobAbility with self-targeting abilities
ymkc Sep 7, 2016
399a287
distance check for useMobAbility
ymkc Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/map/lua/lua_baseentity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8748,10 +8748,19 @@ inline int32 CLuaBaseEntity::useMobAbility(lua_State* L)
}

m_PBaseEntity->PAI->QueueAction(queueAction_t(0ms, true, [PTarget, skillid](auto PEntity) {
if (PTarget)
PEntity->PAI->MobSkill(PTarget->targid, skillid);
if (!PTarget && battleutils::GetMobSkill(skillid)->getValidTargets() & TARGET_SELF)
PEntity->PAI->MobSkill(PEntity->targid, skillid);

else if (PTarget)
{
if (distance(PEntity->loc.p, PTarget->loc.p) <= battleutils::GetMobSkill(skillid)->getDistance())
PEntity->PAI->MobSkill(PTarget->targid, skillid);
}
else if (dynamic_cast<CMobEntity*>(PEntity))
PEntity->PAI->MobSkill(static_cast<CMobEntity*>(PEntity)->GetBattleTargetID(), skillid);
{
if (distance(PEntity->loc.p, static_cast<CMobEntity*>(PEntity)->GetBattleTarget()->loc.p) <= battleutils::GetMobSkill(skillid)->getDistance())
PEntity->PAI->MobSkill(static_cast<CMobEntity*>(PEntity)->GetBattleTargetID(), skillid);
}
}));
}
else
Expand Down