diff options
author | Michieru <michieru@0-mail.com> | 2014-03-04 14:12:57 -0800 |
---|---|---|
committer | Michieru <michieru@0-mail.com> | 2014-03-04 14:12:57 -0800 |
commit | d554d61417a6e7f48de96efcc69872e0b7b65da3 (patch) | |
tree | a2ec477e900229cdb43eb8fbb3a79866bde6466b /src/map/status.c | |
parent | 15a4395a2f2de8629a21b08ac6b9ec363ad94de3 (diff) | |
download | hercules-d554d61417a6e7f48de96efcc69872e0b7b65da3.tar.gz hercules-d554d61417a6e7f48de96efcc69872e0b7b65da3.tar.bz2 hercules-d554d61417a6e7f48de96efcc69872e0b7b65da3.tar.xz hercules-d554d61417a6e7f48de96efcc69872e0b7b65da3.zip |
Fix bug 8036
http://hercules.ws/board/tracker/issue-8036-gate-of-hell-over-powered/
Fix bug 7074
http://hercules.ws/board/tracker/issue-7074-suragoh-issues/
Fix bug 6866
http://hercules.ws/board/tracker/issue-6866-gate-of-hell/?gopid=15411#entry15411
Remove cast, after cast and cool down of All Odin Power as aegis info.
All Odin Power is now watk and it's show the matk in the status window.
http://hercules.ws/board/tracker/issue-7715-odins-power-lvl-2/
Fix Insignia consume the item correctly and can't be cast on Land Protector.
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index 6b8282a4e..5dcf35198 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -445,7 +445,7 @@ void initChangeTables(void) { set_sc( CASH_ASSUMPTIO , SC_ASSUMPTIO , SI_ASSUMPTIO , SCB_NONE ); set_sc( ALL_PARTYFLEE , SC_PARTYFLEE , SI_PARTYFLEE , SCB_NONE ); - set_sc( ALL_ODINS_POWER , SC_ODINS_POWER , SI_ODINS_POWER , SCB_MATK|SCB_BATK|SCB_MDEF|SCB_DEF ); + set_sc( ALL_ODINS_POWER , SC_ODINS_POWER , SI_ODINS_POWER , SCB_WATK | SCB_MATK | SCB_MDEF | SCB_DEF); set_sc( CR_SHRINK , SC_CR_SHRINK , SI_CR_SHRINK , SCB_NONE ); set_sc( RG_CLOSECONFINE , SC_RG_CCONFINE_S , SI_RG_CCONFINE_S , SCB_NONE ); @@ -4510,8 +4510,6 @@ unsigned short status_calc_batk(struct block_list *bl, struct status_change *sc, batk += batk / 5; if(sc->data[SC_FULL_SWING_K]) batk += sc->data[SC_FULL_SWING_K]->val1; - if(sc->data[SC_ODINS_POWER]) - batk += 40 + 30 * sc->data[SC_ODINS_POWER]->val1; if(sc->data[SC_VOLCANIC_ASH] && (bl->type==BL_MOB)){ if(status_get_element(bl) == ELE_WATER) //water type batk /= 2; @@ -4628,6 +4626,8 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc, watk -= watk * sc->data[SC__ENERVATION]->val2 / 100; if(sc->data[SC_RUSH_WINDMILL]) watk += sc->data[SC_RUSH_WINDMILL]->val2; + if (sc->data[SC_ODINS_POWER]) + watk += 40 + 30 * sc->data[SC_ODINS_POWER]->val1; if((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 2) || (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 2) || (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 2) |