summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index bffbd0684..f1fdf3efa 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2289,9 +2289,6 @@ static struct Damage battle_calc_pc_weapon_attack(
// calculate physical part of damage
damage = damage * skill_lv;
damage2 = damage2 * skill_lv;
- // calculate magic part of damage
- damage3 = skill_lv * status_get_int(src) * 5;
-
flag=(flag&~BF_RANGEMASK)|BF_LONG;
}
break;
@@ -2558,12 +2555,6 @@ static struct Damage battle_calc_pc_weapon_attack(
//カード補正による左手ダメージ増加
//カードによるダメージ増加処理(左手)ここまで
-// -- moonsoul (cardfix for magic damage portion of ASC_BREAKER)
- if(skill_num == ASC_BREAKER) {
- damage3 = damage3 * cardfix / 100;
- dmg_lv = ATK_DEF; // ignores flee [celest]
- }
-
//カードによるダメージ減衰処理ここから
if(tsd){ //対象がPCの場合
cardfix=100;
@@ -2761,14 +2752,6 @@ static struct Damage battle_calc_pc_weapon_attack(
}
}
-
-// -- moonsoul (final combination of phys, mag damage for ASC_BREAKER)
- if(skill_num == ASC_BREAKER) {
- damage3 += rand()%500+500;
- damage += damage3;
-// damage2 += damage3;
- }
-
wd.damage=damage;
wd.damage2=damage2;
wd.type=type;
@@ -3039,6 +3022,10 @@ struct Damage battle_calc_magic_attack(
matk_flag = 0; // don't consider matk and matk2
}
break;
+ case ASC_BREAKER:
+ damage = rand()%500 + 500 + skill_lv * status_get_int(bl) * 5;
+ matk_flag = 0; // don't consider matk and matk2
+ break;
}
}