OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-17 03: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 committed by gsemaj
parent f150595f70
commit 0c5a9400ce
No known key found for this signature in database
GPG Key ID: 24B96BAA40497929
8 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Abilities.hpp
View File

@ -26,12 +26,13 @@ enum class SkillDrainType {
};
struct SkillData {
int skillType;
int skillType; // eST
SkillEffectTarget effectTarget;
int effectType; // always 1?
SkillTargetType targetType;
SkillDrainType drainType;
int effectArea;
int charStatusTimeBuffId; // eCS(T)B
int batteryUse[4];
int durationTime[4];

19
src/Buffs.cpp
View File

@ -27,13 +27,14 @@ void Buff::clear() {
}
void Buff::addStack(BuffStack* stack) {
stack->buff = this;
if(stack->onApply) stack->onApply(self, stack);
stacks.push_back(*stack);
}
bool Buff::hasClass(BuffClass buffClass) {
for(BuffStack& stack : stacks) {
if(stack.buffClass == buffClass)
if(stack.buffStackClass == buffClass)
return true;
}
return false;
@ -42,8 +43,8 @@ bool Buff::hasClass(BuffClass buffClass) {
BuffClass Buff::maxClass() {
BuffClass buffClass = BuffClass::NONE;
for(BuffStack& stack : stacks) {
if(stack.buffClass > buffClass)
buffClass = stack.buffClass;
if(stack.buffStackClass > buffClass)
buffClass = stack.buffStackClass;
}
return buffClass;
}
@ -53,7 +54,7 @@ bool Buff::isStale() {
}
#pragma region Handlers
void Buffs::timeBuffUpdate(EntityRef self, BuffStack* buff, int status) {
void Buffs::timeBuffUpdate(EntityRef self, BuffStack* stack, int status) {
if(self.kind != EntityKind::PLAYER)
return; // not implemented
@ -62,21 +63,21 @@ void Buffs::timeBuffUpdate(EntityRef self, BuffStack* buff, int status) {
if(plr == nullptr)
return;
if(status == ETBU_DEL && plr->hasBuff(buff->id))
if(status == ETBU_DEL && plr->hasBuff(stack->buff->id))
return; // no premature status removal!
int cbf = plr->getCompositeCondition();
if(status == ETBU_ADD) cbf |= CSB_FROM_ECSB(buff->id);
if(status == ETBU_ADD && stack->buff->id > 0) cbf |= CSB_FROM_ECSB(stack->buff->id);
INITSTRUCT(sP_FE2CL_PC_BUFF_UPDATE, pkt);
pkt.eCSTB = buff->id; // eCharStatusTimeBuffID
pkt.eCSTB = stack->buff->id; // eCharStatusTimeBuffID
pkt.eTBU = status; // eTimeBuffUpdate
pkt.eTBT = (int)buff->buffClass;
pkt.eTBT = (int)stack->buffStackClass;
pkt.iConditionBitFlag = cbf;
self.sock->sendPacket((void*)&pkt, P_FE2CL_PC_BUFF_UPDATE, sizeof(sP_FE2CL_PC_BUFF_UPDATE));
}
void Buffs::timeBuffTimeoutViewable(EntityRef self, BuffStack* buff, int ct) {
void Buffs::timeBuffTimeoutViewable(EntityRef self, BuffStack* stack, int ct) {
if(self.kind != EntityKind::PLAYER)
return; // not implemented

15
src/Buffs.hpp
View File

@ -25,10 +25,9 @@ enum class BuffClass {
typedef std::function<void(EntityRef, BuffStack*)> BuffCallback;
struct BuffStack {
int id; // ECSB
int durationTicks;
EntityRef source;
BuffClass buffClass;
BuffClass buffStackClass;
/* called just before the stack is added */
BuffCallback onApply;
@ -38,6 +37,8 @@ struct BuffStack {
/* called just after the stack is removed */
BuffCallback onExpire;
Buff* buff;
};
class Buff {
@ -46,6 +47,8 @@ private:
std::vector<BuffStack> stacks;
public:
int id;
void tick();
void clear();
void addStack(BuffStack* stack);
@ -67,13 +70,13 @@ public:
*/
bool isStale();
Buff(EntityRef pSelf, BuffStack* firstStack)
: self(pSelf) {
Buff(int iid, EntityRef pSelf, BuffStack* firstStack)
: id(iid), self(pSelf) {
addStack(firstStack);
}
};
namespace Buffs {
void timeBuffUpdate(EntityRef self, BuffStack* buff, int status);
void timeBuffTimeoutViewable(EntityRef self, BuffStack* buff, int ct);
void timeBuffUpdate(EntityRef self, BuffStack* stack, int status);
void timeBuffTimeoutViewable(EntityRef self, BuffStack* stack, int ct);
}

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;
@ -361,7 +361,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,
@ -372,9 +371,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);
}

4
src/Entities.hpp
View File

@ -92,7 +92,7 @@ public:
ICombatant() {}
virtual ~ICombatant() {}
virtual void addBuff(BuffStack* buff) = 0;
virtual void addBuff(int buffId, BuffStack* stack) = 0;
virtual Buff* getBuff(int buffId) = 0;
virtual void removeBuff(int buffId) = 0;
virtual bool hasBuff(int buffId) = 0;
@ -158,7 +158,7 @@ struct CombatNPC : public BaseNPC, public ICombatant {
virtual bool isExtant() override { return hp > 0; }
virtual void addBuff(BuffStack* buff) override;
virtual void addBuff(int buffId, BuffStack* stack) override;
virtual Buff* getBuff(int buffId) override;
virtual void removeBuff(int buffId) override;
virtual bool hasBuff(int buffId) override;

7
src/Items.cpp
View File

@ -493,7 +493,6 @@ static void itemUseHandler(CNSocket* sock, CNPacketData* data) {
int durationMilliseconds = Abilities::SkillTable[144].durationTime[0] * 100;
BuffStack gumballBuff = {
eCSB,
durationMilliseconds / MS_PER_PLAYER_TICK,
sock,
BuffClass::CASH_ITEM, // or BuffClass::ITEM?
@ -501,12 +500,12 @@ static void itemUseHandler(CNSocket* sock, CNPacketData* data) {
[](EntityRef host, BuffStack* stack) {
Buffs::timeBuffUpdate(host, stack, ETBU_ADD);
},
nullptr, // client toggles for us! todo anticheat lol
nullptr,
[](EntityRef host, BuffStack* stack) {
Buffs::timeBuffUpdate(host, stack, ETBU_DEL);
},
}
};
player->addBuff(&gumballBuff);
player->addBuff(eCSB, &gumballBuff);
sock->sendPacket((void*)&respbuf, P_FE2CL_REP_PC_ITEM_USE_SUCC, resplen);
// update inventory serverside

2
src/Player.hpp
View File

@ -89,7 +89,7 @@ struct Player : public Entity, public ICombatant {
virtual void enterIntoViewOf(CNSocket *sock) override;
virtual void disappearFromViewOf(CNSocket *sock) override;
virtual void addBuff(BuffStack* buff) override;
virtual void addBuff(int buffId, BuffStack* stack) override;
virtual Buff* getBuff(int buffId) override;
virtual void removeBuff(int buffId) override;
virtual bool hasBuff(int buffId) override;

3
src/TableData.cpp
View File

@ -235,7 +235,8 @@ static void loadXDT(json& xdtData) {
skill["m_iEffectType"],
skill["m_iTargetType"],
skill["m_iBatteryDrainType"],
skill["m_iEffectArea"]
skill["m_iEffectArea"],
(int)skill["m_iIcon"] - 1
};
skillData.valueTypes[0] = skill["m_iValueA_Type"];