From 5ccb3f48c51beb25cf12898693c06af518de89f1 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Thu, 14 May 2009 16:15:17 +0000 Subject: * 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 --- src/map/battle.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/battle.h') 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); -- cgit v1.2.3-70-g09d2