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

Added speed to CombatNPC

Browse Source 
- Mob's constructor sets speed
- MobAI.cpp now uses mob->speed
This commit is contained in:
CPunch 2021-04-29 19:20:53 -05:00
parent 55f8dc94ce
commit 33ea5af8b7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Entities.hpp
View File

@ -101,6 +101,7 @@ struct CombatNPC : public BaseNPC {
int spawnY = 0; int spawnY = 0;
int spawnZ = 0; int spawnZ = 0;
int level = 0; int level = 0;
int speed = 300;
void (*_stepAI)(CombatNPC*, time_t) = nullptr; void (*_stepAI)(CombatNPC*, time_t) = nullptr;

8
src/MobAI.cpp
View File

@ -571,7 +571,7 @@ static void combatStep(Mob *mob, time_t currTime) {
} }
int distanceToTravel = INT_MAX; int distanceToTravel = INT_MAX;
int speed = mob->data["m_iRunSpeed"]; int speed = mob->speed;
// movement logic: move when out of range but don't move while casting a skill // movement logic: move when out of range but don't move while casting a skill
if (distance > mobRange && mob->skillStyle == -1) { if (distance > mobRange && mob->skillStyle == -1) {
if (mob->nextMovement != 0 && currTime < mob->nextMovement) if (mob->nextMovement != 0 && currTime < mob->nextMovement)
@ -672,7 +672,7 @@ static void roamingStep(Mob *mob, time_t currTime) {
int xStart = mob->spawnX - mob->idleRange/2; int xStart = mob->spawnX - mob->idleRange/2;
int yStart = mob->spawnY - mob->idleRange/2; int yStart = mob->spawnY - mob->idleRange/2;
int speed = mob->data["m_iWalkSpeed"]; int speed = mob->speed;
// some mobs don't move (and we mustn't divide/modulus by zero) // some mobs don't move (and we mustn't divide/modulus by zero)
if (mob->idleRange == 0 || speed == 0) if (mob->idleRange == 0 || speed == 0)
@ -743,10 +743,10 @@ static void retreatStep(Mob *mob, time_t currTime) {
if (distance > 10) { if (distance > 10) {
INITSTRUCT(sP_FE2CL_NPC_MOVE, pkt); INITSTRUCT(sP_FE2CL_NPC_MOVE, pkt);
auto targ = lerp(mob->x, mob->y, mob->roamX, mob->roamY, (int)mob->data["m_iRunSpeed"]*4/5); auto targ = lerp(mob->x, mob->y, mob->roamX, mob->roamY, (int)mob->speed*4/5);
pkt.iNPC_ID = mob->appearanceData.iNPC_ID; pkt.iNPC_ID = mob->appearanceData.iNPC_ID;
pkt.iSpeed = (int)mob->data["m_iRunSpeed"] * 2; pkt.iSpeed = (int)mob->speed * 2;
pkt.iToX = mob->x = targ.first; pkt.iToX = mob->x = targ.first;
pkt.iToY = mob->y = targ.second; pkt.iToY = mob->y = targ.second;
pkt.iToZ = mob->z = mob->spawnZ; pkt.iToZ = mob->z = mob->spawnZ;

1
src/MobAI.hpp
View File

@ -60,6 +60,7 @@ struct Mob : public CombatNPC {
data = d; data = d;
speed = data["m_iRunSpeed"];
regenTime = data["m_iRegenTime"]; regenTime = data["m_iRegenTime"];
idleRange = (int)data["m_iIdleRange"]; idleRange = (int)data["m_iIdleRange"];
level = data["m_iNpcLevel"]; level = data["m_iNpcLevel"];