OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add battery caps for combat rewards & commands

This commit is contained in:
Gent 2020-11-07 21:51:16 -05:00
parent 83c378c9c2
commit 26460c0167
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/MobManager.cpp
View File

@ -191,6 +191,11 @@ void MobManager::giveReward(CNSocket *sock, Mob* mob) {
if (rand() % 3 == 0) if (rand() % 3 == 0)
plr->batteryW += drop.boosts; plr->batteryW += drop.boosts;
} }
// caps
if (plr->batteryW > 9999)
plr->batteryW = 9999;
if (plr->batteryN > 9999)
plr->batteryN = 9999;
// simple rewards // simple rewards
reward->m_iCandy = plr->money; reward->m_iCandy = plr->money;
@ -1154,4 +1159,4 @@ void MobManager::clearDebuff(Mob *mob) {
pkt1.iID = mob->appearanceData.iNPC_ID; pkt1.iID = mob->appearanceData.iNPC_ID;
pkt1.iConditionBitFlag = mob->appearanceData.iConditionBitFlag; pkt1.iConditionBitFlag = mob->appearanceData.iConditionBitFlag;
NPCManager::sendToViewable(mob, &pkt1, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT)); NPCManager::sendToViewable(mob, &pkt1, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));
} }

6
src/PlayerManager.cpp
View File

@ -746,9 +746,15 @@ void PlayerManager::setSpecialPlayer(CNSocket* sock, CNPacketData* data) {
break; break;
case 2: case 2:
plr->batteryW = setData->iSetValue; plr->batteryW = setData->iSetValue;
// caps
if (plr->batteryW > 9999)
plr->batteryW = 9999;
break; break;
case 3: case 3:
plr->batteryN = setData->iSetValue; plr->batteryN = setData->iSetValue;
// caps
if (plr->batteryN > 9999)
plr->batteryN = 9999;
break; break;
case 4: case 4:
plr->fusionmatter = setData->iSetValue; plr->fusionmatter = setData->iSetValue;