From da190e09a33591aaabfd2c7735fd64ebb12f78e9 Mon Sep 17 00:00:00 2001 From: panikon Date: Fri, 11 Jul 2014 04:29:29 -0300 Subject: Mado behaviour changes - Corrected list of skills that can be used while using mado - Corrected list of supportive skills that can't be cast in users with mado - Fixed *setmadogear behaviour, it would set mado to any character Added SI_FALLENEMPIRE to SR_FALLENEMPIRE Added SI_SILENTBREEZE to MH_SILENTBREEZE Fixed MH_SILENTBREEZE entry in skill_db Special thanks to Rytech --- src/map/pc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 104a3cde0..fb1fae2c7 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8118,19 +8118,18 @@ int pc_setriding(TBL_PC* sd, int flag) return 0; } -/*========================================== - * Give player a mado - *------------------------------------------*/ -int pc_setmadogear(TBL_PC* sd, int flag) -{ - if( flag ){ - if( pc->checkskill(sd,NC_MADOLICENCE) > 0 ) +/** + * Gives player a mado + * @param flag 1 Set mado + **/ +void pc_setmadogear( struct map_session_data *sd, int flag ) { + if( flag ) { + if( (sd->class_&MAPID_THIRDMASK) == MAPID_MECHANIC ) pc->setoption(sd, sd->sc.option|OPTION_MADOGEAR); - } else if( pc_ismadogear(sd) ){ - pc->setoption(sd, sd->sc.option&~OPTION_MADOGEAR); - } + } else if( pc_ismadogear(sd) ) + pc->setoption(sd, sd->sc.option&~OPTION_MADOGEAR); - return 0; + return; } /** @@ -8154,7 +8153,8 @@ bool pc_can_attack( struct map_session_data *sd, int target_id ) { sd->sc.data[SC_TRICKDEAD] || (sd->sc.data[SC_SIREN] && sd->sc.data[SC_SIREN]->val2 == target_id) || sd->sc.data[SC_BLADESTOP] || - sd->sc.data[SC_DEEP_SLEEP] ) + sd->sc.data[SC_DEEP_SLEEP] /*|| + sd->sc.data[SC_FALLENEMPIRE]TODO*/) return false; return true; -- cgit v1.2.3-70-g09d2