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

Cleaned up NanoManager

Browse Source
This commit is contained in:
Onii-chan
2020-08-23 09:04:38 +02:00
parent e101f790d9
commit 648bad443b
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/NanoManager.cpp
View File

@@ -75,7 +75,7 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
return; // malformed packet return; // malformed packet
sP_CL2FE_REQ_NANO_ACTIVE* pkt = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf; sP_CL2FE_REQ_NANO_ACTIVE* pkt = (sP_CL2FE_REQ_NANO_ACTIVE*)data->buf;
PlayerView plr = PlayerManager::players[sock]; Player plr = PlayerManager::getPlayer(sock);
// Send to client // Send to client
INITSTRUCT(sP_FE2CL_REP_NANO_ACTIVE_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_NANO_ACTIVE_SUCC, resp);
@@ -85,29 +85,29 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
if (pkt->iNanoSlotNum > 2) if (pkt->iNanoSlotNum > 2)
return; return;
int nanoId = plr.plr.equippedNanos[pkt->iNanoSlotNum]; int nanoId = plr.equippedNanos[pkt->iNanoSlotNum];
if (nanoId > 36) if (nanoId > 36)
return; // sanity check return; // sanity check
sNano nano = plr.plr.Nanos[nanoId]; sNano nano = plr.Nanos[nanoId];
// Send to other players // Send to other players
for (CNSocket* s : PlayerManager::players[sock].viewable) { for (CNSocket* s : PlayerManager::players[sock].viewable) {
INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt); INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt);
pkt.iPC_ID = plr.plr.iID; pkt.iPC_ID = plr.iID;
pkt.Nano = nano; pkt.Nano = nano;
s->sendPacket((void*)&pkt, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE)); s->sendPacket((void*)&pkt, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE));
} }
// update player // update player
plr.plr.nano = nanoId; plr.nano = nanoId;
PlayerManager::updatePlayer(sock, plr.plr); PlayerManager::updatePlayer(sock, plr);
DEBUGLOG( DEBUGLOG(
std::cout << U16toU8(plr.plr.PCStyle.szFirstName) << U16toU8(plr.plr.PCStyle.szLastName) << " requested to summon nano slot: " << pkt->iNanoSlotNum << std::endl; std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " requested to summon nano slot: " << pkt->iNanoSlotNum << std::endl;
) )
} }
@@ -116,7 +116,7 @@ void NanoManager::nanoSkillUseHandler(CNSocket* sock, CNPacketData* data) {
return; // malformed packet return; // malformed packet
sP_CL2FE_REQ_NANO_SKILL_USE* skill = (sP_CL2FE_REQ_NANO_SKILL_USE*)data->buf; sP_CL2FE_REQ_NANO_SKILL_USE* skill = (sP_CL2FE_REQ_NANO_SKILL_USE*)data->buf;
PlayerView plr = PlayerManager::players[sock]; Player plr = PlayerManager::getPlayer(sock);
// Send to client // Send to client
INITSTRUCT(sP_FE2CL_NANO_SKILL_USE_SUCC, resp); INITSTRUCT(sP_FE2CL_NANO_SKILL_USE_SUCC, resp);
@@ -125,14 +125,10 @@ void NanoManager::nanoSkillUseHandler(CNSocket* sock, CNPacketData* data) {
resp.iArg3 = skill->iArg3; resp.iArg3 = skill->iArg3;
resp.iBulletID = skill->iBulletID; resp.iBulletID = skill->iBulletID;
resp.iTargetCnt = skill->iTargetCnt; resp.iTargetCnt = skill->iTargetCnt;
resp.iPC_ID = plr.plr.iID; resp.iPC_ID = plr.iID;
resp.iNanoStamina = 150; // Hardcoded for now resp.iNanoStamina = 150; // Hardcoded for now
sock->sendPacket((void*)&resp, P_FE2CL_NANO_SKILL_USE_SUCC, sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC)); sock->sendPacket((void*)&resp, P_FE2CL_NANO_SKILL_USE_SUCC, sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC));
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) { void NanoManager::nanoSkillSetHandler(CNSocket* sock, CNPacketData* data) {
@@ -180,12 +176,13 @@ void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId)
sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_TUNE_SUCC, sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC)); sock->sendPacket((void*)&resp, P_FE2CL_REP_NANO_TUNE_SUCC, sizeof(sP_FE2CL_REP_NANO_TUNE_SUCC));
// Update the player
PlayerManager::updatePlayer(sock, plr);
DEBUGLOG( DEBUGLOG(
std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " set skill id " << skillId << " for nano: " << nanoId << std::endl; 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) { void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) {
@@ -195,6 +192,7 @@ void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) {
Player plr = PlayerManager::getPlayer(sock); Player plr = PlayerManager::getPlayer(sock);
sNano nano = plr.Nanos[nanoId]; sNano nano = plr.Nanos[nanoId];
// 0 is reset
nano.iSkillID = 0; nano.iSkillID = 0;
plr.Nanos[nanoId] = nano; plr.Nanos[nanoId] = nano;

2
src/Player.hpp
View File

@@ -17,7 +17,7 @@ struct Player {
int slot; // player slot, not nano slot int slot; // player slot, not nano slot
sPCStyle PCStyle; sPCStyle PCStyle;
sPCStyle2 PCStyle2; sPCStyle2 PCStyle2;
sNano Nanos[37]; sNano Nanos[37]; // acquired nanos
int equippedNanos[3]; int equippedNanos[3];
int nano; // active nano (index into Nanos) int nano; // active nano (index into Nanos)