|
@@ -1775,7 +1775,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (sc->data[SC_POISONINGWEAPON] && flag&BF_SHORT && (skill_id == 0 || skill_id == GC_VENOMPRESSURE) && damage > 0) {
|
|
|
+ if (sc->data[SC_POISONINGWEAPON] && flag&BF_SHORT && damage > 0) {
|
|
|
damage += damage * 10 / 100;
|
|
|
if (rnd() % 100 < sc->data[SC_POISONINGWEAPON]->val3)
|
|
|
sc_start4(src, bl, (sc_type)sc->data[SC_POISONINGWEAPON]->val2, 100, sc->data[SC_POISONINGWEAPON]->val1, 0, 1, 0, (sc->data[SC_POISONINGWEAPON]->val2 == SC_VENOMBLEED ? skill_get_time2(GC_POISONINGWEAPON, 1) : skill_get_time2(GC_POISONINGWEAPON, 2)));
|
|
@@ -5546,7 +5546,7 @@ static void battle_attack_sc_bonus(struct Damage* wd, struct block_list *src, st
|
|
|
ATK_ADDRATE(wd->damage, wd->damage2, sc->data[SC_EXEEDBREAK]->val2);
|
|
|
RE_ALLATK_ADDRATE(wd, sc->data[SC_EXEEDBREAK]->val2);
|
|
|
}
|
|
|
- if (sc->data[SC_PYREXIA] && sc->data[SC_PYREXIA]->val3 == 0) {
|
|
|
+ if (sc->data[SC_PYREXIA] && sc->data[SC_PYREXIA]->val3 == 0 && skill_id == 0) {
|
|
|
ATK_ADDRATE(wd->damage, wd->damage2, sc->data[SC_PYREXIA]->val2);
|
|
|
RE_ALLATK_ADDRATE(wd, sc->data[SC_PYREXIA]->val2);
|
|
|
}
|