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

- Merged item_db.sql from stable :B

Browse Source 
- Added a missing line (how did it get lost?) in mob_spawn to set aggressive state for angry mobs.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6731 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-05-24 16:47:10 +00:00
parent 0cabc2525a
commit 1641349382
5 changed files with 2552 additions and 2552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/24
* Merged item_db.sql from stable (the one from stable was more recent than
the one of trunk...) [Skotlex]
* Corrected SL KA* spells not working on other Soul Linkers. [Skotlex]
* Corrected a pair of incorrect sql query parsing logic in the login-sql
ban request packet. [Skotlex]

4
db/item_db.txt
View File

@ -2354,13 +2354,13 @@
12101,Citron,Citron,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12102,Grilled_Skewer,Grilled Skewer,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
// New Monster Summoners & Item Givers
12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",-3,1,""; },{},{}
12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-3,1,""; },{},{}
12104,Random_Quiver,Random Quiver,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Quiver),1; },{},{}
12105,Taming_Item_Giftset,Taming Item Giftset,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Taming),3; },{},{}
12106,Jewel_Box,Jewel Case,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Jewel),1; },{},{}
12107,Wrapped_Mask,Wrapped Mask,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Mask),1; },{},{}
12108,Bundle_of_Spells,Bundle of Spells,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Scroll),5; },{},{}
12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",-2,1,""; },{},{}
12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-2,1,""; },{},{}
12110,First_Aid_Box,First Aid Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Potion),5; },{},{}
12111,Wrapped_Food,Wrapped Food,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Fruit),1; getitem groupranditem(IG_Meat),1; getitem groupranditem(IG_Fish),1; },{},{}
12112,Tropical_Sograt,Tropical Sograt,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Curse,10000,1; },{},{}

5078
sql-files/item_db.sql
View File

File diff suppressed because it is too large Load Diff

18
src/map/mob.c
View File

@ -288,28 +288,26 @@ int mob_once_spawn (struct map_session_data *sd, char *mapname,
}
strncpy(data.eventname, event, 50);
if (sd && (x < 0 || y < 0))
{ //Locate spot around player.
if (sd && (x < 0 || y < 0)) //Locate spot around player.
map_search_freecell(&sd->bl, m, &x, &y, 1, 1, 0);
data.x = x;
data.y = y;
}
if (x <= 0 || y <= 0 || map_getcell(m,x,y,CELL_CHKNOREACH))
rand_flag = 1; //Randomize spot on map for each mob.
else {
data.x = x;
data.y = y;
}
if (!mob_parse_dataset(&data))
return 0;
for (count = 0; count < amount; count++) {
if (rand_flag) { //Get a random cell for this mob.
map_search_freecell(NULL, m, &x, &y, -1, -1, 1);
// This should ALWAYS be done. [blackhole89]
data.x = x;
data.y = y;
}
// This should ALWAYS be done. [blackhole89]
data.x = x;
data.y = y;
md =mob_spawn_dataset (&data);
if (class_ < 0 && battle_config.dead_branch_active)

2
src/map/unit.c
View File

@ -392,7 +392,7 @@ int unit_movepos(struct block_list *bl,int dst_x,int dst_y, int easy, int checkp
unit_stop_walking(bl,1);
unit_stop_attack(bl);
if(checkpath && (map_getcell(bl->m,bl->x,bl->y, CELL_CHKNOPASS) || path_search_real(&wpd,bl->m,bl->x,bl->y,dst_x,dst_y,easy, CELL_CHKNOREACH)))
if(checkpath && (map_getcell(bl->m,dst_x,dst_y, CELL_CHKNOPASS) || path_search_real(&wpd,bl->m,bl->x,bl->y,dst_x,dst_y,easy, CELL_CHKNOREACH)))
return 0;
dir = map_calc_dir(bl, dst_x,dst_y);