diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-16 16:56:43 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-16 16:56:43 +0000 |
| commit | 3089bee74700694461fdc50bf9e9aa01fe589730 (patch) | |
| tree | cf330782d4f381fe4caad9915824f51dcdd39648 /src/map/status.c | |
| parent | f3bc6581829e1b0111110c4bd42626cd0886593d (diff) | |
| download | hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.gz hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.bz2 hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.xz hercules-3089bee74700694461fdc50bf9e9aa01fe589730.zip | |
Fixed bugreport:5749 Amplify Magic Power should now work properly on multi-hit magical skills.
Fixed bugreport:5748 Masquerade-Groomy now removes Dragon and Warg.
Fixed bugreport:5751 Implemented script command in checking/mounting Dragon, Warg and MADO Gear, also made a clean up regarding MADO Gear and Warg conditions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index a841e4be4..11b057081 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4699,9 +4699,9 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha else if( sd ) { if( pc_isriding(sd) || sd->sc.option&(OPTION_DRAGON|OPTION_MOUNTING) ) val = 25;//Same bonus - else if( sd->sc.option&OPTION_WUGRIDER ) + else if( pc_isridingwug(sd) ) val = 15 + 5 * pc_checkskill(sd, RA_WUGRIDER); - else if( sd->sc.option&OPTION_MADOGEAR ) { + else if( pc_ismadogear(sd) ) { val = (- 10 * (5 - pc_checkskill(sd,NC_MADOLICENCE))); if( sc->data[SC_ACCELERATION] ) val += 25; @@ -7540,8 +7540,9 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val val_flag |= 1|2|4; if( sd ) { // Removes Animals - //if( pc_isriding(sd,OPTION_RIDING|OPTION_RIDING_DRAGON|OPTION_RIDING_WUG) ) pc_setriding(sd, 0); - //if( pc_iswarg(sd) ) pc_setoption(sd, sd->sc.option&~OPTION_WUG); + if( pc_isriding(sd) ){ pc_setriding(sd, 0); pc_setoption(sd, sd->sc.option&~OPTION_DRAGON); } + if( pc_iswug(sd) ) pc_setoption(sd, sd->sc.option&~OPTION_WUG); + if( pc_isridingwug(sd) ) pc_setoption(sd, sd->sc.option&~OPTION_WUGRIDER); if( pc_isfalcon(sd) ) pc_setoption(sd, sd->sc.option&~OPTION_FALCON); if( sd->status.pet_id > 0 ) pet_menu(sd, 3); if( merc_is_hom_active(sd->hd) ) merc_hom_vaporize(sd,1); |