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.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 8140e0bb3..22731f01d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2399,6 +2399,8 @@ static struct Damage battle_calc_mob_weapon_attack(
damage += damage*(2*sc_data[SC_TRUESIGHT].val1)/100;
if(sc_data[SC_BERSERK].timer!=-1) // バーサーク
damage += damage*2;
+ if(sc_data && sc_data[SC_AURABLADE].timer!=-1) //[DracoRPG]
+ damage += sc_data[SC_AURABLADE].val1 * 20;
}
if(skill_num>0){
@@ -2723,8 +2725,8 @@ static struct Damage battle_calc_mob_weapon_attack(
if(skill_num != 0 || s_ele != 0 || !battle_config.mob_attack_attr_none)
damage=battle_attr_fix(damage, s_ele, battle_get_element(target) );
- if(sc_data && sc_data[SC_AURABLADE].timer!=-1) /* オーラブレード 必中 */
- damage += sc_data[SC_AURABLADE].val1 * 10;
+ //if(sc_data && sc_data[SC_AURABLADE].timer!=-1) /* オーラブレード 必中 */
+ // damage += sc_data[SC_AURABLADE].val1 * 10;
if(skill_num==PA_PRESSURE) /* プレッシャー 必中? */
damage = 500+300*skill_lv;
@@ -3096,6 +3098,10 @@ static struct Damage battle_calc_pc_weapon_attack(
damage += damage*2;
damage2 += damage2*2;
}
+ if(sc_data && sc_data[SC_AURABLADE].timer!=-1) { //[DracoRPG]
+ damage += sc_data[SC_AURABLADE].val1 * 20;
+ damage2 += sc_data[SC_AURABLADE].val1 * 20;
+ }
}
if(skill_num>0){
@@ -3785,10 +3791,10 @@ static struct Damage battle_calc_pc_weapon_attack(
damage += sd->spiritball*3;
damage2 += sd->spiritball*3;
- if(sc_data && sc_data[SC_AURABLADE].timer!=-1){ /* オーラブレード 必中 */
- damage += sc_data[SC_AURABLADE].val1 * 10;
- damage2 += sc_data[SC_AURABLADE].val1 * 10;
- }
+ //if(sc_data && sc_data[SC_AURABLADE].timer!=-1){ /* オーラブレード 必中 */
+ // damage += sc_data[SC_AURABLADE].val1 * 10;
+ // damage2 += sc_data[SC_AURABLADE].val1 * 10;
+ //}
if(skill_num==PA_PRESSURE){ /* プレッシャー 必中? */
damage = 500+300*skill_lv;
damage2 = 500+300*skill_lv;