diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-18 13:09:08 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-18 13:09:08 +0000 |
| commit | aef1f6939ed8f235ba91afbcc69cdfcc5571988b (patch) | |
| tree | 9bd790f4aac51ab08c4023d1b484eb94610351b9 /src/map/status.c | |
| parent | b6404c70b6ae803d87e6ec6857515e3b927fe2dd (diff) | |
| download | hercules-aef1f6939ed8f235ba91afbcc69cdfcc5571988b.tar.gz hercules-aef1f6939ed8f235ba91afbcc69cdfcc5571988b.tar.bz2 hercules-aef1f6939ed8f235ba91afbcc69cdfcc5571988b.tar.xz hercules-aef1f6939ed8f235ba91afbcc69cdfcc5571988b.zip | |
Reverted r16439 that cause bugreport:6182 again and proper fix for bugreport:6261.
Fixed bugreport:6240 WM_VOICEOFSIREN should now effect all target except caster.
Fixed bugreport:6264 where repeated entry in the 'produce_db.txt' are not process properly.
Added a proper message for casting restricted skills in a certain map flag same with official servers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16442 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c index e2a61f393..2ea6fffd0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -641,8 +641,8 @@ void initChangeTables(void) { set_sc( MI_ECHOSONG , SC_ECHOSONG , SI_ECHOSONG , SCB_DEF2 ); set_sc( MI_HARMONIZE , SC_HARMONIZE , SI_HARMONIZE , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); set_sc_with_vfx( WM_POEMOFNETHERWORLD , SC_NETHERWORLD , SI_NETHERWORLD , SCB_NONE ); - set_sc( WM_VOICEOFSIREN , SC_VOICEOFSIREN , SI_VOICEOFSIREN , SCB_NONE ); - set_sc( WM_LULLABY_DEEPSLEEP , SC_DEEPSLEEP , SI_DEEPSLEEP , SCB_NONE ); + set_sc_with_vfx( WM_VOICEOFSIREN , SC_VOICEOFSIREN , SI_VOICEOFSIREN , SCB_NONE ); + set_sc_with_vfx( WM_LULLABY_DEEPSLEEP , SC_DEEPSLEEP , SI_DEEPSLEEP , SCB_NONE ); set_sc( WM_SIRCLEOFNATURE , SC_SIRCLEOFNATURE , SI_SIRCLEOFNATURE , SCB_NONE ); set_sc( WM_GLOOMYDAY , SC_GLOOMYDAY , SI_GLOOMYDAY , SCB_FLEE|SCB_ASPD ); set_sc( WM_SONG_OF_MANA , SC_SONGOFMANA , SI_SONGOFMANA , SCB_NONE ); @@ -1679,9 +1679,8 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int if (pc_isinvisible(sd)) return 0; if (tsc->option&hide_flag && !is_boss && - (sd->special_state.perfect_hiding || !is_detect) ) - return 0; - if( tsc->data[SC_CLOAKINGEXCEED] && !(is_boss) && (status->mode&(RC_INSECT|RC_DEMON)) ) // Cloaking Exceed => undetected from insect & demon except bosses + ((sd->special_state.perfect_hiding || !is_detect) || + (tsc->data[SC_CLOAKINGEXCEED] && is_detect))) return 0; if( tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect) && !skill_num ) return 0; |