OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-04 22:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix getNearestNPC w/ uses

Browse Source
This commit is contained in:
Gent S 2020-11-22 19:14:46 -05:00
parent dab536cb6a
commit e0858a42b2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ChatManager.cpp
View File

@ -263,8 +263,7 @@ void summonWCommand(std::string full, std::vector<std::string>& args, CNSocket*
void unsummonWCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) { void unsummonWCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
std::vector<Chunk*> chunks; // TODO BaseNPC* npc = NPCManager::getNearestNPC(plr->viewableChunks, plr->x, plr->y, plr->z);
BaseNPC* npc = NPCManager::getNearestNPC(chunks, plr->x, plr->y, plr->z);
if (npc == nullptr) { if (npc == nullptr) {
ChatManager::sendServerMessage(sock, "/unsummonW: No NPCs found nearby"); ChatManager::sendServerMessage(sock, "/unsummonW: No NPCs found nearby");
@ -286,11 +285,19 @@ void unsummonWCommand(std::string full, std::vector<std::string>& args, CNSocket
int leadId = ((Mob*)npc)->groupLeader; int leadId = ((Mob*)npc)->groupLeader;
if (leadId != 0) { if (leadId != 0) {
if (MobManager::Mobs.find(leadId) == MobManager::Mobs.end()) {
std::cout << "[WARN] unsummonW: leader not found!" << std::endl;
}
Mob* leadNpc = MobManager::Mobs[leadId]; Mob* leadNpc = MobManager::Mobs[leadId];
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (leadNpc->groupMember[i] == 0) if (leadNpc->groupMember[i] == 0)
break; break;
if (MobManager::Mobs.find(leadNpc->groupMember[i]) == MobManager::Mobs.end()) {
std::cout << "[WARN] unsommonW: leader can't find a group member!" << std::endl;
continue;
}
TableData::RunningMobs.erase(leadNpc->groupMember[i]); TableData::RunningMobs.erase(leadNpc->groupMember[i]);
NPCManager::destroyNPC(leadNpc->groupMember[i]); NPCManager::destroyNPC(leadNpc->groupMember[i]);
} }
@ -336,8 +343,7 @@ void toggleAiCommand(std::string full, std::vector<std::string>& args, CNSocket*
void npcRotateCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) { void npcRotateCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
std::vector<Chunk*> chunks; // TODO BaseNPC* npc = NPCManager::getNearestNPC(plr->viewableChunks, plr->x, plr->y, plr->z);
BaseNPC* npc = NPCManager::getNearestNPC(chunks, plr->x, plr->y, plr->z);
if (npc == nullptr) { if (npc == nullptr) {
ChatManager::sendServerMessage(sock, "[NPCR] No NPCs found nearby"); ChatManager::sendServerMessage(sock, "[NPCR] No NPCs found nearby");
@ -407,8 +413,7 @@ void npcInstanceCommand(std::string full, std::vector<std::string>& args, CNSock
return; return;
} }
std::vector<Chunk*> chunks; // TODO BaseNPC* npc = NPCManager::getNearestNPC(plr->viewableChunks, plr->x, plr->y, plr->z);
BaseNPC* npc = NPCManager::getNearestNPC(chunks, plr->x, plr->y, plr->z);
if (npc == nullptr) { if (npc == nullptr) {
ChatManager::sendServerMessage(sock, "[NPCI] No NPCs found nearby"); ChatManager::sendServerMessage(sock, "[NPCI] No NPCs found nearby");
@ -562,8 +567,10 @@ void summonGroupCommand(std::string full, std::vector<std::string>& args, CNSock
} }
// permission & sanity check // permission & sanity check
if (plr == nullptr || type >= 3314 || type2 >= 3314 || count > 5) if (type >= 3314 || type2 >= 3314 || count > 5) {
ChatManager::sendServerMessage(sock, "Invalid parameters; double check types and count");
return; return;
}
Mob* leadNpc = nullptr; Mob* leadNpc = nullptr;
@ -571,7 +578,6 @@ void summonGroupCommand(std::string full, std::vector<std::string>& args, CNSock
int team = NPCManager::NPCData[type]["m_iTeam"]; int team = NPCManager::NPCData[type]["m_iTeam"];
assert(NPCManager::nextId < INT32_MAX); assert(NPCManager::nextId < INT32_MAX);
#define EXTRA_HEIGHT 200 #define EXTRA_HEIGHT 200
BaseNPC *npc = nullptr; BaseNPC *npc = nullptr;
int id = NPCManager::nextId++; int id = NPCManager::nextId++;
@ -613,7 +619,7 @@ void summonGroupCommand(std::string full, std::vector<std::string>& args, CNSock
npc->appearanceData.iAngle = (plr->angle + 180) % 360; npc->appearanceData.iAngle = (plr->angle + 180) % 360;
NPCManager::NPCs[npc->appearanceData.iNPC_ID] = npc; NPCManager::NPCs[npc->appearanceData.iNPC_ID] = npc;
NPCManager::updateNPCPosition(npc->appearanceData.iNPC_ID, x, y, z); NPCManager::updateNPCPosition(npc->appearanceData.iNPC_ID, x, y, z, plr->instanceID, npc->appearanceData.iAngle);
// if we're in a lair, we need to spawn the NPC in both the private instance and the template // if we're in a lair, we need to spawn the NPC in both the private instance and the template
if (PLAYERID(plr->instanceID) != 0) { if (PLAYERID(plr->instanceID) != 0) {
@ -640,7 +646,7 @@ void summonGroupCommand(std::string full, std::vector<std::string>& args, CNSock
npc->appearanceData.iAngle = (plr->angle + 180) % 360; npc->appearanceData.iAngle = (plr->angle + 180) % 360;
NPCManager::NPCs[npc->appearanceData.iNPC_ID] = npc; NPCManager::NPCs[npc->appearanceData.iNPC_ID] = npc;
NPCManager::updateNPCPosition(npc->appearanceData.iNPC_ID, x, y, z); NPCManager::updateNPCPosition(npc->appearanceData.iNPC_ID, x, y, z, plr->instanceID, npc->appearanceData.iAngle);
} }
ChatManager::sendServerMessage(sock, "/summonGroup(W): placed mob with type: " + std::to_string(type) + ChatManager::sendServerMessage(sock, "/summonGroup(W): placed mob with type: " + std::to_string(type) +

4
src/NPCManager.cpp
View File

@ -550,10 +550,10 @@ void NPCManager::handleWarp(CNSocket* sock, int32_t warpId) {
/* /*
* Helper function to get NPC closest to coordinates in specified chunks * Helper function to get NPC closest to coordinates in specified chunks
*/ */
BaseNPC* NPCManager::getNearestNPC(std::vector<Chunk*> chunks, int X, int Y, int Z) { BaseNPC* NPCManager::getNearestNPC(std::set<Chunk*>* chunks, int X, int Y, int Z) {
BaseNPC* npc = nullptr; BaseNPC* npc = nullptr;
int lastDist = INT_MAX; int lastDist = INT_MAX;
for (auto c = chunks.begin(); c != chunks.end(); c++) { // haha get it for (auto c = chunks->begin(); c != chunks->end(); c++) { // haha get it
Chunk* chunk = *c; Chunk* chunk = *c;
for (auto _npc = chunk->NPCs.begin(); _npc != chunk->NPCs.end(); _npc++) { for (auto _npc = chunk->NPCs.begin(); _npc != chunk->NPCs.end(); _npc++) {
BaseNPC* npcTemp = NPCs[*_npc]; BaseNPC* npcTemp = NPCs[*_npc];

2
src/NPCManager.hpp
View File

@ -68,7 +68,7 @@ namespace NPCManager {
void handleWarp(CNSocket* sock, int32_t warpId); void handleWarp(CNSocket* sock, int32_t warpId);
BaseNPC* getNearestNPC(std::vector<Chunk*> chunks, int X, int Y, int Z); BaseNPC* getNearestNPC(std::set<Chunk*>* chunks, int X, int Y, int Z);
/// returns -1 on fail /// returns -1 on fail
int eggBuffPlayer(CNSocket* sock, int skillId, int duration); int eggBuffPlayer(CNSocket* sock, int skillId, int duration);