OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-04-01 17:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test: More nano features

Browse Source
This commit is contained in:
Onii-chan
2020-08-22 15:38:57 +02:00
parent 68358b4a62
commit 40b717f570
4 changed files with 496 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CNShardServer.hpp
View File

@@ -12,8 +12,11 @@ enum SHARDPACKETID {
P_CL2FE_REP_LIVE_CHECK = 318767221,
P_CL2FE_REQ_NANO_ACTIVE = 318767119,
P_CL2FE_REQ_NANO_EQUIP = 318767117,
P_CL2FE_REQ_NANO_UNEQUIP = 318767118,
P_CL2FE_REQ_NANO_SKILL_USE = 318767121,
P_CL2FE_REQ_NANO_TUNE = 318767120,
P_CL2FE_REQ_PC_FIRST_USE_FLAG_SET = 318767238,
P_CL2FE_REQ_PC_GIVE_NANO = 318767172,
P_CL2FE_REQ_PC_MOVE = 318767107,
P_CL2FE_REQ_PC_STOP = 318767108,
P_CL2FE_REQ_PC_JUMP = 318767109,
@@ -35,6 +38,7 @@ enum SHARDPACKETID {
P_FE2CL_REP_NANO_ACTIVE_SUCC = 822083624,
P_FE2CL_REP_PC_NANO_CREATE_SUCC = 822083667,
P_FE2CL_REP_NANO_EQUIP_SUCC = 822083622,
P_FE2CL_REP_NANO_UNEQUIP_SUCC = 822083623,
P_FE2CL_NANO_SKILL_USE_SUCC = 822083627,
P_FE2CL_NANO_SKILL_USE = 822083628,
P_FE2CL_REP_NANO_TUNE_SUCC = 822083625,

29
src/NanoManager.cpp
View File

@@ -6,6 +6,8 @@
void NanoManager::init() {
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);
}
@@ -20,7 +22,30 @@ void NanoManager::nanoEquipHandler(CNSocket* sock, CNPacketData* data) {
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()));
REGISTER_SHARD_PACKET(P_CL2FE_REQ_NANO_ACTIVE, nanoSummonHandler);
}
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);
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) {
@@ -68,6 +93,7 @@ void NanoManager::nanoSkillSetHandler(CNSocket* sock, CNPacketData* data) {
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);
@@ -114,3 +140,4 @@ void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) {
// Update the player
PlayerManager::updatePlayer(sock, plr);
}
#pragma endregion

2
src/NanoManager.hpp
View File

@@ -7,6 +7,8 @@ namespace NanoManager {
void init();
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);

9
src/PlayerManager.cpp
View File

@@ -82,7 +82,8 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z) {
if (diffX < settings::VIEWDISTANCE && diffY < settings::VIEWDISTANCE) {
yesView.push_back(pair.first);
} else {
}
else {
noView.push_back(pair.first);
}
}
@@ -213,9 +214,9 @@ void PlayerManager::enterPlayer(CNSocket* sock, CNPacketData* data) {
response->PCLoadData2CL.aNanoBank[i].iStamina = 150;
}
response->PCLoadData2CL.aNanoSlots[0] = 1;
response->PCLoadData2CL.aNanoSlots[1] = 2;
response->PCLoadData2CL.aNanoSlots[2] = 3;
//response->PCLoadData2CL.aNanoSlots[0] = 1;
//response->PCLoadData2CL.aNanoSlots[1] = 2;
//response->PCLoadData2CL.aNanoSlots[2] = 3;
response->PCLoadData2CL.aQuestFlag[0] = -1;