From 7cc0a0fc82927ac7dfebf6fa098b42bc4ca931d9 Mon Sep 17 00:00:00 2001 From: Gent S Date: Fri, 27 Nov 2020 15:31:56 -0500 Subject: [PATCH] Fix group recall and temporarily lift range restriction --- src/NanoManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/NanoManager.cpp b/src/NanoManager.cpp index e9ae57a..b43dfc6 100644 --- a/src/NanoManager.cpp +++ b/src/NanoManager.cpp @@ -551,7 +551,7 @@ std::vector NanoManager::findTargets(Player* plr, int skillID, CNPacketData Player *otherPlr2 = PlayerManager::getPlayerFromID(otherPlr->groupIDs[i]); if (otherPlr2 == nullptr) continue; - if (hypot(otherPlr2->x - plr->x, otherPlr2->y - plr->y) < SkillTable[skillID].effectArea) { + if (true) {//hypot(otherPlr2->x - plr->x, otherPlr2->y - plr->y) < SkillTable[skillID].effectArea) { tD[i+1] = otherPlr->groupIDs[i]; tD[0] += 1; } @@ -859,10 +859,8 @@ void nanoPower(CNSocket *sock, std::vector targetData, for (int i = 0; i < targetData[0]; i++) { if (SkillTable[skillID].targetType == 3 && PlayerManager::getSockFromID(targetData[i + 1]) != nullptr) workSock = PlayerManager::getSockFromID(targetData[i+1]); - if (skillType == EST_RECALL || skillType == EST_RECALL_GROUP) - targetData[i+1] = plr->iID; if (!work(workSock, respdata, i, targetData[i+1], bitFlag, timeBuffID, duration, amount)) - return; + return; // TODO: Jade fix pls (name in popup is wrong) } sock->sendPacket((void*)&respbuf, P_FE2CL_NANO_SKILL_USE_SUCC, resplen);