diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-02 11:52:46 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-02 11:52:46 +0000 |
| commit | afa1863b80369377674c1f9b83b5151e51e070f3 (patch) | |
| tree | 67ff4192c50fb932415033ee97806a1dbbcf5aa5 /src/map/status.c | |
| parent | 783ff0464941dbd3172b77afba62f3e493733480 (diff) | |
| download | hercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.gz hercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.bz2 hercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.xz hercules-afa1863b80369377674c1f9b83b5151e51e070f3.zip | |
Fixed bugreport:6839 where SC_CAMOUFLAGE is not ending properly.
Fixed bugreport:6710 where SR_EARTHSHAKER ATK bonus is not applied properly.
Implemented KO_MAKIBISHI and updated some Kagerou/Oboro skills.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16857 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c index e8bc3bc5e..b42e1b3a1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -714,7 +714,7 @@ void initChangeTables(void) { set_sc( EL_ROCK_CRUSHER_ATK, SC_ROCK_CRUSHER_ATK , SI_ROCK_CRUSHER_ATK , SCB_SPEED ); add_sc( KO_YAMIKUMO , SC_HIDING ); - set_sc( KO_JYUMONJIKIRI , SC_JYUMONJIKIRI , SI_KO_JYUMONJIKIRI , SCB_NONE ); + set_sc_with_vfx( KO_JYUMONJIKIRI , SC_JYUMONJIKIRI , SI_KO_JYUMONJIKIRI , SCB_NONE ); add_sc( KO_MAKIBISHI , SC_STUN ); set_sc( KO_MEIKYOUSISUI , SC_MEIKYOUSISUI , SI_MEIKYOUSISUI , SCB_NONE ); set_sc( KO_KYOUGAKU , SC_KYOUGAKU , SI_KYOUGAKU , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); @@ -1004,6 +1004,7 @@ void initChangeTables(void) { StatusChangeStateTable[SC_CAMOUFLAGE] |= SCS_NOMOVE|SCS_NOMOVECOND; StatusChangeStateTable[SC_MEIKYOUSISUI] |= SCS_NOMOVE; StatusChangeStateTable[SC_KAGEHUMI] |= SCS_NOMOVE; + StatusChangeStateTable[SC_KYOUGAKU] |= SCS_NOMOVE; /* StatusChangeState (SCS_) NOPICKUPITEMS */ StatusChangeStateTable[SC_HIDING] |= SCS_NOPICKITEM; @@ -8317,7 +8318,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val break; case SC_KYOUGAKU: val2 = 2*val1 + rand()%val1; - clif_status_change(bl,SI_ACTIVE_MONSTER_TRANSFORM,1,0,1002,0,0); // Temporarily shows Poring need official [malufett] + clif_status_change(bl,SI_ACTIVE_MONSTER_TRANSFORM,1,0,1002,0,0); break; case SC_KAGEMUSYA: val3 = val1 * 2; @@ -8326,13 +8327,29 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val tick_time = 1000; break; case SC_ZANGETSU: - val2 = status_get_lv(bl) / 2 + 50; + if( (status_get_hp(bl)+status_get_sp(bl)) % 2 == 0) + val2 = status_get_lv(bl) / 2 + 50; + else + val2 -= 50; break; case SC_GENSOU: - if( rand()%100 < 50) // needs more info - status_zap(bl, 500, 500); - else - status_heal(bl, 500, 500, 0); + { + int hp = status_get_hp(bl), lv = 5; + short per = 100 / (status_get_max_hp(bl) / hp); + + if( per <= 15 ) + lv = 1; + else if( per <= 30 ) + lv = 2; + else if( per <= 50 ) + lv = 3; + else if( per <= 75 ) + lv = 4; + if( hp % 2 == 0) + status_heal(bl, hp * (6-lv) * 4 / 100, status_get_sp(bl) * (6-lv) * 3 / 100, 1); + else + status_zap(bl, hp * (lv*4) / 100, status_get_sp(bl) * (lv*3) / 100); + } break; default: if( calc_flag == SCB_NONE && StatusSkillChangeTable[type] == 0 && StatusIconChangeTable[type] == 0 ) @@ -8389,6 +8406,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val case SC_FEAR: case SC_NETHERWORLD: case SC_MEIKYOUSISUI: + case SC_KYOUGAKU: unit_stop_walking(bl,1); break; case SC_HIDING: |