diff --git a/src/map/skill.c b/src/map/skill.c index c192dd5924..afc6cd5a86 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13611,42 +13611,42 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns case UNT_ZENKAI_WATER: switch (rnd()%2 + 1) { case 1: - sc_start(ss, bl, SC_FREEZE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start(ss, bl, SC_FREEZE, sg->val1*5, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv)); break; case 2: - sc_start(ss, bl, SC_FREEZING, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start(ss, bl, SC_FREEZING, sg->val1*5, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv)); break; } break; case UNT_ZENKAI_LAND: switch (rnd()%2 + 1) { case 1: - sc_start2(ss, bl, SC_STONE, sg->val1*5, sg->skill_lv, ss->id, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start2(ss, bl, SC_STONE, sg->val1*5, sg->skill_lv, ss->id, skill_get_time(sg->skill_id, sg->skill_lv)); break; case 2: - sc_start2(ss, bl, SC_POISON, sg->val1*5, sg->skill_lv, ss->id, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start2(ss, bl, SC_POISON, sg->val1*5, sg->skill_lv, ss->id, skill_get_time(sg->skill_id, sg->skill_lv)); break; } break; case UNT_ZENKAI_FIRE: - sc_start4(ss, bl, SC_BURNING, sg->val1*5, sg->skill_lv, 1000, ss->id, 0, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start4(ss, bl, SC_BURNING, sg->val1*5, sg->skill_lv, 1000, ss->id, 0, skill_get_time(sg->skill_id, sg->skill_lv)); break; case UNT_ZENKAI_WIND: switch (rnd()%3 + 1) { case 1: - sc_start(ss, bl, SC_SLEEP, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start(ss, bl, SC_SLEEP, sg->val1*5, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv)); break; case 2: - sc_start(ss, bl, SC_SILENCE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start(ss, bl, SC_SILENCE, sg->val1*5, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv)); break; case 3: - sc_start(ss, bl, SC_DEEPSLEEP, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start(ss, bl, SC_DEEPSLEEP, sg->val1*5, sg->skill_lv, skill_get_time(sg->skill_id, sg->skill_lv)); break; } break; } } else - sc_start2(ss, bl,type,100,sg->val1,sg->val2,skill_get_time2(sg->skill_id, sg->skill_lv)); + sc_start2(ss, bl,type,100,sg->val1,sg->val2,skill_get_time(sg->skill_id, sg->skill_lv)); break; case UNT_LAVA_SLIDE: @@ -15897,11 +15897,11 @@ int skill_vfcastfix(struct block_list *bl, double time, uint16 skill_id, uint16 if (sc->data[SC_POEMBRAGI]) reduce_cast_rate += sc->data[SC_POEMBRAGI]->val2; if (sc->data[SC_IZAYOI]) - VARCAST_REDUCTION(-50); + VARCAST_REDUCTION(50); if (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 3 && skill_get_type(skill_id) == BF_MAGIC && skill_get_ele(skill_id, skill_lv) == ELE_WATER) VARCAST_REDUCTION(30); //Reduces 30% Variable Cast Time of magic Water spells. if (sc->data[SC_TELEKINESIS_INTENSE]) - VARCAST_REDUCTION(sc->data[SC_TELEKINESIS_INTENSE]->val4); + VARCAST_REDUCTION(sc->data[SC_TELEKINESIS_INTENSE]->val2); // Multiplicative Fixed CastTime values if (sc->data[SC_SECRAMENT]) fixcast_r = max(fixcast_r, sc->data[SC_SECRAMENT]->val2); diff --git a/src/map/status.c b/src/map/status.c index 16f32df70e..e6186cf2fc 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5624,7 +5624,7 @@ static signed short status_calc_critical(struct block_list *bl, struct status_ch return cap_value(critical,10,SHRT_MAX); if (sc->data[SC_INCCRI]) - critical += sc->data[SC_INCCRI]->val1; + critical += sc->data[SC_INCCRI]->val2; if (sc->data[SC_CRIFOOD]) critical += sc->data[SC_CRIFOOD]->val1; if (sc->data[SC_EXPLOSIONSPIRITS]) @@ -10124,7 +10124,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty val4 = tick / tick_time; break; case SC_TELEKINESIS_INTENSE: - val2 = val4 = 10 * val1; // sp consum / casttime reduc % + val2 = 10 * val1; // sp consum / casttime reduc % val3 = 40 * val1; // magic dmg bonus break; case SC_OFFERTORIUM: