diff options
author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-22 20:47:10 +0800 |
---|---|---|
committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-22 20:47:10 +0800 |
commit | cd0743985cc0499035d4500209b4af604de2d8be (patch) | |
tree | e4953e8821199191ba051cd9902831ab25ef2949 /src/map/status.c | |
parent | 915365b27f5e35e8957e25d9ea7231ad1c4f8861 (diff) | |
parent | 6165590a1a68653ad1fa3dd14306a2e64dc9c5c9 (diff) | |
download | hercules-cd0743985cc0499035d4500209b4af604de2d8be.tar.gz hercules-cd0743985cc0499035d4500209b4af604de2d8be.tar.bz2 hercules-cd0743985cc0499035d4500209b4af604de2d8be.tar.xz hercules-cd0743985cc0499035d4500209b4af604de2d8be.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
-rw-r--r-- | src/map/status.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index d61503a0e..cf2c096c9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -556,7 +556,7 @@ void initChangeTables(void) { set_sc( RK_MILLENNIUMSHIELD , SC_MILLENNIUMSHIELD , SI_REUSE_MILLENNIUMSHIELD , SCB_NONE ); set_sc( RK_REFRESH , SC_REFRESH , SI_REFRESH , SCB_NONE ); set_sc( RK_GIANTGROWTH , SC_GIANTGROWTH , SI_GIANTGROWTH , SCB_STR ); - set_sc( RK_STONEHARDSKIN , SC_STONEHARDSKIN , SI_STONEHARDSKIN , SCB_NONE ); + set_sc( RK_STONEHARDSKIN , SC_STONEHARDSKIN , SI_STONEHARDSKIN , SCB_DEF|SCB_MDEF ); set_sc( RK_VITALITYACTIVATION, SC_VITALITYACTIVATION, SI_VITALITYACTIVATION, SCB_REGEN ); set_sc( RK_FIGHTINGSPIRIT , SC_FIGHTINGSPIRIT , SI_FIGHTINGSPIRIT , SCB_WATK|SCB_ASPD ); set_sc( RK_ABUNDANCE , SC_ABUNDANCE , SI_ABUNDANCE , SCB_NONE ); @@ -4907,7 +4907,7 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc, def -= 20; if( sc->data[SC_ANGRIFFS_MODUS] ) def -= 30 + 20 * sc->data[SC_ANGRIFFS_MODUS]->val1; - if(sc->data[SC_STONEHARDSKIN])// Final DEF increase divided by 10 since were using classic (pre-renewal) mechanics. [Rytech] + if(sc->data[SC_STONEHARDSKIN]) def += sc->data[SC_STONEHARDSKIN]->val1; if(sc->data[SC_STONE] && sc->opt1 == OPT1_STONE) def >>=1; @@ -5036,7 +5036,7 @@ static defType status_calc_mdef(struct block_list *bl, struct status_change *sc, mdef += (sc->data[SC_ENDURE]->val4 == 0) ? sc->data[SC_ENDURE]->val1 : 1; if(sc->data[SC_CONCENTRATION]) mdef += 1; //Skill info says it adds a fixed 1 Mdef point. - if(sc->data[SC_STONEHARDSKIN])// Final MDEF increase divided by 10 since were using classic (pre-renewal) mechanics. [Rytech] + if(sc->data[SC_STONEHARDSKIN]) mdef += sc->data[SC_STONEHARDSKIN]->val1; if(sc->data[SC_WATER_BARRIER]) mdef += sc->data[SC_WATER_BARRIER]->val2; @@ -8047,6 +8047,10 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val case SC_DEATHBOUND: val2 = 500 + 100 * val1; break; + case SC_STONEHARDSKIN: + if( sd ) + val1 = sd->status.job_level * pc_checkskill(sd, RK_RUNEMASTERY) / 4; //DEF/MDEF Increase + break; case SC_FIGHTINGSPIRIT: val_flag |= 1|2; break; |