summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-14 19:39:42 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-14 19:39:42 +0000
commitbe2a001e897947fb0def4443dc7c0967f86574a7 (patch)
treec6486df73c979cc68d0b9cd94da5a3f64c32e770 /src/map/skill.c
parent76c518cd8e0be4c3c6cb3b7e59bc0b5742b1df69 (diff)
downloadhercules-be2a001e897947fb0def4443dc7c0967f86574a7.tar.gz
hercules-be2a001e897947fb0def4443dc7c0967f86574a7.tar.bz2
hercules-be2a001e897947fb0def4443dc7c0967f86574a7.tar.xz
hercules-be2a001e897947fb0def4443dc7c0967f86574a7.zip
Skill updates.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@178 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b1b0ed2fb..433c03a93 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8224,7 +8224,7 @@ int skill_status_change_timer(int tid, unsigned int tick, int id, int data)
else
sc_data[type].timer=add_timer(1000+tick,skill_status_change_timer, bl->id, data );
break;
- case SC_TENSIONRELAX: /* テンションリラックス */
+ case SC_TENSIONRELAX: /* テンションリラックス */
if(sd){ /* SPがあって、HPが?タンでなければ?? */
if( sd->status.sp > 12 && sd->status.max_hp > sd->status.hp ){
/* if(sc_data[type].val2 % (sc_data[type].val1+3) ==0 ){
@@ -8240,6 +8240,25 @@ int skill_status_change_timer(int tid, unsigned int tick, int id, int data)
skill_status_change_end(&sd->bl,SC_TENSIONRELAX,-1);
}
break;
+ case SC_HEADCRUSH: // temporary damage [celest]
+// case SC_BLEEDING:
+ case SC_POISON2:
+ if((--sc_data[type].val3) > 0) {
+ int hp = battle_get_max_hp(bl);
+ if(bl->type == BL_PC) {
+ hp = 3 + hp*3/200;
+ pc_heal((struct map_session_data *)bl,-hp,0);
+ }
+ else if(bl->type == BL_MOB) {
+ struct mob_data *md;
+ if((md=((struct mob_data *)bl)) == NULL)
+ break;
+ hp = 3 + hp/200;
+ md->hp -= hp;
+ }
+ sc_data[type].timer=add_timer(1000+tick,skill_status_change_timer, bl->id, data );
+ }
+ break;
/* 時間切れ無し?? */
case SC_AETERNA: