mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-05 06:50:04 +00:00
Added more nano features (commands, equip & unequip, powers) (#26)
* Revert "fixed window build" This reverts commitb94f602537
. * Revert "Revert "fixed window build"" This reverts commitdac4457ed2
. * Add nano power feature * Update CNShardServer.hpp * Update CNShardServer.hpp * Test: Add nano power feature Nano powers are set to the first power in its selection by default. * Update NanoManager.cpp * Test: More nano features * Update NanoManager.hpp * Update PlayerManager.hpp * Update PlayerManager.cpp * Updated indentations * Update PlayerManager.cpp * Add DEBUGLOG() Co-authored-by: CPunch <sethtstubbs@gmail.com>
This commit is contained in:
parent
11fed7db10
commit
56bf0db20d
@ -5,6 +5,50 @@
|
|||||||
|
|
||||||
void NanoManager::init() {
|
void NanoManager::init() {
|
||||||
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler);
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler);
|
||||||
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_EQUIP, nanoEquipHandler);
|
||||||
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_UNEQUIP, nanoUnEquipHandler);
|
||||||
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_GIVE_NANO, nanoGMGiveHandler);
|
||||||
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_TUNE, nanoSkillSetHandler);
|
||||||
|
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_SKILL_USE, nanoSkillUseHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::nanoEquipHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
|
if (data->size != sizeof(sP_CL2FE_REQ_NANO_EQUIP))
|
||||||
|
return; // malformed packet
|
||||||
|
|
||||||
|
sP_CL2FE_REQ_NANO_EQUIP* nano = (sP_CL2FE_REQ_NANO_EQUIP*)data->buf;
|
||||||
|
sP_FE2CL_REP_NANO_EQUIP_SUCC* resp = (sP_FE2CL_REP_NANO_EQUIP_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC));
|
||||||
|
resp->iNanoID = nano->iNanoID;
|
||||||
|
resp->iNanoSlotNum = nano->iNanoSlotNum;
|
||||||
|
|
||||||
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_EQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_EQUIP_SUCC), sock->getFEKey()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::nanoUnEquipHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
|
if (data->size != sizeof(sP_CL2FE_REQ_NANO_UNEQUIP))
|
||||||
|
return; // malformed packet
|
||||||
|
|
||||||
|
sP_CL2FE_REQ_NANO_UNEQUIP* nano = (sP_CL2FE_REQ_NANO_UNEQUIP*)data->buf;
|
||||||
|
sP_FE2CL_REP_NANO_UNEQUIP_SUCC* resp = (sP_FE2CL_REP_NANO_UNEQUIP_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_UNEQUIP_SUCC));
|
||||||
|
resp->iNanoSlotNum = nano->iNanoSlotNum;
|
||||||
|
|
||||||
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_UNEQUIP_SUCC, sizeof(sP_FE2CL_REP_NANO_UNEQUIP_SUCC), sock->getFEKey()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::nanoGMGiveHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
|
if (data->size != sizeof(sP_CL2FE_REQ_PC_GIVE_NANO))
|
||||||
|
return; // ignore the malformed packet
|
||||||
|
|
||||||
|
// Cmd: /nano <nanoId>
|
||||||
|
sP_CL2FE_REQ_PC_GIVE_NANO* nano = (sP_CL2FE_REQ_PC_GIVE_NANO*)data->buf;
|
||||||
|
Player plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
|
// Add nano to player
|
||||||
|
addNano(sock, nano->iNanoID, 0);
|
||||||
|
|
||||||
|
DEBUGLOG(
|
||||||
|
std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " requested to add nano id: " << nano->iNanoID << std::endl;
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
|
void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
@ -19,5 +63,89 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
|
|||||||
resp->iActiveNanoSlotNum = nano->iNanoSlotNum;
|
resp->iActiveNanoSlotNum = nano->iNanoSlotNum;
|
||||||
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC), sock->getFEKey()));
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_ACTIVE_SUCC, sizeof(sP_FE2CL_REP_NANO_ACTIVE_SUCC), sock->getFEKey()));
|
||||||
|
|
||||||
|
DEBUGLOG(
|
||||||
std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << nano->iNanoSlotNum << std::endl;
|
std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << nano->iNanoSlotNum << std::endl;
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NanoManager::nanoSkillUseHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
|
if (data->size != sizeof(sP_CL2FE_REQ_NANO_SKILL_USE))
|
||||||
|
return; // malformed packet
|
||||||
|
|
||||||
|
sP_CL2FE_REQ_NANO_SKILL_USE* skill = (sP_CL2FE_REQ_NANO_SKILL_USE*)data->buf;
|
||||||
|
PlayerView plr = PlayerManager::players[sock];
|
||||||
|
|
||||||
|
// Send to client
|
||||||
|
sP_FE2CL_NANO_SKILL_USE_SUCC* resp = (sP_FE2CL_NANO_SKILL_USE_SUCC*)xmalloc(sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC));
|
||||||
|
resp->iArg1 = skill->iArg1;
|
||||||
|
resp->iArg2 = skill->iArg2;
|
||||||
|
resp->iArg3 = skill->iArg3;
|
||||||
|
resp->iBulletID = skill->iBulletID;
|
||||||
|
resp->iTargetCnt = skill->iTargetCnt;
|
||||||
|
resp->iPC_ID = plr.plr.iID;
|
||||||
|
resp->iNanoStamina = 150; // Hardcoded for now
|
||||||
|
|
||||||
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_NANO_SKILL_USE_SUCC, sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC), sock->getFEKey()));
|
||||||
|
DEBUGLOG(
|
||||||
|
std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano skill " << std::endl;
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::nanoSkillSetHandler(CNSocket* sock, CNPacketData* data) {
|
||||||
|
if (data->size != sizeof(sP_CL2FE_REQ_NANO_TUNE))
|
||||||
|
return; // malformed packet
|
||||||
|
|
||||||
|
sP_CL2FE_REQ_NANO_TUNE* skill = (sP_CL2FE_REQ_NANO_TUNE*)data->buf;
|
||||||
|
setNanoSkill(sock, skill->iNanoID, skill->iTuneID);
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma region Helper methods
|
||||||
|
void NanoManager::addNano(CNSocket* sock, int16_t nanoId, int16_t slot) {
|
||||||
|
Player plr = PlayerManager::getPlayer(sock);
|
||||||
|
|
||||||
|
// Send to client
|
||||||
|
sP_FE2CL_REP_PC_NANO_CREATE_SUCC* resp = new sP_FE2CL_REP_PC_NANO_CREATE_SUCC();
|
||||||
|
resp->Nano.iID = nanoId;
|
||||||
|
resp->Nano.iStamina = 150;
|
||||||
|
resp->iQuestItemSlotNum = slot;
|
||||||
|
|
||||||
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_PC_NANO_CREATE_SUCC, sizeof(sP_FE2CL_REP_PC_NANO_CREATE_SUCC), sock->getFEKey()));
|
||||||
|
|
||||||
|
// Update player
|
||||||
|
plr.Nanos[nanoId] = resp->Nano;
|
||||||
|
PlayerManager::updatePlayer(sock, plr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId) {
|
||||||
|
Player plr = PlayerManager::getPlayer(sock);
|
||||||
|
sNano nano = plr.Nanos[nanoId];
|
||||||
|
|
||||||
|
nano.iSkillID = skillId;
|
||||||
|
plr.Nanos[nanoId] = nano;
|
||||||
|
|
||||||
|
// Send to client
|
||||||
|
sP_FE2CL_REP_NANO_TUNE_SUCC* resp = (sP_FE2CL_REP_NANO_TUNE_SUCC*)xmalloc(sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC));
|
||||||
|
resp->iNanoID = nanoId;
|
||||||
|
resp->iSkillID = skillId;
|
||||||
|
|
||||||
|
sock->sendPacket(new CNPacketData((void*)resp, P_FE2CL_REP_NANO_TUNE_SUCC, sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC), sock->getFEKey()));
|
||||||
|
|
||||||
|
DEBUGLOG(
|
||||||
|
std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " set skill id " << skillId << " for nano: " << nanoId << std::endl;
|
||||||
|
)
|
||||||
|
|
||||||
|
// Update the player
|
||||||
|
PlayerManager::updatePlayer(sock, plr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) {
|
||||||
|
Player plr = PlayerManager::getPlayer(sock);
|
||||||
|
sNano nano = plr.Nanos[nanoId];
|
||||||
|
|
||||||
|
nano.iSkillID = 0;
|
||||||
|
plr.Nanos[nanoId] = nano;
|
||||||
|
|
||||||
|
// Update the player
|
||||||
|
PlayerManager::updatePlayer(sock, plr);
|
||||||
|
}
|
||||||
|
#pragma endregion
|
@ -6,6 +6,16 @@
|
|||||||
namespace NanoManager {
|
namespace NanoManager {
|
||||||
void init();
|
void init();
|
||||||
void nanoSummonHandler(CNSocket* sock, CNPacketData* data);
|
void nanoSummonHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
void nanoEquipHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
void nanoUnEquipHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
void nanoGMGiveHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
void nanoSkillUseHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
void nanoSkillSetHandler(CNSocket* sock, CNPacketData* data);
|
||||||
|
|
||||||
|
// Helper methods
|
||||||
|
void addNano(CNSocket* sock, int16_t nanoId, int16_t slot);
|
||||||
|
void setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId);
|
||||||
|
void resetNanoSkill(CNSocket* sock, int16_t nanoId);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -17,6 +17,7 @@ struct Player {
|
|||||||
int slot;
|
int slot;
|
||||||
sPCStyle PCStyle;
|
sPCStyle PCStyle;
|
||||||
sPCStyle2 PCStyle2;
|
sPCStyle2 PCStyle2;
|
||||||
|
sNano Nanos[37];
|
||||||
|
|
||||||
int x, y, z, angle;
|
int x, y, z, angle;
|
||||||
sItemBase Equip[AEQUIP_COUNT];
|
sItemBase Equip[AEQUIP_COUNT];
|
||||||
|
@ -82,7 +82,8 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) {
|
|||||||
|
|
||||||
if (diffX < settings::VIEWDISTANCE && diffY < settings::VIEWDISTANCE) {
|
if (diffX < settings::VIEWDISTANCE && diffY < settings::VIEWDISTANCE) {
|
||||||
yesView.push_back(pair.first);
|
yesView.push_back(pair.first);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
noView.push_back(pair.first);
|
noView.push_back(pair.first);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -213,9 +214,10 @@ void PlayerManager::enterPlayer(CNSocket* sock, CNPacketData* data) {
|
|||||||
response->PCLoadData2CL.aNanoBank[i].iStamina = 150;
|
response->PCLoadData2CL.aNanoBank[i].iStamina = 150;
|
||||||
}
|
}
|
||||||
|
|
||||||
response->PCLoadData2CL.aNanoSlots[0] = 1;
|
// temporarily not add nanos for nano add test through commands
|
||||||
response->PCLoadData2CL.aNanoSlots[1] = 2;
|
//response->PCLoadData2CL.aNanoSlots[0] = 1;
|
||||||
response->PCLoadData2CL.aNanoSlots[2] = 3;
|
//response->PCLoadData2CL.aNanoSlots[1] = 2;
|
||||||
|
//response->PCLoadData2CL.aNanoSlots[2] = 3;
|
||||||
|
|
||||||
response->PCLoadData2CL.aQuestFlag[0] = -1;
|
response->PCLoadData2CL.aQuestFlag[0] = -1;
|
||||||
|
|
||||||
@ -559,3 +561,10 @@ void PlayerManager::exitGame(CNSocket* sock, CNPacketData* data) {
|
|||||||
|
|
||||||
sock->sendPacket(new CNPacketData((void*)response, P_FE2CL_REP_PC_EXIT_SUCC, sizeof(sP_FE2CL_REP_PC_EXIT_SUCC), sock->getFEKey()));
|
sock->sendPacket(new CNPacketData((void*)response, P_FE2CL_REP_PC_EXIT_SUCC, sizeof(sP_FE2CL_REP_PC_EXIT_SUCC), sock->getFEKey()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PlayerManager::updatePlayer(CNSocket* key, Player plr) {
|
||||||
|
PlayerView plrv = players[key];
|
||||||
|
plrv.plr = plr;
|
||||||
|
|
||||||
|
players[key] = plrv;
|
||||||
|
}
|
@ -25,6 +25,7 @@ namespace PlayerManager {
|
|||||||
void removePlayer(CNSocket* key);
|
void removePlayer(CNSocket* key);
|
||||||
Player getPlayer(CNSocket* key);
|
Player getPlayer(CNSocket* key);
|
||||||
|
|
||||||
|
void updatePlayer(CNSocket* key, Player plr);
|
||||||
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z);
|
void updatePlayerPosition(CNSocket* sock, int X, int Y, int Z);
|
||||||
|
|
||||||
void enterPlayer(CNSocket* sock, CNPacketData* data);
|
void enterPlayer(CNSocket* sock, CNPacketData* data);
|
||||||
|
Loading…
Reference in New Issue
Block a user