diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-20 20:26:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-20 20:26:37 +0000 |
| commit | 3f1dbbacb312efa167d4239f99e8ca3d06dd2632 (patch) | |
| tree | eb0fea83624b662faf9a4446149a0c54ea4f647a /src/map/status.c | |
| parent | 924eceea21e4e355be7227a3ef4c366ddbcb9748 (diff) | |
| download | hercules-3f1dbbacb312efa167d4239f99e8ca3d06dd2632.tar.gz hercules-3f1dbbacb312efa167d4239f99e8ca3d06dd2632.tar.bz2 hercules-3f1dbbacb312efa167d4239f99e8ca3d06dd2632.tar.xz hercules-3f1dbbacb312efa167d4239f99e8ca3d06dd2632.zip | |
- Added a pc_stop_attack() invokation when starting SC_XMAS/SC_WEDDING.
- Increased the SC_WEDDING walk delay to double walk delay, instead of increasing it by 50%
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5686 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 28f81f347..82a724b3b 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2142,6 +2142,8 @@ int status_calc_speed(struct block_list *bl, int speed) speed += 450;
if(sc->data[SC_SWOO].timer != -1) // [marquis007]
speed += 450; //Let's use Curse's slow down momentarily (exact value unknown)
+ if(sc->data[SC_WEDDING].timer!=-1)
+ speed += speed;
if(sc->data[SC_SPEEDUP1].timer!=-1)
speed -= speed*50/100;
else if(sc->data[SC_SPEEDUP0].timer!=-1)
@@ -2154,8 +2156,6 @@ int status_calc_speed(struct block_list *bl, int speed) speed -= speed * 20/100;
else if(sc->data[SC_WINDWALK].timer!=-1)
speed -= speed * 4*sc->data[SC_WINDWALK].val2/100;
- if(sc->data[SC_WEDDING].timer!=-1)
- speed += speed * 50/100;
if(sc->data[SC_SLOWDOWN].timer!=-1)
speed += speed * 50/100;
if(sc->data[SC_DECREASEAGI].timer!=-1)
@@ -3973,6 +3973,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_WEDDING: //結婚用(結婚衣裳になって?くのが?いとか)
if (sd)
{ //Change look.
+ pc_stopattack(sd);
if(type==SC_WEDDING)
sd->view_class = JOB_WEDDING;
else if(type==SC_XMAS)
|