diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-09 00:34:33 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-09 00:34:33 +0000 |
| commit | e74107ebd2c844d2cb44548b486236ffb1978b1b (patch) | |
| tree | bac9774dc4ed8d0cc89b12be0f35755ef6a989b3 /src/map | |
| parent | d6f412e47f44df59adb315665bae64c22cf64bb0 (diff) | |
| download | hercules-e74107ebd2c844d2cb44548b486236ffb1978b1b.tar.gz hercules-e74107ebd2c844d2cb44548b486236ffb1978b1b.tar.bz2 hercules-e74107ebd2c844d2cb44548b486236ffb1978b1b.tar.xz hercules-e74107ebd2c844d2cb44548b486236ffb1978b1b.zip | |
- 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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 46 |
1 files changed, 23 insertions, 23 deletions
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]
|