summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-14 16:15:17 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-14 16:15:17 +0000
commit5ccb3f48c51beb25cf12898693c06af518de89f1 (patch)
treea503b5d23c88dbfe2d2cea601a0b1b19f05f3550 /src/map/battle.h
parente9c2b4fc0618a71b1560c635a8bfc7f9e773b097 (diff)
downloadhercules-5ccb3f48c51beb25cf12898693c06af518de89f1.tar.gz
hercules-5ccb3f48c51beb25cf12898693c06af518de89f1.tar.bz2
hercules-5ccb3f48c51beb25cf12898693c06af518de89f1.tar.xz
hercules-5ccb3f48c51beb25cf12898693c06af518de89f1.zip
* More logical modifications on skill_additional_effect thing. Thanks to ultramage.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13771 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 951f32d8d..692fcc0a8 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -9,6 +9,8 @@ typedef enum damage_lv {
ATK_NONE, // not an attack
ATK_LUCKY, // attack was lucky-dodged
ATK_FLEE, // attack was dodged
+ ATK_MISS, // attack missed because of element/race modifier.
+ ATK_BLOCK, // attack was blocked by some skills.
ATK_DEF // attack connected
} damage_lv;
@@ -41,7 +43,7 @@ int battle_attr_ratio(int atk_elem,int def_type, int def_lv);
int battle_attr_fix(struct block_list *src, struct block_list *target, int damage,int atk_elem,int def_type, int def_lv);
// ダメージ最終計算
-int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);
+int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damage *d,int damage,int skill_num,int skill_lv);
int battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);
int battle_calc_bg_damage(struct block_list *src,struct block_list *bl,int damage,int div_,int skill_num,int skill_lv,int flag);