summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-30 19:32:53 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-30 19:32:53 +0000
commit4362a0c677113465c450da34148e10676c32298f (patch)
treec9e47cfde4580eb0c27037c65a9cebc2b9af9aec /src/map/status.c
parent1dc97e8a346414a600bedc25969d5ae21c28f401 (diff)
downloadhercules-4362a0c677113465c450da34148e10676c32298f.tar.gz
hercules-4362a0c677113465c450da34148e10676c32298f.tar.bz2
hercules-4362a0c677113465c450da34148e10676c32298f.tar.xz
hercules-4362a0c677113465c450da34148e10676c32298f.zip
Merged mpeg's fix on ninja skills and SA_VOLCANO,SA_DELUGE,SA_VIOLENTGALE
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7983 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c
index b5298b92e..f572b6fe8 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2967,7 +2967,7 @@ static unsigned short status_calc_agi(struct block_list *bl, struct status_chang
agi -= 2 + sc->data[SC_DECREASEAGI].val1;
if(sc->data[SC_QUAGMIRE].timer!=-1)
agi -= sc->data[SC_QUAGMIRE].val2;
- if(sc->data[SC_SUITON].timer!=-1)
+ if(sc->data[SC_SUITON].timer!=-1 && sc->data[SC_SUITON].val3) // does not affect players when not in PVP nor WoE. Does not affect Ninjas.
agi -= sc->data[SC_SUITON].val2;
if(sc->data[SC_MARIONETTE].timer!=-1)
agi -= (sc->data[SC_MARIONETTE].val3>>8)&0xFF;
@@ -4765,8 +4765,12 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
val2 = 0; //Agi penalty
val3 = 0; //Walk speed penalty
val4 = 2*val1; //NJ_HYOUSENSOU damage bonus.
- if (status_get_class(bl) != JOB_NINJA && !map_flag_vs(bl->m)) {
+
+ if (status_get_class(bl) == JOB_NINJA || ( bl->type == BL_PC && !map_flag_vs(bl->m)) )
+ break;
+ else {
val3 = 50;
+
switch ((val1+1)/3) {
case 3:
val2 = 8;
@@ -4784,7 +4788,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
val2 = 3*((val1+1)/3);
break;
}
- };
+ }
break;
case SC_ONEHAND:
case SC_TWOHANDQUICKEN: