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

Quick fix for Fuse boss fight NPCEvent logic

Browse Source 
Will be replaced with a proper rework immediately.
This commit is contained in:
dongresource
2023-09-10 19:24:19 +02:00
committed by gsemaj
parent eb88fa05cb
commit ba20f5a401
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Combat.cpp
View File

@@ -307,19 +307,21 @@ void CombatNPC::step(time_t currTime) {
}
void CombatNPC::transition(AIState newState, EntityRef src) {
state = newState;
if (transitionHandlers.find(newState) != transitionHandlers.end())
transitionHandlers[newState](this, src);
else {
std::cout << "[WARN] Transition to " << (int)state << " has no handler; going inactive" << std::endl;
transition(AIState::INACTIVE, id);
}
/* TODO: fire any triggered events
for (NPCEvent& event : NPCManager::NPCEvents)
if (event.trigger == ON_KILLED && event.npcType == type)
event.handler(src, this);
*/
// TODO: Properly refactor this
if (newState == AIState::DEAD && src.kind == EntityKind::PLAYER) {
for (NPCEvent& event : NPCManager::NPCEvents)
if (event.trigger == ON_KILLED && event.npcType == type)
event.handler(src.sock, this);
}
}
#pragma endregion