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/skill.h | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'src/map/skill.h') diff --git a/src/map/skill.h b/src/map/skill.h index 509c53bdb..5225afb77 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -87,7 +87,8 @@ struct skill_condition { int itemid[MAX_SKILL_ITEM_REQUIRE],amount[MAX_SKILL_ITEM_REQUIRE]; }; -// スキルデ?タベ?ス +// Database skills + struct s_skill_db { char name[NAME_LENGTH]; char desc[40]; @@ -116,7 +117,7 @@ struct s_skill_db { extern struct s_skill_db skill_db[MAX_SKILL_DB]; #define MAX_SKILL_UNIT_LAYOUT 50 -#define MAX_SQUARE_LAYOUT 5 // 11*11のユニット配置が最大 +#define MAX_SQUARE_LAYOUT 5 // 11*11 Placement of a maximum unit #define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1)) struct s_skill_unit_layout { int count; @@ -195,7 +196,8 @@ enum { UF_DUALMODE = 0x0800, // Spells should trigger both ontimer and onplace/onout/onleft effects. }; -// アイテム作成デ?タベ?ス +// Create Database item + struct s_skill_produce_db { int nameid, trigger; int req_skill,req_skill_lv,itemlv; @@ -203,14 +205,16 @@ struct s_skill_produce_db { }; extern struct s_skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB]; -// 矢作成デ?タベ?ス +// Creating database arrow + struct s_skill_arrow_db { int nameid, trigger; int cre_id[MAX_ARROW_RESOURCE],cre_amount[MAX_ARROW_RESOURCE]; }; extern struct s_skill_arrow_db skill_arrow_db[MAX_SKILL_ARROW_DB]; -// アブラカダブラデ?タベ?ス +// Abracadabra database + struct s_skill_abra_db { int skillid; int req_lv; @@ -227,7 +231,8 @@ int do_final_skill(void); //Returns the cast type of the skill: ground cast, castend damage, castend no damage enum { CAST_GROUND, CAST_DAMAGE, CAST_NODAMAGE }; int skill_get_casttype(int id); //[Skotlex] -// スキルデ?タベ?スへのアクセサ + +// Accessor to the skills database // int skill_get_index( int id ); int skill_get_type( int id ); @@ -277,13 +282,13 @@ int skill_castend_map( struct map_session_data *sd,short skill_num, const char * int skill_cleartimerskill(struct block_list *src); int skill_addtimerskill(struct block_list *src,unsigned int tick,int target,int x,int y,int skill_id,int skill_lv,int type,int flag); -// 追加?果 +// Results? Added int skill_additional_effect( struct block_list* src, struct block_list *bl,int skillid,int skilllv,int attack_type,int dmg_lv,unsigned int tick); int skill_counter_additional_effect( struct block_list* src, struct block_list *bl,int skillid,int skilllv,int attack_type,unsigned int tick); int skill_blown(struct block_list* src, struct block_list* target, int count, int direction, int flag); int skill_break_equip(struct block_list *bl, unsigned short where, int rate, int flag); int skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int lv, int time); -// ユニットスキル +// Skills unit struct skill_unit_group* skill_id2group(int group_id); struct skill_unit_group *skill_unitsetting(struct block_list* src, short skillid, short skilllv, short x, short y, int flag); struct skill_unit *skill_initunit (struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); @@ -321,7 +326,7 @@ struct skill_unit_group *skill_check_dancing( struct block_list *src ); // Guild skills [celest] int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex); -// 詠唱キャンセル +// Chant canceled int skill_castcancel(struct block_list *bl,int type); int skill_sit (struct map_session_data *sd, int type); @@ -335,7 +340,7 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, int skill bool skill_check_cloaking(struct block_list *bl, struct status_change_entry *sce); -// ステ?タス異常 +// Abnormal status int skill_enchant_elemental_end(struct block_list *bl, int type); int skillnotok(int skillid, struct map_session_data *sd); int skillnotok_hom(int skillid, struct homun_data *hd); @@ -343,13 +348,13 @@ int skillnotok_mercenary(int skillid, struct mercenary_data *md); int skill_chastle_mob_changetarget(struct block_list *bl,va_list ap); -// アイテム作成 +// Item creation int skill_can_produce_mix( struct map_session_data *sd, int nameid, int trigger, int qty); int skill_produce_mix( struct map_session_data *sd, int skill_id, int nameid, int slot1, int slot2, int slot3, int qty ); int skill_arrow_create( struct map_session_data *sd,int nameid); -// mobスキルのため +// skills for the mob int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag ); int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag ); int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skilllv,unsigned int tick,int flag); @@ -365,7 +370,7 @@ int skill_blockmerc_start (struct mercenary_data*,int,int); ((id) >= BD_ADAPTATION && (id) <= DC_SERVICEFORYOU) || ((id) >= CG_ARROWVULCAN && (id) <= CG_MARIONETTE) || \ ((id) >= CG_LONGINGFREEDOM && (id) <= CG_TAROTCARD) || ((id) >= WA_SWING_DANCE && (id) <= WM_UNLIMITED_HUMMING_VOICE)) -// スキル攻?一括?理 +// Skill action, (return dmg,heal) int skill_attack( int attack_type, struct block_list* src, struct block_list *dsrc,struct block_list *bl,int skillid,int skilllv,unsigned int tick,int flag ); void skill_reload(void); -- cgit v1.2.3-70-g09d2