diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-08 20:53:46 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-08 20:53:46 +0000 |
| commit | f673ec583e417b7df360edd69baf51add58aa36b (patch) | |
| tree | 6a9d75451962d3189da7233cfc17f116dc2b2ed4 /src/map/skill.c | |
| parent | beed8d2c43cd2d0c9426bfd0a7fa4bfbcffe47e2 (diff) | |
| download | hercules-f673ec583e417b7df360edd69baf51add58aa36b.tar.gz hercules-f673ec583e417b7df360edd69baf51add58aa36b.tar.bz2 hercules-f673ec583e417b7df360edd69baf51add58aa36b.tar.xz hercules-f673ec583e417b7df360edd69baf51add58aa36b.zip | |
- ES magic will now put the caster on stun for 0.5 secs regardless of whether the skill-target is a mob or not.
- Added function clif_party_join_info which sends packet 0x1e9 each time a party-member joins. This packet (as redundant info as it has) should also contain the field for "adoptability", but that needs to be coded in yet.
- Added clif_ParseAdoptRequest which does the basic adoption handling. More checks and the reply packets still need to be coded in.
- Happy State and TK stances won't dispel on death now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6521 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -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 1883691a0..534b5f305 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) {
- status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+ if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
clif_skill_fail(sd,skillid,0,0);
- break;
- }
- skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag);
+ 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;
/* ‚»‚Ì‘¼ */
@@ -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) {
- status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+ if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
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)));
+ 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;
+
case SL_SWOO:
if (sd && (
(!battle_config.allow_es_magic_pc && bl->type != BL_MOB) ||
(tsc && tsc->data[type].timer != -1)
- )) {
- 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)));
+ 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);
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);
+ if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
clif_skill_fail(sd,skillid,0,0);
- break;
+ 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));
}
- 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));
+ status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
break;
// New guild skills [Celest]
|