summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 19:21:27 +0000
committerVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 19:21:27 +0000
commit148161601425b067ec57ab6e035effa6928bb26e (patch)
treeb7aa6d9bd05aab6c78650285d3287b3811e65bb1 /src
parent32645379b64e7dcad23574c0562c61f7416ebce4 (diff)
downloadhercules-148161601425b067ec57ab6e035effa6928bb26e.tar.gz
hercules-148161601425b067ec57ab6e035effa6928bb26e.tar.bz2
hercules-148161601425b067ec57ab6e035effa6928bb26e.tar.xz
hercules-148161601425b067ec57ab6e035effa6928bb26e.zip
jA's db work
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5775 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c4
-rw-r--r--src/map/status.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 87f24d82a..ba460087e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1708,6 +1708,8 @@ int status_calc_str(struct block_list *bl, int str)
str >>= 1;
else str += sc->data[SC_BLESSING].val1;
}
+ if(sc->data[SC_NEN].timer!=-1)
+ str += sc->data[SC_NEN].val1;
}
return str;
@@ -1788,6 +1790,8 @@ int status_calc_int(struct block_list *bl, int int_)
}
if(sc->data[SC_STRIPHELM].timer!=-1 && bl->type != BL_PC)
int_ -= int_ * 8*sc->data[SC_STRIPHELM].val1/100;
+ if(sc->data[SC_NEN].timer!=-1)
+ int_ += sc->data[SC_NEN].val1;
}
return int_;
diff --git a/src/map/status.h b/src/map/status.h
index 6501b0a9f..896e64735 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -542,7 +542,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
#define MAX_REFINE 10
extern int percentrefinery[5][MAX_REFINE+1]; //The last slot always has a 0% success chance [Skotlex]
-#define MAX_WEAPON_TYPE 21
+#define MAX_WEAPON_TYPE 22
int status_readdb(void);
int do_init_status(void);