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

Buff framework tweaks + polish

Browse Source
This commit is contained in:
gsemaj
2022-07-19 01:09:25 -07:00
parent a38bf0e7be
commit ad9bf2a9e3
8 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Combat.cpp
View File

@@ -19,10 +19,10 @@ using namespace Combat;
/// Player Id -> Bullet Id -> Bullet
std::map<int32_t, std::map<int8_t, Bullet>> Combat::Bullets;
void Player::addBuff(BuffStack* buff) {
void Player::addBuff(int buffId, BuffStack* stack) {
EntityRef self = PlayerManager::getSockFromID(iID);
if(!hasBuff(buff->id)) buffs[buff->id] = new Buff(self, buff);
else buffs[buff->id]->addStack(buff);
if(!hasBuff(buffId)) buffs[buffId] = new Buff(buffId, self, stack);
else buffs[buffId]->addStack(stack);
}
Buff* Player::getBuff(int buffId) {
@@ -48,7 +48,7 @@ bool Player::hasBuff(int buffId) {
int Player::getCompositeCondition() {
int conditionBitFlag = 0;
for(auto buff : buffs) {
if(!buff.second->isStale())
if(!buff.second->isStale() && buff.second->id > 0)
conditionBitFlag |= CSB_FROM_ECSB(buff.first);
}
return conditionBitFlag;
@@ -79,7 +79,7 @@ void Player::step(time_t currTime) {
// no-op
}
void CombatNPC::addBuff(BuffStack* buff) { /* stubbed */ }
void CombatNPC::addBuff(int buffId, BuffStack* stack) { /* stubbed */ }
Buff* CombatNPC::getBuff(int buffId) { /* stubbed */
return nullptr;
@@ -332,7 +332,6 @@ static void dotDamageOnOff(CNSocket *sock, CNPacketData *data) {
// so we add and remove a permanent debuff
if (pkt->iFlag && !plr->hasBuff(ECSB_INFECTION)) {
BuffStack infection = {
ECSB_INFECTION,
-1, // infinite
sock, // self-inflicted
BuffClass::ENVIRONMENT,
@@ -343,9 +342,9 @@ static void dotDamageOnOff(CNSocket *sock, CNPacketData *data) {
nullptr, // client toggles for us! todo anticheat lol
[](EntityRef host, BuffStack* stack) {
Buffs::timeBuffUpdate(host, stack, ETBU_DEL);
},
}
};
plr->addBuff(&infection);
plr->addBuff(ECSB_INFECTION, &infection);
} else if(!pkt->iFlag && plr->hasBuff(ECSB_INFECTION)) {
plr->removeBuff(ECSB_INFECTION);
}