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

Update/moro vol npcs (#3002)

Browse Source 
Updated npcs from ep 14.3 (official conversion)
* Adjusted permanent monster random spawn: xy are now optional
* TO DO: update questinfo to display the icon when the variable condition are met

Thanks to all the contributors !
Special thanks to https://www.divine-pride.net/ !
This commit is contained in:
Atemo
2018-10-16 00:33:37 +02:00
committed by GitHub
parent b9a305be31
commit 0b18fe4bed
10 changed files with 2153 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/npc.cpp
View File

@@ -3814,7 +3814,7 @@ void npc_parse_mob2(struct spawn_data* mob)
static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
{
int num, mob_id, mob_lv = -1, size = -1, w1count;
short m,x,y,xs = -1, ys = -1;
short m, x = 0, y = 0, xs = -1, ys = -1;
char mapname[MAP_NAME_LENGTH_EXT], mobname[NAME_LENGTH];
struct spawn_data mob, *data;
int ai = AI_NONE; // mob_ai
@@ -3823,10 +3823,10 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
mob.state.boss = !strcmpi(w2,"boss_monster");
// w1=<map name>,<x>,<y>{,<xs>{,<ys>}}
// w1=<map name>{,<x>,<y>,<xs>{,<ys>}}
// w3=<mob name>{,<mob level>}
// w4=<mob id>,<amount>{,<delay1>{,<delay2>{,<event>{,<mob size>{,<mob ai>}}}}}
if( ( w1count = sscanf(w1, "%15[^,],%6hd,%6hd,%6hd,%6hd", mapname, &x, &y, &xs, &ys) ) < 3
if( ( w1count = sscanf(w1, "%15[^,],%6hd,%6hd,%6hd,%6hd", mapname, &x, &y, &xs, &ys) ) < 1
|| sscanf(w3, "%23[^,],%11d", mobname, &mob_lv) < 1
|| sscanf(w4, "%11d,%11d,%11u,%11u,%77[^,],%11d,%11d[^\t\r\n]", &mob_id, &num, &mob.delay1, &mob.delay2, mob.eventname, &size, &ai) < 2 )
{