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

- Resetting skills will now automatically remove peco, falcon, cart and homunculus (vaporize).

Browse Source 
- Fixed random mob picking choosing clones.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9780 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-02-02 20:59:09 +00:00
parent 2a5ec09a11
commit cc141e4bcb
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/02/02
* Resetting skills will now automatically remove peco, falcon, cart and
homunculus (vaporize).
* Fixed random mob picking choosing clones. [Skotlex]
2007/02/01 2007/02/01
* Restricted global messages to 255 characters (client shows only ~80 anyway, * Restricted global messages to 255 characters (client shows only ~80 anyway,
wanted to use 127 but frost joke's lines are longer than that ...) wanted to use 127 but frost joke's lines are longer than that ...)

1
src/map/mob.c
View File

@ -257,6 +257,7 @@ int mob_get_random_id(int type, int flag, int lv) {
class_ = rand() % MAX_MOB_DB; class_ = rand() % MAX_MOB_DB;
mob = mob_db(class_); mob = mob_db(class_);
} while ((mob == mob_dummy || } while ((mob == mob_dummy ||
mob_is_clone(class_) ||
(flag&1 && mob->summonper[type] <= rand() % 1000000) || (flag&1 && mob->summonper[type] <= rand() % 1000000) ||
(flag&2 && lv < mob->lv) || (flag&2 && lv < mob->lv) ||
(flag&4 && mob->status.mode&MD_BOSS) || (flag&4 && mob->status.mode&MD_BOSS) ||

20
src/map/pc.c
View File

@ -4720,8 +4720,24 @@ int pc_resetskill(struct map_session_data* sd, int flag)
int i, lv, inf2, skill_point=0; int i, lv, inf2, skill_point=0;
nullpo_retr(0, sd); nullpo_retr(0, sd);
if (pc_checkskill(sd, SG_DEVIL) && !pc_nextjobexp(sd)) if(!(flag&2))
clif_status_load(&sd->bl, SI_DEVIL, 0); //Remove perma blindness due to skill-reset. [Skotlex] { //Remove stuff lost when resetting skills.
if (pc_checkskill(sd, SG_DEVIL) && !pc_nextjobexp(sd))
clif_status_load(&sd->bl, SI_DEVIL, 0); //Remove perma blindness due to skill-reset. [Skotlex]
i = sd->sc.option;
if (i&OPTION_RIDING && pc_checkskill(sd, KN_RIDING))
i&=~OPTION_RIDING;
if(i&OPTION_CART && pc_checkskill(sd, MC_PUSHCART))
i&=~OPTION_CART;
if(i&OPTION_FALCON && pc_checkskill(sd, HT_FALCON))
i&=~OPTION_FALCON;
if(i != sd->sc.option)
pc_setoption(sd, i);
if(merc_is_hom_active(sd->hd) && pc_checkskill(sd, AM_CALLHOMUN))
merc_hom_vaporize(sd, 0);
}
for (i = 1; i < MAX_SKILL; i++) { for (i = 1; i < MAX_SKILL; i++) {
lv= sd->status.skill[i].lv; lv= sd->status.skill[i].lv;