From 07ff4adffb312e138502a83316dff13287a8d153 Mon Sep 17 00:00:00 2001 From: glighta Date: Mon, 29 Oct 2012 06:33:43 +0000 Subject: -Add some src basic documentation. -Change some remaining -1 for status ending timer. -Move some hardcoded msg in msg_athena -Small optimisation on battle_attr_fix git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16835 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/map/battle.h') diff --git a/src/map/battle.h b/src/map/battle.h index a67fd15f5..28e6176ec 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -14,24 +14,24 @@ typedef enum damage_lv { ATK_DEF // attack connected } damage_lv; -// ダメージ +// dammage structure struct Damage { - int damage,damage2; - int type,div_; + int damage,damage2; //right, left dmg + int type,div_; //chk clif_damage for type @TODO add an enum ? ; nb of hit int amotion,dmotion; - int blewcount; - int flag; + int blewcount; //nb of knockback + int flag; //chk BF_* flag, (enum below) enum damage_lv dmg_lv; //ATK_LUCKY,ATK_FLEE,ATK_DEF }; -// 属性表（読み込みはpc.c、battle_attr_fixで使用） +//(Used in read pc.c,) attribute table (battle_attr_fix) extern int attr_fix_table[4][10][10]; struct map_session_data; struct mob_data; struct block_list; -// ダメージ計算 +// Damage Calculation struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int count); @@ -42,12 +42,12 @@ void battle_drain(struct map_session_data *sd, struct block_list *tbl, int rdama 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); -// ダメージ最終計算 +// Final calculation Damage 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); -enum { // 最終計算のフラグ +enum { // Flag of the final calculation BF_WEAPON = 0x0001, BF_MAGIC = 0x0002, BF_MISC = 0x0004, @@ -62,10 +62,10 @@ enum { // int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, struct block_list *target, int attack_type, int skill_id, int skill_lv, int damage, enum damage_lv dmg_lv, int ddelay); -// 通常攻撃処理まとめ +// Summary normal attack treatment (basic attack) enum damage_lv battle_weapon_attack( struct block_list *bl,struct block_list *target,unsigned int tick,int flag); -// 各種パラメータを得る +// Accessors struct block_list* battle_get_master(struct block_list *src); struct block_list* battle_gettargeted(struct block_list *target); struct block_list* battle_getenemy(struct block_list *target, int type, int range); @@ -93,7 +93,7 @@ int battle_check_target(struct block_list *src, struct block_list *target,int fl bool battle_check_range(struct block_list *src,struct block_list *bl,int range); void battle_consume_ammo(struct map_session_data* sd, int skill, int lv); -// 設定 +// Settings #define MIN_HAIR_STYLE battle_config.min_hair_style #define MAX_HAIR_STYLE battle_config.max_hair_style -- cgit v1.2.3-60-g2f50