diff options
| author | DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-24 19:29:23 +0000 |
|---|---|---|
| committer | DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-24 19:29:23 +0000 |
| commit | 2a36020cb4786e41ed7f5f02cc77a8522537c4bd (patch) | |
| tree | 158e3d57fb33038c0b995abf974f0d7cb43c1c12 /src/map/skill.c | |
| parent | d9c231e137254734e780570b48741205868be4b7 (diff) | |
| download | hercules-2a36020cb4786e41ed7f5f02cc77a8522537c4bd.tar.gz hercules-2a36020cb4786e41ed7f5f02cc77a8522537c4bd.tar.bz2 hercules-2a36020cb4786e41ed7f5f02cc77a8522537c4bd.tar.xz hercules-2a36020cb4786e41ed7f5f02cc77a8522537c4bd.zip | |
Venom Splasher and Gloria Domini fixes and updates
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10907 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 0f95a0f7b..07c0eddeb 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1088,12 +1088,6 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int sc_start4(bl,SC_DPOISON,sc->data[SC_EDP].val2, sc->data[SC_EDP].val1,0,0,0,skill_get_time2(ASC_EDP,sc->data[SC_EDP].val1)); } - if (tsc->count) { - if (tsc->data[SC_SPLASHER].timer != -1) - sc_start4(bl,SC_POISON,2*tsc->data[SC_SPLASHER].val1+10, - tsc->data[SC_SPLASHER].val1,0,0,0, - skill_get_time2(tsc->data[SC_SPLASHER].val2,tsc->data[SC_SPLASHER].val1)); - } } break; @@ -1110,7 +1104,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int skilllv = pc_checkskill(sd, TF_POISON); case TF_POISON: case AS_SPLASHER: - if(!sc_start(bl,SC_POISON,(2*skilllv+10),skilllv,skill_get_time2(skillid,skilllv)) + if(!sc_start(bl,SC_POISON,(4*skilllv+10),skilllv,skill_get_time2(skillid,skilllv)) && sd && skillid==TF_POISON ) clif_skill_fail(sd,skillid,0,0); @@ -5116,7 +5110,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break; case AS_SPLASHER: - if(tstatus->max_hp*3/4 < tstatus->hp) { + if(tstatus->mode&MD_BOSS || tstatus-> hp > tstatus->max_hp*3/4) { + if (sd) clif_skill_fail(sd,skillid,0,0); map_freeblock_unlock(); return 1; } |