summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-01-31 14:44:39 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-01-31 14:44:39 +0000
commit78dc57282718e52985aac7b569e705200b64bd80 (patch)
tree306247eac9ce53bf92ed82827bc44415abacab5b /src/map/status.c
parentf4d04712b8383d5540f3178320af47de5486786b (diff)
downloadhercules-78dc57282718e52985aac7b569e705200b64bd80.tar.gz
hercules-78dc57282718e52985aac7b569e705200b64bd80.tar.bz2
hercules-78dc57282718e52985aac7b569e705200b64bd80.tar.xz
hercules-78dc57282718e52985aac7b569e705200b64bd80.zip
- Fixed being able to Encore skills you no longer have in your tree.
- Added no HP regen while Bleeding, -25% ATK and ASPD penalties as well. - Added VIT reduces duration of confusion. - Added MSC_SPAWN "onspawn" mob skill condition. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5136 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 88e13fedf..a407f86f8 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2114,6 +2114,8 @@ int status_calc_batk(struct block_list *bl, int batk)
batk -= batk * 25/100;
if(sc_data[SC_CURSE].timer!=-1)
batk -= batk * 25/100;
+ if(sc_data[SC_BLEEDING].timer != -1)
+ batk -= batk * 25/100;
}
return batk;
@@ -2475,6 +2477,8 @@ int status_calc_aspd_rate(struct block_list *bl, int aspd_rate)
aspd_rate += 25;
if(sc_data[SC_GRAVITATION].timer!=-1)
aspd_rate += sc_data[SC_GRAVITATION].val2;
+ if(sc_data[SC_BLEEDING].timer != -1)
+ aspd_rate += 25;
if(sc_data[SC_JOINTBEAT].timer!=-1) {
if (sc_data[SC_JOINTBEAT].val2 == 1)
aspd_rate += 25;
@@ -4258,6 +4262,10 @@ int status_change_start(struct block_list *bl,int type,int val1,int val2,int val
}
break;
case SC_CONFUSION:
+ if(!(flag&2)) {
+ int sc_def = 100 - status_get_vit(bl);
+ tick = tick * sc_def / 100;
+ }
clif_emotion(bl,1);
break;
case SC_BLIND: /* ˆÃ? */