diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-11 14:14:32 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-11 14:14:32 +0000 |
| commit | 7eaf99edd466011a1ac3c909157b0422120cae4e (patch) | |
| tree | 106d9c2e4a075c5ac1d4e4d25fbf6a6a65ba13b0 /src | |
| parent | 0fa978f156779e2f8f8d7e7b0f04d3973ab97c0a (diff) | |
| download | hercules-7eaf99edd466011a1ac3c909157b0422120cae4e.tar.gz hercules-7eaf99edd466011a1ac3c909157b0422120cae4e.tar.bz2 hercules-7eaf99edd466011a1ac3c909157b0422120cae4e.tar.xz hercules-7eaf99edd466011a1ac3c909157b0422120cae4e.zip | |
- Merged the code for Ska, Ske, Swoo. Swoo stun duration is now 10 secs (reducable) if you target a mob that already has Swoo active.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6555 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/skill.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 4e7449185..c72eccfd6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5362,36 +5362,23 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break;
case SL_SKA: // [marquis007]
- if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
- status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
- clif_skill_fail(sd,skillid,0,0);
- break;
- }
- clif_skill_nodamage(src,bl,skillid,skilllv,
- sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
- break;
case SL_SWOO:
- if (sd && (
- (!battle_config.allow_es_magic_pc && bl->type != BL_MOB) ||
- (tsc && tsc->data[type].timer != -1)
- )) {
+ case SL_SKE:
+ if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
clif_skill_fail(sd,skillid,0,0);
break;
}
- clif_skill_nodamage(src,bl,skillid,skilllv,
- sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
- break;
- case SL_SKE:
- if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
- status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
- clif_skill_fail(sd,skillid,0,0);
+ if (skillid == SL_SWOO && tsc && tsc->data[type].timer != -1) {
+ sc_start(src,SC_STUN,100,skilllv,10000);
break;
}
clif_skill_nodamage(src,bl,skillid,skilllv,
sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
- sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
+
+ if (skillid == SL_SKE)
+ sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
break;
// New guild skills [Celest]
|