summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-26 10:02:29 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-26 10:02:29 +0000
commitb064f50c5c54c66cd8e91e75f000a8caa14968d6 (patch)
tree7dcd12076e63e3e2dbe02a504ac1724289af3f23 /src/map/battle.c
parent91b84dacf6e1376e097cff7c7eff697d21bf1c62 (diff)
downloadhercules-b064f50c5c54c66cd8e91e75f000a8caa14968d6.tar.gz
hercules-b064f50c5c54c66cd8e91e75f000a8caa14968d6.tar.bz2
hercules-b064f50c5c54c66cd8e91e75f000a8caa14968d6.tar.xz
hercules-b064f50c5c54c66cd8e91e75f000a8caa14968d6.zip
Finished Full Strip, Weapon Refine, Slim Pitcher and Full Protection
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@369 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 22731f01d..24547762d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3562,21 +3562,13 @@ static struct Damage battle_calc_pc_weapon_attack(
}
// 状態異常中のダメージ追加でクリティカルにも有効なスキル
-
if (sc_data) {
-
// エンチャントデッドリーポイズン
-
if(sc_data[SC_EDP].timer != -1) {
-
damage += damage * (150 + sc_data[SC_EDP].val1 * 50) / 100;
-
damage2 += damage2 * (150 + sc_data[SC_EDP].val1 * 50) / 100;
-
no_cardfix = 1;
-
}
-
}
// 精錬ダメージの追加
@@ -4500,9 +4492,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
}
if(battle_check_target(src,target,BCT_ENEMY) <= 0 &&
-
!battle_check_range(src,target,0))
-
return 0; // 攻撃対象外
race = battle_get_race(target);