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

Merge pull request #120 from gsemaj/bugfix1 

Combat bug fixes
This commit is contained in:
CPunch 2020-09-27 02:09:01 -05:00 committed by GitHub
parent f8f2088e38 b03cc563eb
commit dacae8d6de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/MobManager.cpp
View File

@ -69,6 +69,7 @@ void MobManager::pcAttackNpcs(CNSocket *sock, CNPacketData *data) {
respdata[i].iHitFlag = 2; // hitscan, not a rocket or a grenade
}
resp->iBatteryW = plr->batteryW;
sock->sendPacket((void*)respbuf, P_FE2CL_PC_ATTACK_NPCs_SUCC, resplen);
// a bit of a hack: these are the same size, so we can reuse the response packet
@ -133,6 +134,8 @@ void MobManager::giveReward(CNSocket *sock) {
// simple rewards
reward->m_iCandy = plr->money;
reward->m_iFusionMatter = plr->fusionmatter;
reward->m_iBatteryN = plr->batteryN;
reward->m_iBatteryW = plr->batteryW;
reward->iFatigue = 100; // prevents warning message
reward->iFatigue_Level = 1;
reward->iItemCnt = 1; // remember to update resplen if you change this
@ -315,7 +318,7 @@ void MobManager::roamingStep(Mob *mob, time_t currTime) {
* We reuse nextAttack to avoid scanning for players all the time, but to still
* do so more often than if we waited for nextMovement (which is way too slow).
*/
if (mob->nextAttack == 0 || currTime < mob->nextAttack) {
if (mob->nextAttack == 0 || currTime >= mob->nextAttack) {
mob->nextAttack = currTime + (int)mob->data["m_iDelayTime"] * 100;
/*