OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-30 06:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved egg summoning to a custom ChatManager command

Browse Source
This commit is contained in:
Kamil
2020-11-09 11:04:30 +01:00
committed by Gent
parent 9087baae3c
commit 0ecf76c5ec
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/NPCManager.cpp
View File

@@ -9,7 +9,6 @@
#include "ChatManager.hpp"
#include <cmath>
#define M_PI 3.14159265358979323846
#include <algorithm>
#include <list>
#include <fstream>
@@ -50,7 +49,6 @@ void NPCManager::init() {
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_VENDOR_ITEM_RESTORE_BUY, npcVendorBuyback);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_VENDOR_BATTERY_BUY, npcVendorBuyBattery);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_ITEM_COMBINATION, npcCombineItems);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SHINY_SUMMON, eggSummon);
REGISTER_SHARD_PACKET(P_CL2FE_REQ_SHINY_PICKUP, eggPickup);
REGISTER_SHARD_TIMER(eggStep, 1000);
@@ -863,38 +861,6 @@ void NPCManager::npcDataToEggData(sNPCAppearanceData* npc, sShinyAppearanceData*
egg->iShiny_ID = npc->iNPC_ID;
}
void NPCManager::eggSummon(CNSocket* sock, CNPacketData* data) {
if (data->size != sizeof(sP_CL2FE_REQ_SHINY_SUMMON))
return; // malformed packet
sP_CL2FE_REQ_SHINY_SUMMON* summon = (sP_CL2FE_REQ_SHINY_SUMMON*)data->buf;
assert(NPCManager::nextId < INT32_MAX);
int id = NPCManager::nextId++;
Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr)
return;
/*
* the packet sends us player position with a random offset,
* instead we're using some math to place the egg right in front of the player
*/
// temporarly disabled for sake of gruntwork
int addX = 0; //-500.0f * sin(plr->angle / 180.0f * M_PI);
int addY = 0; //-500.0f * cos(plr->angle / 180.0f * M_PI);
Egg* egg = new Egg (plr->x + addX, plr->y + addY, plr->z, plr->instanceID, summon->iShinyType, id, false); // change last arg to true after gruntwork
NPCManager::NPCs[id] = egg;
NPCManager::Eggs[id] = egg;
NPCManager::updateNPCPosition(id, plr->x + addX, plr->y + addY, plr->z, plr->instanceID);
// add to template
TableData::RunningEggs[id] = egg;
}
void NPCManager::eggPickup(CNSocket* sock, CNPacketData* data) {
if (data->size != sizeof(sP_CL2FE_REQ_SHINY_PICKUP))
return; // malformed packet