From e74107ebd2c844d2cb44548b486236ffb1978b1b Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 9 May 2006 00:34:33 +0000 Subject: - Reverted the change that was making ES skills stun the caster always. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6523 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/skill.c | 46 +++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9565a1ba5..0d68285e0 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/05/08 + * Reverted the change that was making ES skills stun the caster always. + [Skotlex] * Removed the fixpos packet which is sent whenever you are hit while moving as Aegis doesn't sends this packet neither. [Skotlex] * ES magic will now put the caster on stun for 0.5 secs regardless of diff --git a/src/map/skill.c b/src/map/skill.c index 67bad2ee1..66c3031bb 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2924,12 +2924,12 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s case SL_STIN: case SL_STUN: case SL_SMA: - if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) + 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); - else - skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag); - status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10); - status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10); + break; + } + skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag); break; /* ‚»‚Ì‘¼ */ @@ -5389,36 +5389,36 @@ 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) + 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); - else - clif_skill_nodamage(src,bl,skillid,skilllv, - sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); - //Stun happens regardless. - status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10); + 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) - )) - clif_skill_fail(sd,skillid,0,0); - else - clif_skill_nodamage(src,bl,skillid,skilllv, - sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); + )) { 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) + 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); - else { - 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)); + break; } - status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10); + 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)); break; // New guild skills [Celest] -- cgit v1.2.3-70-g09d2