summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 19:37:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-08 19:37:56 +0000
commitbdc2958ced13d80122b040ab357fd002d5c0e550 (patch)
treed133c73651e4ac575964c91496ebe13ea631fc0a /src/map/status.c
parent7a308b07b92f9aa82b0e3d8dc987d69f3535b7e2 (diff)
downloadhercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.gz
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.bz2
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.tar.xz
hercules-bdc2958ced13d80122b040ab357fd002d5c0e550.zip
- Unified the rest and ganstar paradise code into a single function.
- Moved the Happy State trigger to the regen function, it now triggers at the same time the SPTIME does. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8681 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index eeb73c0df..39530e5d5 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1162,7 +1162,6 @@ int status_check_visibility(struct block_list *src, struct block_list *target)
}
void status_calc_bl(struct block_list *bl, unsigned long flag);
-void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen);
static int status_base_atk(struct block_list *bl, struct status_data *status)
{
@@ -7009,6 +7008,9 @@ static int status_natural_heal(DBKey key,void * data,va_list app)
if (sd && sd->state.doridori) {
val*=2;
sd->state.doridori = 0;
+ if ((rate = pc_checkskill(sd,TK_SPTIME)))
+ sc_start(bl,SkillStatusChangeTable(TK_SPTIME),
+ 100,rate,skill_get_time(TK_SPTIME, rate));
if (
(sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR &&
rand()%10000 < battle_config.sg_angel_skill_ratio