Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed an issue where mobs instantly walked after being spotted (#7738)

Browse Source 
* Fixed an issue where mobs instantly walked after being spotted
  MIN_RANDOMWALKTIME was initialized too early
* This behavior is only applied on the monster script command
This commit is contained in:
Atemo 2023-05-12 00:34:36 +02:00 committed by GitHub
parent d3b99e6dc1
commit b4b69a2cc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/mob.cpp
View File

@ -1571,6 +1571,12 @@ int mob_randomwalk(struct mob_data *md,t_tick tick)
nullpo_ret(md);
// Initialize next_walktime
if (md->next_walktime == INVALID_TIMER) {
md->next_walktime = tick+rnd()%1000+MIN_RANDOMWALKTIME;
return 1;
}
if(DIFF_TICK(md->next_walktime,tick)>0 ||
status_has_mode(&md->status,MD_NORANDOMWALK) ||
!unit_can_move(&md->bl) ||

18
src/map/script.cpp
View File

@ -11157,11 +11157,18 @@ BUILDIN_FUNC(monster)
else
m = map_mapname2mapid(mapn);
TBL_MOB* md;
for(i = 0; i < amount; i++) { //not optimised
int mobid = mob_once_spawn(sd, m, x, y, str, class_, 1, event, size, ai);
if (mobid)
if (mobid > 0) {
md = map_id2md(mobid);
if (md)
md->next_walktime = INVALID_TIMER;
mapreg_setreg(reference_uid(add_str("$@mobid"), i), mobid);
}
}
return SCRIPT_CMD_SUCCESS;
@ -11274,11 +11281,18 @@ BUILDIN_FUNC(areamonster)
else
m = map_mapname2mapid(mapn);
TBL_MOB* md;
for(i = 0; i < amount; i++) { //not optimised
int mobid = mob_once_spawn_area(sd, m, x0, y0, x1, y1, str, class_, 1, event, size, ai);
if (mobid)
if (mobid > 0) {
md = map_id2md(mobid);
if (md)
md->next_walktime = INVALID_TIMER;
mapreg_setreg(reference_uid(add_str("$@mobid"), i), mobid);
}
}
return SCRIPT_CMD_SUCCESS;