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
0e8a4742eb
OpenFusion/src/MobAI.cpp

897 lines
32 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"
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
#include "Items.hpp"
#include "Missions.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
Move mob aggro logic into `takeDamage` override God that feels good
2022-04-17 00:01:58 +00:00
void Mob::step(time_t currTime) {
if (playersInView < 0)
std::cout << "[WARN] Weird playerview value " << playersInView << std::endl;
// skip movement and combat if disabled or not in view
if ((!MobAI::simulateMobs || playersInView == 0) && state != AIState::DEAD
&& state != AIState::RETREAT)
return;
// call superclass step
CombatNPC::step(currTime);
}
int Mob::takeDamage(EntityRef src, int amt) {
// cannot kill mobs multiple times; cannot harm retreating mobs
if (state != AIState::ROAMING && state != AIState::COMBAT) {
return 0; // no damage
}
if (skillStyle >= 0)
return 0; // don't hurt a mob casting corruption
if (state == AIState::ROAMING) {
assert(target == nullptr && src.kind == EntityKind::PLAYER); // TODO: players only for now
transition(AIState::COMBAT, src);
if (groupLeader != 0)
MobAI::followToCombat(this);
}
// wake up sleeping monster
if (cbf & CSB_BIT_MEZ) {
cbf &= ~CSB_BIT_MEZ;
INITSTRUCT(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT, pkt1);
pkt1.eCT = 2;
pkt1.iID = id;
pkt1.iConditionBitFlag = cbf;
NPCManager::sendToViewable(this, &pkt1, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));
}
// call superclass takeDamage
return CombatNPC::takeDamage(src, amt);
}
[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
* 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) {
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (NPCManager::NPCs.find(mob->groupLeader) != NPCManager::NPCs.end() && NPCManager::NPCs[mob->groupLeader]->kind == EntityKind::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;
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (NPCManager::NPCs.find(leadMob->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[leadMob->groupMember[i]]->kind != EntityKind::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
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
if (followerMob->state != AIState::ROAMING) // only roaming mobs should transition to combat
[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;
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
followerMob->transition(AIState::COMBAT, mob->target);
[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) Point 2: Generalization
2022-04-13 02:22:12 +00:00
if (leadMob->state != AIState::ROAMING)
[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;
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
leadMob->transition(AIState::COMBAT, mob->target);
[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::groupRetreat(Mob *mob) {
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (NPCManager::NPCs.find(mob->groupLeader) == NPCManager::NPCs.end() || NPCManager::NPCs[mob->groupLeader]->kind != EntityKind::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;
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (NPCManager::NPCs.find(leadMob->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[leadMob->groupMember[i]]->kind != EntityKind::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
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
if (followerMob->state != AIState::COMBAT)
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
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;
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
followerMob->state = AIState::RETREAT;
[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
clearDebuff(followerMob);
}
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
if (leadMob->state != AIState::COMBAT)
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
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;
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
leadMob->state = AIState::RETREAT;
[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
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
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (ref.kind != EntityKind::PLAYER)
[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
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;
(WIP) Point 2: Generalization
2022-04-13 02:22:12 +00:00
if (mob->state != AIState::ROAMING && plr->inCombat) // freshly out of aggro mobs
[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 = 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.
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
mob->transition(AIState::COMBAT, closest);
[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)
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
[refactor] Replace a few uses of magic numbers with enums
2021-10-19 22:40:40 +00:00
respdata[i].iHitFlag = HF_BIT_STYLE_TIE;
some struct reorg
2022-05-16 20:47:30 +00:00
respdata[i].iDamage = Abilities::SkillTable[skillID].values[0][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) {
[refactor] Replace a few uses of magic numbers with enums
2021-10-19 22:40:40 +00:00
respdata[i].iHitFlag = HF_BIT_STYLE_TIE;
[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].iDamage = 0;
respdata[i].iNanoStamina = plr->Nanos[plr->activeNano].iStamina;
} else if (style - style2 == 1 || style2 - style == 2) {
[refactor] Replace a few uses of magic numbers with enums
2021-10-19 22:40:40 +00:00
respdata[i].iHitFlag = HF_BIT_STYLE_WIN;
[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].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) TODO ABILITIES
2022-04-17 01:51:55 +00:00
// TODO ABILITIES
/*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)
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
pwr.handle(sock, targetData2, plr->activeNano, skillID, 0, 200);*/
[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 {
[refactor] Replace a few uses of magic numbers with enums
2021-10-19 22:40:40 +00:00
respdata[i].iHitFlag = HF_BIT_STYLE_LOSE;
some struct reorg
2022-05-16 20:47:30 +00:00
respdata[i].iDamage = Abilities::SkillTable[skillID].values[0][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) {
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
if (!MobAI::aggroCheck(mob, getTime()))
(WIP) Add src param to transition + certain hooks Should all hooks have src? I think not
2022-04-13 03:44:12 +00:00
mob->transition(AIState::RETREAT, mob->target);
[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()
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (ref.kind != EntityKind::PLAYER)
[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
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) TODO ABILITIES
2022-04-17 01:51:55 +00:00
// TODO ABILITIES
/*for (auto& pwr : Abilities::Powers)
[WIP] Fix Nanos -> Abilities namespace calls
2021-06-20 17:05:10 +00:00
if (pwr.skillType == Abilities::SkillTable[skillID].skillType)
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
pwr.handle(mob->id, 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"];
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
// TODO ABILITIES
//std::vector<int> targetData = {1, plr->iID, 0, 0, 0};
//for (auto& pwr : Abilities::Powers)
// if (pwr.skillType == Abilities::SkillTable[skillID].skillType) {
// if (pwr.bitFlag != 0 && (plr->iConditionBitFlag & pwr.bitFlag))
// return; // prevent debuffing a player twice
// pwr.handle(mob->id, 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;
}
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)
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
mob->transition(AIState::DEAD, mob->target);
[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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::incNextMovement(Mob* mob, time_t currTime) {
if (currTime == 0)
currTime = getTime();
int delay = (int)mob->data["m_iDelayTime"] * 1000;
mob->nextMovement = currTime + delay / 2 + Rand::rand(delay / 2);
}
void MobAI::deadStep(CombatNPC* npc, time_t currTime) {
Mob* self = (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
// despawn the mob after a short delay
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->killedTime != 0 && !self->despawned && currTime - self->killedTime > 2000) {
self->despawned = true;
[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_EXIT, pkt);
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
pkt.iNPC_ID = self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::sendToViewable(self, &pkt, P_FE2CL_NPC_EXIT, sizeof(sP_FE2CL_NPC_EXIT));
[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 it was summoned, mark it for removal
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->summoned) {
[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 << "[INFO] Queueing killed summoned mob for removal" << std::endl;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::queueNPCRemoval(self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->x = self->spawnX;
self->y = self->spawnY;
self->z = self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupLeader == self->id)
roamingStep(self, 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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->killedTime != 0 && currTime - self->killedTime < self->regenTime * 100)
[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;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
std::cout << "respawning mob " << self->id << " with HP = " << self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->transition(AIState::ROAMING, self->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
// if mob is a group leader/follower, spawn where the group is.
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupLeader != 0) {
if (NPCManager::NPCs.find(self->groupLeader) != NPCManager::NPCs.end() && NPCManager::NPCs[self->groupLeader]->kind == EntityKind::MOB) {
Mob* leaderMob = (Mob*)NPCManager::NPCs[self->groupLeader];
self->x = leaderMob->x + self->offsetX;
self->y = leaderMob->y + self->offsetY;
self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
pkt.NPCAppearanceData = self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::sendToViewable(self, &pkt, P_FE2CL_NPC_NEW, sizeof(sP_FE2CL_NPC_NEW));
[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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::combatStep(CombatNPC* npc, time_t currTime) {
Mob* self = (Mob*)npc;
assert(self->target != nullptr);
[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
// lose aggro if the player lost connection
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (PlayerManager::players.find(self->target) == PlayerManager::players.end()) {
if (!MobAI::aggroCheck(self, getTime()))
self->transition(AIState::RETREAT, self->target);
[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;
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Player *plr = PlayerManager::getPlayer(self->target);
[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
// lose aggro if the player became invulnerable or died
if (plr->HP <= 0
|| (plr->iSpecialState & CN_SPECIAL_STATE_FLAG__INVULNERABLE)) {
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (!MobAI::aggroCheck(self, getTime()))
self->transition(AIState::RETREAT, self->target);
[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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->skillStyle < 0 && (self->lastDrainTime == 0 || currTime - self->lastDrainTime >= 1000)
&& self->cbf & CSB_BIT_BOUNDINGBALL) {
drainMobHP(self, self->maxHealth / 20); // lose 5% every second
self->lastDrainTime = 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
}
// if drain killed the mob, return early
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
std::unordered_map<int32_t, time_t>::iterator it = self->unbuffTimes.begin();
while (it != self->unbuffTimes.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
if (currTime >= it->second) {
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
pkt1.iID = self->id;
pkt1.iConditionBitFlag = self->cbf;
NPCManager::sendToViewable(self, &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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
it = self->unbuffTimes.erase(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
} else {
it++;
}
}
// skip attack if stunned or asleep
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->cbf & (CSB_BIT_STUN|CSB_BIT_MEZ)) {
self->skillStyle = -1; // in this case we also reset the any outlying abilities the mob might be winding up.
[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;
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int distance = hypot(plr->x - self->x, plr->y - self->y);
int mobRange = (int)self->data["m_iAtkRange"] + (int)self->data["m_iRadius"];
[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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (currTime >= self->nextAttack) {
if (self->skillStyle != -1 || distance <= mobRange || Rand::rand(20) == 0) // while not in attack range, 1 / 20 chance.
useAbilities(self, currTime);
if (self->target == nullptr)
[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;
}
int distanceToTravel = INT_MAX;
// movement logic: move when out of range but don't move while casting a skill
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (distance > mobRange && self->skillStyle == -1) {
if (self->nextMovement != 0 && currTime < self->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
return;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->nextMovement = currTime + 400;
if (currTime >= self->nextAttack)
self->nextAttack = 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
// halve movement speed if snared
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->cbf & CSB_BIT_DN_MOVE_SPEED)
self->speed /= 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
int targetX = plr->x;
int targetY = plr->y;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupLeader != 0) {
targetX += self->offsetX*distance/(self->idleRange + 1);
targetY += self->offsetY*distance/(self->idleRange + 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
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
distanceToTravel = std::min(distance-mobRange+1, self->speed*2/5);
auto targ = lerp(self->x, self->y, targetX, targetY, distanceToTravel);
if (distanceToTravel < self->speed*2/5 && currTime >= self->nextAttack)
self->nextAttack = 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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::updateNPCPosition(self->id, targ.first, targ.second, self->z, self->instanceID, self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
pkt.iNPC_ID = self->id;
pkt.iSpeed = self->speed;
pkt.iToX = self->x = targ.first;
pkt.iToY = self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::sendToViewable(self, &pkt, P_FE2CL_NPC_MOVE, sizeof(sP_FE2CL_NPC_MOVE));
[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
}
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.
*/
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (distance <= mobRange || distanceToTravel < self->speed*2/5) {
if (self->nextAttack == 0 || currTime >= self->nextAttack) {
self->nextAttack = currTime + (int)self->data["m_iDelayTime"] * 100;
Combat::npcAttackPc(self, 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
}
}
// retreat if the player leaves combat range
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int xyDistance = hypot(plr->x - self->roamX, plr->y - self->roamY);
distance = hypot(xyDistance, plr->z - self->roamZ);
if (distance >= self->data["m_iCombatRange"]) {
self->transition(AIState::RETREAT, self->target);
[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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::roamingStep(CombatNPC* npc, time_t currTime) {
Mob* self = (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
/*
* 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.
*/
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->state != AIState::DEAD && (self->nextAttack == 0 || currTime >= self->nextAttack)) {
self->nextAttack = currTime + 500;
if (aggroCheck(self, 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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->staticPath)
[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;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupLeader != 0 && self->groupLeader != self->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.
*/
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->nextMovement != 0 && currTime < self->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
return;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
incNextMovement(self, 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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int xStart = self->spawnX - self->idleRange/2;
int yStart = self->spawnY - self->idleRange/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
// some mobs don't move (and we mustn't divide/modulus by zero)
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->idleRange == 0 || self->speed == 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;
int farX, farY, distance;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int minDistance = self->idleRange / 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
// pick a random destination
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
farX = xStart + Rand::rand(self->idleRange);
farY = yStart + Rand::rand(self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
distance = std::abs(std::max(farX - self->x, farY - self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
farX = self->x + (farX - self->x) * minDistance / distance;
farY = self->y + (farY - self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
farX = std::clamp(farX, xStart, xStart + self->idleRange);
farY = std::clamp(farY, yStart, yStart + self->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
// halve movement speed if snared
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->cbf & CSB_BIT_DN_MOVE_SPEED)
self->speed /= 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
[refac] Stop using WarpLocation for coordinates and introduce a Vec3
2021-05-01 15:04:28 +00:00
std::queue<Vec3> queue;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Vec3 from = { self->x, self->y, self->z };
Vec3 to = { farX, farY, self->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()
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Transport::lerp(&queue, from, to, self->speed);
Transport::NPCQueues[self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupLeader != 0 && self->groupLeader == self->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++) {
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->groupMember[i] == 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
break;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (NPCManager::NPCs.find(self->groupMember[i]) == NPCManager::NPCs.end() || NPCManager::NPCs[self->groupMember[i]]->kind != EntityKind::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;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Mob* followerMob = (Mob*)NPCManager::NPCs[self->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 };
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Transport::lerp(&queue2, from, to, self->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
}
}
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::retreatStep(CombatNPC* npc, time_t currTime) {
Mob* self = (Mob*)npc;
if (self->nextMovement != 0 && currTime < self->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
return;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->nextMovement = currTime + 400;
[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
// distance between spawn point and current location
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int distance = hypot(self->x - self->roamX, self->y - self->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);
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
auto targ = lerp(self->x, self->y, self->roamX, self->roamY, (int)self->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) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
pkt.iNPC_ID = self->id;
pkt.iSpeed = (int)self->speed * 2;
pkt.iToX = self->x = targ.first;
pkt.iToY = self->y = targ.second;
pkt.iToZ = self->z = self->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
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
NPCManager::sendToViewable(self, &pkt, P_FE2CL_NPC_MOVE, sizeof(sP_FE2CL_NPC_MOVE));
[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 we got there
//if (distance <= mob->data["m_iIdleRange"]) {
if (distance <= 10) { // retreat back to the spawn point
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->transition(AIState::ROAMING, self->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
}
}
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::onRoamStart(CombatNPC* npc, EntityRef src) {
Mob* self = (Mob*)npc;
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->hp = self->maxHealth;
self->killedTime = 0;
self->nextAttack = 0;
self->cbf = 0;
(WIP) onRoamStart hook implementation
2022-04-13 19:09:43 +00:00
// cast a return home heal spell, this is the right way(tm)
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
// TODO ABILITIES
/*std::vector<int> targetData = { 1, 0, 0, 0, 0 };
(WIP) onRoamStart hook implementation
2022-04-13 19:09:43 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[110].skillType)
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
pwr.handle(self->id, targetData, 110, Abilities::SkillTable[110].durationTime[0], Abilities::SkillTable[110].powerIntensity[0]);*/
(WIP) onRoamStart hook implementation
2022-04-13 19:09:43 +00:00
// clear outlying debuffs
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
clearDebuff(self);
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::onCombatStart(CombatNPC* npc, EntityRef src) {
Mob* self = (Mob*)npc;
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
assert(src.kind == EntityKind::PLAYER);
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->target = src.sock;
self->nextMovement = getTime();
self->nextAttack = 0;
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->roamX = self->x;
self->roamY = self->y;
self->roamZ = self->z;
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
int skillID = (int)self->data["m_iPassiveBuff"]; // cast passive
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
// TODO ABILITIES
/*std::vector<int> targetData = { 1, self->id, 0, 0, 0 };
(WIP) onCombatStart hook implementation
2022-04-13 04:54:13 +00:00
for (auto& pwr : Abilities::Powers)
if (pwr.skillType == Abilities::SkillTable[skillID].skillType)
(WIP) TODO ABILITIES
2022-04-17 01:51:55 +00:00
pwr.handle(self->id, targetData, skillID, Abilities::SkillTable[skillID].durationTime[0], Abilities::SkillTable[skillID].powerIntensity[0]);*/
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::onRetreat(CombatNPC* npc, EntityRef src) {
Mob* self = (Mob*)npc;
self->target = nullptr;
MobAI::clearDebuff(self);
if (self->groupLeader != 0)
MobAI::groupRetreat(self);
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
}
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
void MobAI::onDeath(CombatNPC* npc, EntityRef src) {
Mob* self = (Mob*)npc;
self->target = nullptr;
self->cbf = 0;
self->skillStyle = -1;
self->unbuffTimes.clear();
self->killedTime = getTime(); // XXX: maybe introduce a shard-global time for each step?
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
// check for the edge case where hitting the mob did not aggro it
EntityType -> EntityKind
2022-04-13 19:56:12 +00:00
if (src.kind == EntityKind::PLAYER && src.isValid()) {
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
Player* plr = PlayerManager::getPlayer(src.sock);
Items::DropRoll rolled;
Items::DropRoll eventRolled;
std::map<int, int> qitemRolls;
Refactor player groups Group structures are used now. Adds more checks in some places but simplifies things overall. We can expand this system to entities as well now pretty trivially.
2022-04-23 19:58:08 +00:00
std::vector<Player*> playerRefs;
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
(WIP) EXPERIMENTAL GROUP CHANGES
2022-04-23 01:13:00 +00:00
if (plr->group == nullptr) {
Refactor player groups Group structures are used now. Adds more checks in some places but simplifies things overall. We can expand this system to entities as well now pretty trivially.
2022-04-23 19:58:08 +00:00
playerRefs.push_back(plr);
Combat::genQItemRolls(playerRefs, qitemRolls);
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Items::giveMobDrop(src.sock, self, rolled, eventRolled);
Missions::mobKilled(src.sock, self->type, qitemRolls);
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
}
else {
Replace group filter operator with function
2022-04-24 20:50:03 +00:00
auto players = plr->group->filter(EntityKind::PLAYER);
Refactor player groups Group structures are used now. Adds more checks in some places but simplifies things overall. We can expand this system to entities as well now pretty trivially.
2022-04-23 19:58:08 +00:00
for (EntityRef pRef : players) playerRefs.push_back(PlayerManager::getPlayer(pRef.sock));
Combat::genQItemRolls(playerRefs, qitemRolls);
(WIP) EXPERIMENTAL GROUP CHANGES
2022-04-23 01:13:00 +00:00
for (int i = 0; i < players.size(); i++) {
CNSocket* sockTo = players[i].sock;
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
Player* otherPlr = PlayerManager::getPlayer(sockTo);
// only contribute to group members' kills if they're close enough
int dist = std::hypot(plr->x - otherPlr->x + 1, plr->y - otherPlr->y + 1);
if (dist > 5000)
continue;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Items::giveMobDrop(sockTo, self, rolled, eventRolled);
Missions::mobKilled(sockTo, self->type, qitemRolls);
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
}
}
}
// delay the despawn animation
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
self->despawned = false;
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
auto it = Transport::NPCQueues.find(self->id);
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
if (it == Transport::NPCQueues.end() || it->second.empty())
return;
// rewind or empty the movement queue
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
if (self->staticPath) {
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
/*
* This is inelegant, but we wind forward in the path until we find the point that
* corresponds with the Mob's spawn point.
*
* IMPORTANT: The check in TableData::loadPaths() must pass or else this will loop forever.
*/
auto& queue = it->second;
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
for (auto point = queue.front(); point.x != self->spawnX || point.y != self->spawnY; point = queue.front()) {
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
queue.pop();
queue.push(point);
}
}
else {
(WIP) Move away from rigid states/transitions to allow custom behavior
2022-04-13 22:01:52 +00:00
Transport::NPCQueues.erase(self->id);
(WIP) onDeath hook implementation
2022-04-13 04:23:53 +00:00
}
(WIP) Transitions + hook definitions + onRetreat hook implementation
2022-04-13 03:29:11 +00:00
}
Reference in New Issue Copy Permalink