diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:39:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 16:39:14 +0000 |
| commit | 8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd (patch) | |
| tree | 807e224c5b1bbd45909bbeb15ebcf6a318b3d47a /src/map/status.c | |
| parent | 41f1a34c8593a40b4c5dc4178d7138e7e166eea0 (diff) | |
| download | hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.gz hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.bz2 hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.tar.xz hercules-8f40fa6af0e9e18b0fd48fc3da35f3de0b9ce5bd.zip | |
- Added BL_HOM handling to battle_gettarget.
- Some cleaning in skill.c in regard to homun skills.
- Madness Canceller now stacks with other aspd bonuses, just like Berserk does.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8403 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index ec18d8569..71fc5dc62 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3587,9 +3587,6 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change * if(sc->data[SC_STAR_COMFORT].timer!=-1) max = sc->data[SC_STAR_COMFORT].val2; - if(sc->data[SC_MADNESSCANCEL].timer!=-1 && max < 200) - max = 200; - if(sc->data[SC_TWOHANDQUICKEN].timer!=-1 && max < sc->data[SC_TWOHANDQUICKEN].val2) max = sc->data[SC_TWOHANDQUICKEN].val2; @@ -3639,8 +3636,11 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change * } aspd_rate -= max; + //These stack with the rest of bonuses. if(sc->data[SC_BERSERK].timer!=-1) - aspd_rate -= 300; //Stacks with the rest of bonuses. + aspd_rate -= 300; + else if(sc->data[SC_MADNESSCANCEL].timer!=-1) + aspd_rate -= 200; } if(sc->data[i=SC_ASPDPOTION3].timer!=-1 || sc->data[i=SC_ASPDPOTION2].timer!=-1 || |