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

811 lines
29 KiB
C++
Raw Normal View History

[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
#include "MobAI.hpp"
#include "Player.hpp"
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
#include "Racing.hpp"
#include "Transport.hpp"
#include "Nanos.hpp"
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
#include "Combat.hpp"
#include "Abilities.hpp"
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
#include "Rand.hpp"
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
#include <cmath>
#include <limits.h>
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
using namespace MobAI;
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
bool MobAI::simulateMobs = settings::SIMULATEMOBS;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
static void roamingStep(Mob *mob, time_t currTime);
/*
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
* Dynamic lerp; distinct from Transport::lerp(). This one doesn't care about height and
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
* only returns the first step, since the rest will need to be recalculated anyway if chasing player.
*/
static std::pair<int,int> lerp(int x1, int y1, int x2, int y2, int speed) {
std::pair<int,int> ret = {x1, y1};
if (speed == 0)
return ret;
int distance = hypot(x1 - x2, y1 - y2);
if (distance > speed) {
int lerps = distance / speed;
// interpolate only the first point
float frac = 1.0f / lerps;
ret.first = (x1 + (x2 - x1) * frac);
ret.second = (y1 + (y2 - y1) * frac);
} else {
ret.first = x2;
ret.second = y2;
}
return ret;
}
void MobAI::clearDebuff(Mob *mob) {
mob->skillStyle = -1;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
mob->cbf = 0;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mob->unbuffTimes.clear();
INITSTRUCT(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT, pkt1);
pkt1.eCT = 2;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt1.iID = mob->id;
pkt1.iConditionBitFlag = mob->cbf;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
NPCManager::sendToViewable(mob, &pkt1, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));
}
void MobAI::followToCombat(Mob *mob) {
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(mob->groupLeader) != NPCManager::NPCs.end() && NPCManager::NPCs[mob->groupLeader]->kind == EntityType::MOB) {
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* leadMob = (Mob*)NPCManager::NPCs[mob->groupLeader];
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
for (int i = 0; i < 4; i++) {
if (leadMob->groupMember[i] == 0)
break;
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(leadMob->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[leadMob->groupMember[i]]->kind != EntityType::MOB) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
std::cout << "[WARN] roamingStep: leader can't find a group member!" << std::endl;
continue;
}
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* followerMob = (Mob*)NPCManager::NPCs[leadMob->groupMember[i]];
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (followerMob->state != MobState::ROAMING) // only roaming mobs should transition to combat
continue;
enterCombat(mob->target, followerMob);
}
if (leadMob->state != MobState::ROAMING)
return;
enterCombat(mob->target, leadMob);
}
}
void MobAI::groupRetreat(Mob *mob) {
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(mob->groupLeader) == NPCManager::NPCs.end() || NPCManager::NPCs[mob->groupLeader]->kind != EntityType::MOB)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
return;
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* leadMob = (Mob*)NPCManager::NPCs[mob->groupLeader];
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
for (int i = 0; i < 4; i++) {
if (leadMob->groupMember[i] == 0)
break;
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(leadMob->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[leadMob->groupMember[i]]->kind != EntityType::MOB) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
std::cout << "[WARN] roamingStep: leader can't find a group member!" << std::endl;
continue;
}
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* followerMob = (Mob*)NPCManager::NPCs[leadMob->groupMember[i]];
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Fix invisible group mobs bug This is a simplified adaptation of 29e7bd25a4f888e9d72fa01f84df98de79f861d1 from Retrobution. Co-authored-by: Jade <jadeshrinemaiden@gmail.com>
2021-09-19 02:20:24 +00:00
if (followerMob->state != MobState::COMBAT)
continue;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
followerMob->target = nullptr;
followerMob->state = MobState::RETREAT;
clearDebuff(followerMob);
}
Fix invisible group mobs bug This is a simplified adaptation of 29e7bd25a4f888e9d72fa01f84df98de79f861d1 from Retrobution. Co-authored-by: Jade <jadeshrinemaiden@gmail.com>
2021-09-19 02:20:24 +00:00
if (leadMob->state != MobState::COMBAT)
return;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
leadMob->target = nullptr;
leadMob->state = MobState::RETREAT;
clearDebuff(leadMob);
}
/*
* Aggro on nearby players.
* Even if they're in range, we can't assume they're all in the same one chunk
* as the mob, since it might be near a chunk boundary.
*/
bool MobAI::aggroCheck(Mob *mob, time_t currTime) {
CNSocket *closest = nullptr;
int closestDistance = INT_MAX;
Use direct members instead of pointers for viewableChunks and buyback We had avoided putting STL containers into Players back when we thought Players was still POD and needed to remain POD, but it turned out that neither were the case all along, so there's no need for the indirection.
2021-03-20 01:23:53 +00:00
for (auto it = mob->viewableChunks.begin(); it != mob->viewableChunks.end(); it++) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Chunk* chunk = *it;
[WIP] Convert all chunk-related logic to the new system's semantics Replaced all references to chunk->players and chunk->NPCs with chunk->entities and all instances of the old NPCClass enum with EntityType. The server compiles but will not yet run properly.
2021-03-21 02:54:24 +00:00
for (const EntityRef& ref : chunk->entities) {
// TODO: support targetting other CombatNPCs
if (ref.type != EntityType::PLAYER)
continue;
CNSocket *s = ref.sock;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Player *plr = PlayerManager::getPlayer(s);
Don't aggro to players using MSS
2021-09-05 18:23:05 +00:00
if (plr->HP <= 0 || plr->onMonkey)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
continue;
int mobRange = mob->sightRange;
if (plr->iConditionBitFlag & CSB_BIT_UP_STEALTH
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
|| Racing::EPRaces.find(s) != Racing::EPRaces.end())
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mobRange /= 3;
// 0.33x - 1.66x the range
int levelDifference = plr->level - mob->level;
if (levelDifference > -10)
mobRange = levelDifference < 10 ? mobRange - (levelDifference * mobRange / 15) : mobRange / 3;
if (mob->state != MobState::ROAMING && plr->inCombat) // freshly out of aggro mobs
mobRange = mob->sightRange * 2; // should not be impacted by the above
if (plr->iSpecialState & (CN_SPECIAL_STATE_FLAG__INVISIBLE|CN_SPECIAL_STATE_FLAG__INVULNERABLE))
mobRange = -1;
// height is relevant for aggro distance because of platforming
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
int xyDistance = hypot(mob->x - plr->x, mob->y - plr->y);
int distance = hypot(xyDistance, (mob->z - plr->z) * 2); // difference in Z counts twice
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (distance > mobRange || distance > closestDistance)
continue;
// found a player
closest = s;
closestDistance = distance;
}
}
if (closest != nullptr) {
// found closest player. engage.
enterCombat(closest, mob);
if (mob->groupLeader != 0)
followToCombat(mob);
return true;
}
return false;
}
static void dealCorruption(Mob *mob, std::vector<int> targetData, int skillID, int style) {
Player *plr = PlayerManager::getPlayer(mob->target);
size_t resplen = sizeof(sP_FE2CL_NPC_SKILL_CORRUPTION_HIT) + targetData[0] * sizeof(sCAttackResult);
// validate response packet
if (!validOutVarPacket(sizeof(sP_FE2CL_NPC_SKILL_CORRUPTION_HIT), targetData[0], sizeof(sCAttackResult))) {
std::cout << "[WARN] bad sP_FE2CL_NPC_SKILL_CORRUPTION_HIT packet size" << std::endl;
return;
}
uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
memset(respbuf, 0, resplen);
sP_FE2CL_NPC_SKILL_CORRUPTION_HIT *resp = (sP_FE2CL_NPC_SKILL_CORRUPTION_HIT*)respbuf;
sCAttackResult *respdata = (sCAttackResult*)(respbuf+sizeof(sP_FE2CL_NPC_SKILL_CORRUPTION_HIT));
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
resp->iNPC_ID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
resp->iSkillID = skillID;
resp->iStyle = style;
resp->iValue1 = plr->x;
resp->iValue2 = plr->y;
resp->iValue3 = plr->z;
resp->iTargetCnt = targetData[0];
for (int i = 0; i < targetData[0]; i++) {
CNSocket *sock = nullptr;
Player *plr = nullptr;
for (auto& pair : PlayerManager::players) {
if (pair.second->iID == targetData[i+1]) {
sock = pair.first;
plr = pair.second;
break;
}
}
// player not found
if (plr == nullptr) {
std::cout << "[WARN] dealCorruption: player ID not found" << std::endl;
return;
}
respdata[i].eCT = 1;
respdata[i].iID = plr->iID;
respdata[i].bProtected = 0;
respdata[i].iActiveNanoSlotNum = -1;
for (int n = 0; n < 3; n++)
if (plr->activeNano == plr->equippedNanos[n])
respdata[i].iActiveNanoSlotNum = n;
respdata[i].iNanoID = plr->activeNano;
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
int style2 = Nanos::nanoStyle(plr->activeNano);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (style2 == -1) { // no nano
respdata[i].iHitFlag = 8;
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
respdata[i].iDamage = Abilities::SkillTable[skillID].powerIntensity[0] * PC_MAXHEALTH((int)mob->data["m_iNpcLevel"]) / 1500;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
} else if (style == style2) {
respdata[i].iHitFlag = 8; // tie
respdata[i].iDamage = 0;
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina;
} else if (style - style2 == 1 || style2 - style == 2) {
respdata[i].iHitFlag = 4; // win
respdata[i].iDamage = 0;
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina += 45;
if (plr->Nanos[plr->activeNano].iStamina > 150)
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina = 150;
// fire damage power disguised as a corruption attack back at the enemy
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
std::vector<int> targetData2 = {1, mob->id, 0, 0, 0};
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
for (auto& pwr : Abilities::Powers)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (pwr.skillType == EST_DAMAGE)
pwr.handle(sock, targetData2, plr->activeNano, skillID, 0, 200);
} else {
respdata[i].iHitFlag = 16; // lose
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
respdata[i].iDamage = Abilities::SkillTable[skillID].powerIntensity[0] * PC_MAXHEALTH((int)mob->data["m_iNpcLevel"]) / 1500;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina -= 90;
if (plr->Nanos[plr->activeNano].iStamina < 0) {
respdata[i].bNanoDeactive = 1;
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina = 0;
}
}
if (!(plr->iSpecialState & CN_SPECIAL_STATE_FLAG__INVULNERABLE))
plr->HP -= respdata[i].iDamage;
respdata[i].iHP = plr->HP;
respdata[i].iConditionBitFlag = plr->iConditionBitFlag;
if (plr->HP <= 0) {
mob->target = nullptr;
mob->state = MobState::RETREAT;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
if (!aggroCheck(mob, getTime())) {
clearDebuff(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (mob->groupLeader != 0)
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
groupRetreat(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
}
}
NPCManager::sendToViewable(mob, (void*)&respbuf, P_FE2CL_NPC_SKILL_CORRUPTION_HIT, resplen);
}
static void useAbilities(Mob *mob, time_t currTime) {
/*
* targetData approach
* first integer is the count
* second to fifth integers are IDs, these can be either player iID or mob's iID
* whether the skill targets players or mobs is determined by the skill packet being fired
*/
Player *plr = PlayerManager::getPlayer(mob->target);
if (mob->skillStyle >= 0) { // corruption hit
int skillID = (int)mob->data["m_iCorruptionType"];
std::vector<int> targetData = {1, plr->iID, 0, 0, 0};
int temp = mob->skillStyle;
mob->skillStyle = -3; // corruption cooldown
mob->nextAttack = currTime + 1000;
dealCorruption(mob, targetData, skillID, temp);
return;
}
if (mob->skillStyle == -2) { // eruption hit
int skillID = (int)mob->data["m_iMegaType"];
std::vector<int> targetData = {0, 0, 0, 0, 0};
// find the players within range of eruption
Use direct members instead of pointers for viewableChunks and buyback We had avoided putting STL containers into Players back when we thought Players was still POD and needed to remain POD, but it turned out that neither were the case all along, so there's no need for the indirection.
2021-03-20 01:23:53 +00:00
for (auto it = mob->viewableChunks.begin(); it != mob->viewableChunks.end(); it++) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Chunk* chunk = *it;
[WIP] Convert all chunk-related logic to the new system's semantics Replaced all references to chunk->players and chunk->NPCs with chunk->entities and all instances of the old NPCClass enum with EntityType. The server compiles but will not yet run properly.
2021-03-21 02:54:24 +00:00
for (const EntityRef& ref : chunk->entities) {
// TODO: see aggroCheck()
if (ref.type != EntityType::PLAYER)
continue;
CNSocket *s= ref.sock;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Player *plr = PlayerManager::getPlayer(s);
if (plr->HP <= 0)
continue;
int distance = hypot(mob->hitX - plr->x, mob->hitY - plr->y);
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
if (distance < Abilities::SkillTable[skillID].effectArea) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
targetData[0] += 1;
targetData[targetData[0]] = plr->iID;
if (targetData[0] > 3) // make sure not to have more than 4
break;
}
}
}
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[skillID].skillType)
pwr.handle(mob, targetData, skillID, Abilities::SkillTable[skillID].durationTime[0], Abilities::SkillTable[skillID].powerIntensity[0]);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mob->skillStyle = -3; // eruption cooldown
mob->nextAttack = currTime + 1000;
return;
}
if (mob->skillStyle == -3) { // cooldown expires
mob->skillStyle = -1;
return;
}
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
int random = Rand::rand(2000) * 1000;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
int prob1 = (int)mob->data["m_iActiveSkill1Prob"]; // active skill probability
int prob2 = (int)mob->data["m_iCorruptionTypeProb"]; // corruption probability
int prob3 = (int)mob->data["m_iMegaTypeProb"]; // eruption probability
if (random < prob1) { // active skill hit
int skillID = (int)mob->data["m_iActiveSkill1"];
std::vector<int> targetData = {1, plr->iID, 0, 0, 0};
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[skillID].skillType) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (pwr.bitFlag != 0 && (plr->iConditionBitFlag & pwr.bitFlag))
return; // prevent debuffing a player twice
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
pwr.handle(mob, targetData, skillID, Abilities::SkillTable[skillID].durationTime[0], Abilities::SkillTable[skillID].powerIntensity[0]);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
mob->nextAttack = currTime + (int)mob->data["m_iDelayTime"] * 100;
return;
}
if (random < prob1 + prob2) { // corruption windup
int skillID = (int)mob->data["m_iCorruptionType"];
INITSTRUCT(sP_FE2CL_NPC_SKILL_CORRUPTION_READY, pkt);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.iNPC_ID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iSkillID = skillID;
pkt.iValue1 = plr->x;
pkt.iValue2 = plr->y;
pkt.iValue3 = plr->z;
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
mob->skillStyle = Nanos::nanoStyle(plr->activeNano) - 1;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (mob->skillStyle == -1)
mob->skillStyle = 2;
if (mob->skillStyle == -2)
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
mob->skillStyle = Rand::rand(3);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iStyle = mob->skillStyle;
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_SKILL_CORRUPTION_READY, sizeof(sP_FE2CL_NPC_SKILL_CORRUPTION_READY));
mob->nextAttack = currTime + 1800;
return;
}
if (random < prob1 + prob2 + prob3) { // eruption windup
int skillID = (int)mob->data["m_iMegaType"];
INITSTRUCT(sP_FE2CL_NPC_SKILL_READY, pkt);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.iNPC_ID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iSkillID = skillID;
pkt.iValue1 = mob->hitX = plr->x;
pkt.iValue2 = mob->hitY = plr->y;
pkt.iValue3 = mob->hitZ = plr->z;
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_SKILL_READY, sizeof(sP_FE2CL_NPC_SKILL_READY));
mob->nextAttack = currTime + 1800;
mob->skillStyle = -2;
return;
}
return;
}
void MobAI::enterCombat(CNSocket *sock, Mob *mob) {
mob->target = sock;
mob->state = MobState::COMBAT;
mob->nextMovement = getTime();
mob->nextAttack = 0;
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
mob->roamX = mob->x;
mob->roamY = mob->y;
mob->roamZ = mob->z;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
int skillID = (int)mob->data["m_iPassiveBuff"]; // cast passive
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
std::vector<int> targetData = {1, mob->id, 0, 0, 0};
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[skillID].skillType)
pwr.handle(mob, targetData, skillID, Abilities::SkillTable[skillID].durationTime[0], Abilities::SkillTable[skillID].powerIntensity[0]);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
for (NPCEvent& event : NPCManager::NPCEvents) // trigger an ON_COMBAT
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (event.trigger == ON_COMBAT && event.npcType == mob->type)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
event.handler(sock, mob);
}
static void drainMobHP(Mob *mob, int amount) {
size_t resplen = sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK) + sizeof(sSkillResult_Damage);
assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
memset(respbuf, 0, resplen);
sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK *pkt = (sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK*)respbuf;
sSkillResult_Damage *drain = (sSkillResult_Damage*)(respbuf + sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK));
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt->iID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt->eCT = 4; // mob
pkt->iTB_ID = ECSB_BOUNDINGBALL;
drain->eCT = 4;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
drain->iID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
drain->iDamage = amount;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
drain->iHP = mob->hp -= amount;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
NPCManager::sendToViewable(mob, (void*)&respbuf, P_FE2CL_CHAR_TIME_BUFF_TIME_TICK, resplen);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->hp <= 0)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Combat::killMob(mob->target, mob);
}
static void deadStep(Mob *mob, time_t currTime) {
// despawn the mob after a short delay
if (mob->killedTime != 0 && !mob->despawned && currTime - mob->killedTime > 2000) {
mob->despawned = true;
INITSTRUCT(sP_FE2CL_NPC_EXIT, pkt);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.iNPC_ID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_EXIT, sizeof(sP_FE2CL_NPC_EXIT));
// if it was summoned, mark it for removal
if (mob->summoned) {
std::cout << "[INFO] Queueing killed summoned mob for removal" << std::endl;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
NPCManager::queueNPCRemoval(mob->id);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
return;
}
// pre-set spawn coordinates if not marked for removal
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
mob->x = mob->spawnX;
mob->y = mob->spawnY;
mob->z = mob->spawnZ;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
// to guide their groupmates, group leaders still need to move despite being dead
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->groupLeader == mob->id)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
roamingStep(mob, currTime);
if (mob->killedTime != 0 && currTime - mob->killedTime < mob->regenTime * 100)
return;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
std::cout << "respawning mob " << mob->id << " with HP = " << mob->maxHealth << std::endl;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
mob->hp = mob->maxHealth;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mob->state = MobState::ROAMING;
// if mob is a group leader/follower, spawn where the group is.
if (mob->groupLeader != 0) {
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(mob->groupLeader) != NPCManager::NPCs.end() && NPCManager::NPCs[mob->groupLeader]->kind == EntityType::MOB) {
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* leaderMob = (Mob*)NPCManager::NPCs[mob->groupLeader];
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
mob->x = leaderMob->x + mob->offsetX;
mob->y = leaderMob->y + mob->offsetY;
mob->z = leaderMob->z;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
} else {
std::cout << "[WARN] deadStep: mob cannot find it's leader!" << std::endl;
}
}
INITSTRUCT(sP_FE2CL_NPC_NEW, pkt);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.NPCAppearanceData = mob->getAppearanceData();
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// notify all nearby players
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_NEW, sizeof(sP_FE2CL_NPC_NEW));
}
static void combatStep(Mob *mob, time_t currTime) {
assert(mob->target != nullptr);
// lose aggro if the player lost connection
if (PlayerManager::players.find(mob->target) == PlayerManager::players.end()) {
mob->target = nullptr;
mob->state = MobState::RETREAT;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
if (!aggroCheck(mob, currTime)) {
clearDebuff(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (mob->groupLeader != 0)
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
groupRetreat(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
return;
}
Player *plr = PlayerManager::getPlayer(mob->target);
// lose aggro if the player became invulnerable or died
if (plr->HP <= 0
|| (plr->iSpecialState & CN_SPECIAL_STATE_FLAG__INVULNERABLE)) {
mob->target = nullptr;
mob->state = MobState::RETREAT;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
if (!aggroCheck(mob, currTime)) {
clearDebuff(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (mob->groupLeader != 0)
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
groupRetreat(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
return;
}
// drain
if (mob->skillStyle < 0 && (mob->lastDrainTime == 0 || currTime - mob->lastDrainTime >= 1000)
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
&& mob->cbf & CSB_BIT_BOUNDINGBALL) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
drainMobHP(mob, mob->maxHealth / 20); // lose 5% every second
mob->lastDrainTime = currTime;
}
// if drain killed the mob, return early
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->hp <= 0)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
return;
// unbuffing
std::unordered_map<int32_t, time_t>::iterator it = mob->unbuffTimes.begin();
while (it != mob->unbuffTimes.end()) {
if (currTime >= it->second) {
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
mob->cbf &= ~it->first;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
INITSTRUCT(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT, pkt1);
pkt1.eCT = 2;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt1.iID = mob->id;
pkt1.iConditionBitFlag = mob->cbf;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
NPCManager::sendToViewable(mob, &pkt1, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
it = mob->unbuffTimes.erase(it);
} else {
it++;
}
}
// skip attack if stunned or asleep
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->cbf & (CSB_BIT_STUN|CSB_BIT_MEZ)) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mob->skillStyle = -1; // in this case we also reset the any outlying abilities the mob might be winding up.
return;
}
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
int distance = hypot(plr->x - mob->x, plr->y - mob->y);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
int mobRange = (int)mob->data["m_iAtkRange"] + (int)mob->data["m_iRadius"];
if (currTime >= mob->nextAttack) {
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
if (mob->skillStyle != -1 || distance <= mobRange || Rand::rand(20) == 0) // while not in attack range, 1 / 20 chance.
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
useAbilities(mob, currTime);
if (mob->target == nullptr)
return;
}
int distanceToTravel = INT_MAX;
Added speed to CombatNPC - Mob's constructor sets speed - MobAI.cpp now uses mob->speed
2021-04-30 00:20:53 +00:00
int speed = mob->speed;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// movement logic: move when out of range but don't move while casting a skill
if (distance > mobRange && mob->skillStyle == -1) {
if (mob->nextMovement != 0 && currTime < mob->nextMovement)
return;
mob->nextMovement = currTime + 400;
if (currTime >= mob->nextAttack)
mob->nextAttack = 0;
// halve movement speed if snared
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->cbf & CSB_BIT_DN_MOVE_SPEED)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
speed /= 2;
int targetX = plr->x;
int targetY = plr->y;
if (mob->groupLeader != 0) {
targetX += mob->offsetX*distance/(mob->idleRange + 1);
targetY += mob->offsetY*distance/(mob->idleRange + 1);
}
distanceToTravel = std::min(distance-mobRange+1, speed*2/5);
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
auto targ = lerp(mob->x, mob->y, targetX, targetY, distanceToTravel);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (distanceToTravel < speed*2/5 && currTime >= mob->nextAttack)
mob->nextAttack = 0;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
NPCManager::updateNPCPosition(mob->id, targ.first, targ.second, mob->z, mob->instanceID, mob->angle);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
INITSTRUCT(sP_FE2CL_NPC_MOVE, pkt);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.iNPC_ID = mob->id;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iSpeed = speed;
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
pkt.iToX = mob->x = targ.first;
pkt.iToY = mob->y = targ.second;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iToZ = plr->z;
pkt.iMoveStyle = 1;
// notify all nearby players
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_MOVE, sizeof(sP_FE2CL_NPC_MOVE));
}
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
/* attack logic
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
* 2/5 represents 400 ms which is the time interval mobs use per movement logic step
* if the mob is one move interval away, we should just start attacking anyways.
*/
if (distance <= mobRange || distanceToTravel < speed*2/5) {
if (mob->nextAttack == 0 || currTime >= mob->nextAttack) {
mob->nextAttack = currTime + (int)mob->data["m_iDelayTime"] * 100;
Combat::npcAttackPc(mob, currTime);
}
}
// retreat if the player leaves combat range
int xyDistance = hypot(plr->x - mob->roamX, plr->y - mob->roamY);
distance = hypot(xyDistance, plr->z - mob->roamZ);
if (distance >= mob->data["m_iCombatRange"]) {
mob->target = nullptr;
mob->state = MobState::RETREAT;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
clearDebuff(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (mob->groupLeader != 0)
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
groupRetreat(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
}
void MobAI::incNextMovement(Mob *mob, time_t currTime) {
if (currTime == 0)
currTime = getTime();
int delay = (int)mob->data["m_iDelayTime"] * 1000;
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
mob->nextMovement = currTime + delay/2 + Rand::rand(delay/2);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
static void roamingStep(Mob *mob, time_t currTime) {
/*
* We reuse nextAttack to avoid scanning for players all the time, but to still
* do so more often than if we waited for nextMovement (which is way too slow).
* In the case of group leaders, this step will be called by dead mobs, so disable attack.
*/
if (mob->state != MobState::DEAD && (mob->nextAttack == 0 || currTime >= mob->nextAttack)) {
mob->nextAttack = currTime + 500;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
if (aggroCheck(mob, currTime))
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
return;
}
// no random roaming if the mob already has a set path
if (mob->staticPath)
return;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->groupLeader != 0 && mob->groupLeader != mob->id) // don't roam by yourself without group leader
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
return;
/*
* mob->nextMovement is also updated whenever the path queue is traversed in
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
* Transport::stepNPCPathing() (which ticks at a higher frequency than nextMovement),
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
* so we don't have to check if there's already entries in the queue since we know there won't be.
*/
if (mob->nextMovement != 0 && currTime < mob->nextMovement)
return;
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
incNextMovement(mob, currTime);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
int xStart = mob->spawnX - mob->idleRange/2;
int yStart = mob->spawnY - mob->idleRange/2;
Added speed to CombatNPC - Mob's constructor sets speed - MobAI.cpp now uses mob->speed
2021-04-30 00:20:53 +00:00
int speed = mob->speed;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// some mobs don't move (and we mustn't divide/modulus by zero)
if (mob->idleRange == 0 || speed == 0)
return;
int farX, farY, distance;
int minDistance = mob->idleRange / 2;
// pick a random destination
added better drop handling, parsing, rng
2021-03-28 20:57:43 +00:00
farX = xStart + Rand::rand(mob->idleRange);
farY = yStart + Rand::rand(mob->idleRange);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
distance = std::abs(std::max(farX - mob->x, farY - mob->y));
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
if (distance == 0)
distance += 1; // hack to avoid FPE
// if it's too short a walk, go further in that direction
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
farX = mob->x + (farX - mob->x) * minDistance / distance;
farY = mob->y + (farY - mob->y) * minDistance / distance;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// but don't got out of bounds
farX = std::clamp(farX, xStart, xStart + mob->idleRange);
farY = std::clamp(farY, yStart, yStart + mob->idleRange);
// halve movement speed if snared
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->cbf & CSB_BIT_DN_MOVE_SPEED)
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
speed /= 2;
[refac] Stop using WarpLocation for coordinates and introduce a Vec3
2021-05-01 15:04:28 +00:00
std::queue<Vec3> queue;
Vec3 from = { mob->x, mob->y, mob->z };
Vec3 to = { farX, farY, mob->z };
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
// add a route to the queue; to be processed in Transport::stepNPCPathing()
Transport::lerp(&queue, from, to, speed);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
Transport::NPCQueues[mob->id] = queue;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
if (mob->groupLeader != 0 && mob->groupLeader == mob->id) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// make followers follow this npc.
for (int i = 0; i < 4; i++) {
if (mob->groupMember[i] == 0)
break;
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
if (NPCManager::NPCs.find(mob->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[mob->groupMember[i]]->kind != EntityType::MOB) {
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
std::cout << "[WARN] roamingStep: leader can't find a group member!" << std::endl;
continue;
}
[refac] Stop using WarpLocation for coordinates and introduce a Vec3
2021-05-01 15:04:28 +00:00
std::queue<Vec3> queue2;
Remove redundant Mob map
2021-04-07 00:43:43 +00:00
Mob* followerMob = (Mob*)NPCManager::NPCs[mob->groupMember[i]];
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
from = { followerMob->x, followerMob->y, followerMob->z };
to = { farX + followerMob->offsetX, farY + followerMob->offsetY, followerMob->z };
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
Transport::lerp(&queue2, from, to, speed);
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
Transport::NPCQueues[followerMob->id] = queue2;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
}
}
static void retreatStep(Mob *mob, time_t currTime) {
if (mob->nextMovement != 0 && currTime < mob->nextMovement)
return;
mob->nextMovement = currTime + 400;
// distance between spawn point and current location
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
int distance = hypot(mob->x - mob->roamX, mob->y - mob->roamY);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
//if (distance > mob->data["m_iIdleRange"]) {
if (distance > 10) {
INITSTRUCT(sP_FE2CL_NPC_MOVE, pkt);
Added speed to CombatNPC - Mob's constructor sets speed - MobAI.cpp now uses mob->speed
2021-04-30 00:20:53 +00:00
auto targ = lerp(mob->x, mob->y, mob->roamX, mob->roamY, (int)mob->speed*4/5);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
pkt.iNPC_ID = mob->id;
Added speed to CombatNPC - Mob's constructor sets speed - MobAI.cpp now uses mob->speed
2021-04-30 00:20:53 +00:00
pkt.iSpeed = (int)mob->speed * 2;
[refactor] BaseNPC now uses Entity XYZ fields for handling positions - fixed many references to Entity.appearanceData.i[XYZ] to use the base Entity XYZ values - BaseNPC::enterIntoViewOf grabs the position from the base Entity XYZ values - NPCManager::updateNPCPosition updates the base Entity XYZ values - MobAI.c/deadStep() also sends it's packet based on the Entity XYZ values
2021-04-14 00:57:24 +00:00
pkt.iToX = mob->x = targ.first;
pkt.iToY = mob->y = targ.second;
pkt.iToZ = mob->z = mob->spawnZ;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
pkt.iMoveStyle = 1;
// notify all nearby players
NPCManager::sendToViewable(mob, &pkt, P_FE2CL_NPC_MOVE, sizeof(sP_FE2CL_NPC_MOVE));
}
// if we got there
//if (distance <= mob->data["m_iIdleRange"]) {
if (distance <= 10) { // retreat back to the spawn point
mob->state = MobState::ROAMING;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
mob->hp = mob->maxHealth;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
mob->killedTime = 0;
mob->nextAttack = 0;
[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.
2021-06-20 18:37:37 +00:00
mob->cbf = 0;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// cast a return home heal spell, this is the right way(tm)
std::vector<int> targetData = {1, 0, 0, 0, 0};
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[110].skillType)
pwr.handle(mob, targetData, 110, Abilities::SkillTable[110].durationTime[0], Abilities::SkillTable[110].powerIntensity[0]);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
// clear outlying debuffs
[refactor] Mark all internal functions static All packet handlers and helper functions that are only used in the source file they're declared in have been taken out of the namespaces in the corresponding header files, have been marked static, and have been reordered to avoid the need for declarations at the top of each source file. Each source file now contains a "using namespace" directive so that the static functions don't need to prefix the source file's symbols with their namespace. All redundant namespace prefixes found have been removed. An unused nano power resetting function in NanoManager has been removed.
2021-03-16 21:06:10 +00:00
clearDebuff(mob);
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
}
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
void MobAI::step(CombatNPC *npc, time_t currTime) {
[WIP] Rename Entity.type -> Entity.kind
2021-06-20 18:12:40 +00:00
assert(npc->kind == EntityType::MOB);
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
auto mob = (Mob*)npc;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
if (mob->playersInView < 0)
std::cout << "[WARN] Weird playerview value " << mob->playersInView << std::endl;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
// skip mob movement and combat if disabled or not in view
if ((!simulateMobs || mob->playersInView == 0) && mob->state != MobState::DEAD
&& mob->state != MobState::RETREAT)
return;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
Generalize NPC AI stepping logic The MobAI::Mobs map still needs to be removed.
2021-03-31 19:05:49 +00:00
switch (mob->state) {
case MobState::INACTIVE:
// no-op
break;
case MobState::ROAMING:
roamingStep(mob, currTime);
break;
case MobState::COMBAT:
combatStep(mob, currTime);
break;
case MobState::RETREAT:
retreatStep(mob, currTime);
break;
case MobState::DEAD:
deadStep(mob, currTime);
break;
[refactor] Split MobManager.cpp into MobAI.cpp and Combat.cpp This is terrible. It was a mistake to do this before cleaning up the actual code. It might be better not to use this commit and to do this refactor in a different order or something.
2021-03-13 22:55:16 +00:00
}
}
Reference in New Issue Copy Permalink