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

Added ON_COMBAT trigger

Browse Source
This commit is contained in:
Jade 2021-01-09 13:17:28 +00:00 committed by dongresource
parent 81c2a2a8b3
commit dc6de46a1f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MobManager.cpp
View File

@ -1731,6 +1731,10 @@ void MobManager::enterCombat(CNSocket *sock, Mob *mob) {
for (auto& pwr : MobPowers) for (auto& pwr : MobPowers)
if (pwr.skillType == NanoManager::SkillTable[skillID].skillType) if (pwr.skillType == NanoManager::SkillTable[skillID].skillType)
pwr.handle(mob, targetData, skillID, NanoManager::SkillTable[skillID].durationTime[0], NanoManager::SkillTable[skillID].powerIntensity[0]); pwr.handle(mob, targetData, skillID, NanoManager::SkillTable[skillID].durationTime[0], NanoManager::SkillTable[skillID].powerIntensity[0]);
for (NPCEvent& event : NPCManager::NPCEvents) // trigger an ON_COMBAT
if (event.trigger == ON_COMBAT && event.npcType == mob->appearanceData.iNPCType)
event.handler(sock, mob);
} }
#pragma region Mob Powers #pragma region Mob Powers

4
src/NPCManager.hpp
View File

@ -12,9 +12,9 @@
#define RESURRECT_HEIGHT 400 #define RESURRECT_HEIGHT 400
// placeholder; there's only one trigger type right now
enum Trigger { enum Trigger {
ON_KILLED ON_KILLED,
ON_COMBAT
}; };
typedef void (*NPCEventHandler)(CNSocket*, BaseNPC*); typedef void (*NPCEventHandler)(CNSocket*, BaseNPC*);