OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-02-20 08:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement buff handling for CombatNPC

Browse Source
This commit is contained in:
gsemaj 2023-07-25 13:49:40 -04:00 committed by gsemaj
parent 0dd628717d
commit 807e182407
1 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/Combat.cpp
View File

@ -24,13 +24,11 @@ bool Player::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCal
if(!isAlive()) if(!isAlive())
return false; return false;
EntityRef self = PlayerManager::getSockFromID(iID);
if(!hasBuff(buffId)) { if(!hasBuff(buffId)) {
buffs[buffId] = new Buff(buffId, self, onUpdate, onTick, stack); buffs[buffId] = new Buff(buffId, getRef(), onUpdate, onTick, stack);
return true; return true;
} }
buffs[buffId]->updateCallbacks(onUpdate, onTick); buffs[buffId]->updateCallbacks(onUpdate, onTick);
buffs[buffId]->addStack(stack); buffs[buffId]->addStack(stack);
return false; return false;
@ -177,25 +175,68 @@ void Player::step(time_t currTime) {
#pragma region CombatNPC #pragma region CombatNPC
bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) { /* stubbed */ bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) { /* stubbed */
if(!isAlive())
return false;
if(!hasBuff(buffId)) {
buffs[buffId] = new Buff(buffId, getRef(), onUpdate, onTick, stack);
return true;
}
buffs[buffId]->updateCallbacks(onUpdate, onTick);
buffs[buffId]->addStack(stack);
return false; return false;
} }
Buff* CombatNPC::getBuff(int buffId) { /* stubbed */ Buff* CombatNPC::getBuff(int buffId) { /* stubbed */
if(hasBuff(buffId)) {
return buffs[buffId];
}
return nullptr; return nullptr;
} }
void CombatNPC::removeBuff(int buffId) { /* stubbed */ } void CombatNPC::removeBuff(int buffId) {
if(hasBuff(buffId)) {
void CombatNPC::removeBuff(int buffId, int buffClass) { /* stubbed */ } buffs[buffId]->clear();
delete buffs[buffId];
void CombatNPC::clearBuffs(bool force) { /* stubbed */ } buffs.erase(buffId);
}
bool CombatNPC::hasBuff(int buffId) { /* stubbed */
return false;
} }
int CombatNPC::getCompositeCondition() { /* stubbed */ void CombatNPC::removeBuff(int buffId, int buffClass) {
return 0; if(hasBuff(buffId)) {
buffs[buffId]->clear((BuffClass)buffClass);
// buff might not be stale since another buff class might remain
if(buffs[buffId]->isStale()) {
delete buffs[buffId];
buffs.erase(buffId);
}
}
}
void CombatNPC::clearBuffs(bool force) {
for(auto buff : buffs) {
if(!force) {
removeBuff(buff.first);
} else {
delete buff.second;
}
}
buffs.clear();
}
bool CombatNPC::hasBuff(int buffId) {
auto buff = buffs.find(buffId);
return buff != buffs.end() && !buff->second->isStale();
}
int CombatNPC::getCompositeCondition() {
int conditionBitFlag = 0;
for(auto buff : buffs) {
if(!buff.second->isStale() && buff.second->id > 0)
conditionBitFlag |= CSB_FROM_ECSB(buff.first);
}
return conditionBitFlag;
} }
int CombatNPC::takeDamage(EntityRef src, int amt) { int CombatNPC::takeDamage(EntityRef src, int amt) {