diff options
author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
---|---|---|
committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
commit | e9e4993f8b4d0a8e427a369ded2cd0a45322aac3 (patch) | |
tree | 1bee5d628620b20c894567e79fd5cdef1f133282 /src/map/status.c | |
parent | 7f2dbf6889124f31e19074a6bf185a215459e401 (diff) | |
download | hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.gz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.bz2 hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.xz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.zip |
Follow up r16738 MO_ETREMITYFIST renewal behavior.
Fixed bugreport:6580 where SC_MANHOLE targets can use items.
Fixed bugreport:6636 a typo formula in WL_WHITEIMPRISON.
Fixed bugreport:6685 a missing column in skill_cast_db.txt for WL_COMET entry.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16776 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index d6e96e522..585b90fe9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -312,7 +312,10 @@ void initChangeTables(void) { add_sc( MO_BLADESTOP , SC_BLADESTOP_WAIT ); add_sc( MO_BLADESTOP , SC_BLADESTOP ); set_sc( MO_EXPLOSIONSPIRITS , SC_EXPLOSIONSPIRITS, SI_EXPLOSIONSPIRITS, SCB_CRI|SCB_REGEN ); - set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST , SI_EXTREMITYFIST , SCB_REGEN ); + set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST , SI_BLANK , SCB_REGEN ); +#ifdef RENEWAL + set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST2 , SI_EXTREMITYFIST , SCB_NONE ); +#endif add_sc( SA_MAGICROD , SC_MAGICROD ); set_sc( SA_AUTOSPELL , SC_AUTOSPELL , SI_AUTOSPELL , SCB_NONE ); set_sc( SA_FLAMELAUNCHER , SC_FIREWEAPON , SI_FIREWEAPON , SCB_ATK_ELE ); @@ -6079,8 +6082,11 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti rate -= (status_get_lv(bl) / 5 + status->vit / 4 + status->agi / 10)*100; // Lineal Reduction of Rate break; case SC_WHITEIMPRISON: - rate -= (status_get_lv(bl) / 5 + status->vit / 4 + status->agi / 10)*100; - if( tick != 5000) // not applied on caster + if( tick == 5000 ) // 100% on caster + break; + if( bl->type == BL_PC ) + tick -= (status_get_lv(bl) / 5 + status->vit / 4 + status->agi / 10)*100; + else tick -= (status->vit + status->luk) / 20 * 1000; break; case SC_BURNING: |