|
@@ -2766,7 +2766,7 @@ static struct Damage battle_calc_attack_masteries(struct Damage wd, struct block
|
|
if (skill_id != MC_CARTREVOLUTION && pc_checkskill(sd, BS_HILTBINDING) > 0)
|
|
if (skill_id != MC_CARTREVOLUTION && pc_checkskill(sd, BS_HILTBINDING) > 0)
|
|
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, 4);
|
|
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, 4);
|
|
if (skill_id != CR_SHIELDBOOMERANG)
|
|
if (skill_id != CR_SHIELDBOOMERANG)
|
|
- ATK_ADD2(wd.masteryAtk, wd.masteryAtk2, wd.div_ * sd->right_weapon.star, wd.div_ * sd->left_weapon.star);
|
|
|
|
|
|
+ ATK_ADD2(wd.masteryAtk, wd.masteryAtk2, ((wd.div_ < 1) ? 1 : wd.div_) * sd->right_weapon.star, ((wd.div_ < 1) ? 1 : wd.div_) * sd->left_weapon.star);
|
|
if (skill_id == MO_FINGEROFFENSIVE) {
|
|
if (skill_id == MO_FINGEROFFENSIVE) {
|
|
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, ((wd.div_ < 1) ? 1 : wd.div_) * sd->spiritball_old * 3);
|
|
ATK_ADD(wd.masteryAtk, wd.masteryAtk2, ((wd.div_ < 1) ? 1 : wd.div_) * sd->spiritball_old * 3);
|
|
} else
|
|
} else
|
|
@@ -5218,7 +5218,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
|
|
if (skill_id == TF_POISON)
|
|
if (skill_id == TF_POISON)
|
|
ATK_ADD(wd.damage, wd.damage2, 15 * skill_lv);
|
|
ATK_ADD(wd.damage, wd.damage2, 15 * skill_lv);
|
|
if (skill_id != CR_SHIELDBOOMERANG) //Only Shield boomerang doesn't takes the Star Crumbs bonus.
|
|
if (skill_id != CR_SHIELDBOOMERANG) //Only Shield boomerang doesn't takes the Star Crumbs bonus.
|
|
- ATK_ADD2(wd.damage, wd.damage2, wd.div_ * sd->right_weapon.star, wd.div_ * sd->left_weapon.star);
|
|
|
|
|
|
+ ATK_ADD2(wd.damage, wd.damage2, ((wd.div_ < 1) ? 1 : wd.div_) * sd->right_weapon.star, ((wd.div_ < 1) ? 1 : wd.div_) * sd->left_weapon.star);
|
|
if (skill_id != MC_CARTREVOLUTION && pc_checkskill(sd, BS_HILTBINDING) > 0)
|
|
if (skill_id != MC_CARTREVOLUTION && pc_checkskill(sd, BS_HILTBINDING) > 0)
|
|
ATK_ADD(wd.damage, wd.damage2, 4);
|
|
ATK_ADD(wd.damage, wd.damage2, 4);
|
|
if (skill_id == MO_FINGEROFFENSIVE) { //The finger offensive spheres on moment of attack do count. [Skotlex]
|
|
if (skill_id == MO_FINGEROFFENSIVE) { //The finger offensive spheres on moment of attack do count. [Skotlex]
|