diff options
author | Haru <haru@dotalux.com> | 2014-11-16 06:35:51 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2014-11-16 07:16:23 +0100 |
commit | 02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f (patch) | |
tree | 3161fd5786bb563c32059068eb3b4876d2ae11ca /src/map/battle.h | |
parent | 31bff051ee3c353fb7ee5e544d68feeaefd4941f (diff) | |
download | hercules-02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f.tar.gz hercules-02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f.tar.bz2 hercules-02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f.tar.xz hercules-02fcaed6bd32b0ffbc4f03b8f9de6f0720e6253f.zip |
Whitespace cleanup (no code changes)
This includes, and is not limited to: mixed or wrong indentation, excess
whitespace (horizontal and vertical), misalignment, trailing spaces.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.h')
-rw-r--r-- | src/map/battle.h | 161 |
1 files changed, 81 insertions, 80 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index c44e3e19d..ad879bd1a 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -28,23 +28,24 @@ struct status_data; #define MIN_CLOTH_COLOR (battle->bc->min_cloth_color) #define MAX_CLOTH_COLOR (battle->bc->max_cloth_color) -#define is_boss(bl) (status_get_mode(bl)&MD_BOSS) // Can refine later [Aru] +#define is_boss(bl) (status_get_mode(bl)&MD_BOSS) // Can refine later [Aru] /** * Enumerations **/ -enum { // Flag of the final calculation - BF_WEAPON = 0x0001, - BF_MAGIC = 0x0002, - BF_MISC = 0x0004, - BF_SHORT = 0x0010, - BF_LONG = 0x0040, - BF_SKILL = 0x0100, - BF_NORMAL = 0x0200, - BF_WEAPONMASK=0x000f, - BF_RANGEMASK= 0x00f0, - BF_SKILLMASK= 0x0f00, +enum { + // Flag of the final calculation + BF_WEAPON = 0x0001, + BF_MAGIC = 0x0002, + BF_MISC = 0x0004, + BF_SHORT = 0x0010, + BF_LONG = 0x0040, + BF_SKILL = 0x0100, + BF_NORMAL = 0x0200, + BF_WEAPONMASK = 0x000f, + BF_RANGEMASK = 0x00f0, + BF_SKILLMASK = 0x0f00, }; // state of a single attack attempt; used in flee/def penalty calculations when mobbed @@ -62,17 +63,17 @@ enum e_battle_check_target { //New definitions [Skotlex] BCT_SELF = 0x010000, BCT_ENEMY = 0x020000, BCT_PARTY = 0x040000, - BCT_GUILDALLY = 0x080000, // Only allies, NOT guildmates + BCT_GUILDALLY = 0x080000, ///< Only allies, NOT guildmates BCT_NEUTRAL = 0x100000, - BCT_SAMEGUILD = 0x200000, // No Guild Allies - - BCT_GUILD = 0x280000, // Guild AND allies (BCT_SAMEGUILD|BCT_GUILDALLY) - - BCT_NOGUILD = 0x170000, // This should be (~BCT_GUILD&BCT_ALL) - BCT_NOPARTY = 0x3b0000, // This should be (~BCT_PARTY&BCT_ALL) - BCT_NOENEMY = 0x3d0000, // This should be (~BCT_ENEMY&BCT_ALL) - - BCT_ALL = 0x3f0000, // Sum of BCT_NOONE to BCT_SAMEGUILD + BCT_SAMEGUILD = 0x200000, ///< No Guild Allies + + BCT_GUILD = 0x280000, ///< Guild AND allies (BCT_SAMEGUILD|BCT_GUILDALLY) + + BCT_NOGUILD = 0x170000, ///< This must be (~BCT_GUILD&BCT_ALL) + BCT_NOPARTY = 0x3b0000, ///< This must be (~BCT_PARTY&BCT_ALL) + BCT_NOENEMY = 0x3d0000, ///< This must be (~BCT_ENEMY&BCT_ALL) + + BCT_ALL = 0x3f0000, ///< Sum of BCT_NOONE to BCT_SAMEGUILD }; /** @@ -86,7 +87,7 @@ struct Damage { int amotion,dmotion; int blewcount; //nb of knockback int flag; //chk BF_* flag, (enum below) - enum damage_lv dmg_lv; //ATK_LUCKY,ATK_FLEE,ATK_DEF + enum damage_lv dmg_lv; //ATK_LUCKY,ATK_FLEE,ATK_DEF }; struct Battle_Config { @@ -147,12 +148,12 @@ struct Battle_Config { int monster_active_enable; int monster_damage_delay_rate; int monster_loot_type; - int mob_skill_rate; //[Skotlex] - int mob_skill_delay; //[Skotlex] + int mob_skill_rate; //[Skotlex] + int mob_skill_delay; //[Skotlex] int mob_count_rate; int no_spawn_on_player; //[Skotlex] int force_random_spawn; //[Skotlex] - int mob_spawn_delay, plant_spawn_delay, boss_spawn_delay; // [Skotlex] + int mob_spawn_delay, plant_spawn_delay, boss_spawn_delay; // [Skotlex] int slaves_inherit_mode; int slaves_inherit_speed; int summons_trigger_autospells; @@ -169,7 +170,7 @@ struct Battle_Config { int emergency_call; int guild_aura; int pc_invincible_time; - + int pet_catch_rate; int pet_rename; int pet_friendly_rate; @@ -178,7 +179,7 @@ struct Battle_Config { int pet_status_support; int pet_attack_support; int pet_damage_support; - int pet_support_min_friendly; //[Skotlex] + int pet_support_min_friendly; //[Skotlex] int pet_equip_min_friendly; int pet_support_rate; int pet_attack_exp_to_master; @@ -189,7 +190,7 @@ struct Battle_Config { int pet_max_atk2; //[Skotlex] int pet_no_gvg; //Disables pets in gvg. [Skotlex] int pet_equip_required; - + int skill_min_damage; int finger_offensive_type; int heal_exp; @@ -199,11 +200,11 @@ struct Battle_Config { int shop_exp; int combo_delay_rate; int item_check; - int item_use_interval; //[Skotlex] + int item_use_interval; //[Skotlex] int cashfood_use_interval; int wedding_modifydisplay; - int wedding_ignorepalette; //[Skotlex] - int xmas_ignorepalette; // [Valaris] + int wedding_ignorepalette; //[Skotlex] + int xmas_ignorepalette; // [Valaris] int summer_ignorepalette; // [Zephyrus] int hanbok_ignorepalette; int natural_healhp_interval; @@ -212,7 +213,7 @@ struct Battle_Config { int natural_heal_weight_rate; int arrow_decrement; int max_aspd; - int max_walk_speed; //Maximum walking speed after buffs [Skotlex] + int max_walk_speed; //Maximum walking speed after buffs [Skotlex] int max_hp; int max_sp; int max_lv, aura_lv; @@ -224,8 +225,8 @@ struct Battle_Config { int save_clothcolor; int undead_detect_type; int auto_counter_type; - int min_hitrate; //[Skotlex] - int max_hitrate; //[Skotlex] + int min_hitrate; //[Skotlex] + int max_hitrate; //[Skotlex] int agi_penalty_target; int agi_penalty_type; int agi_penalty_count; @@ -263,33 +264,33 @@ struct Battle_Config { int item_rate_mvp, item_rate_common, item_rate_common_boss, item_rate_card, item_rate_card_boss, item_rate_equip, item_rate_equip_boss, item_rate_heal, item_rate_heal_boss, item_rate_use, item_rate_use_boss, item_rate_treasure, item_rate_adddrop; - + int logarithmic_drops; - int item_drop_common_min,item_drop_common_max; // Added by TyrNemesis^ + int item_drop_common_min,item_drop_common_max; // Added by TyrNemesis^ int item_drop_card_min,item_drop_card_max; int item_drop_equip_min,item_drop_equip_max; - int item_drop_mvp_min,item_drop_mvp_max; // End Addition - int item_drop_heal_min,item_drop_heal_max; // Added by Valatris - int item_drop_use_min,item_drop_use_max; //End + int item_drop_mvp_min,item_drop_mvp_max; // End Addition + int item_drop_heal_min,item_drop_heal_max; // Added by Valatris + int item_drop_use_min,item_drop_use_max; //End int item_drop_treasure_min,item_drop_treasure_max; //by [Skotlex] int item_drop_adddrop_min,item_drop_adddrop_max; //[Skotlex] - - int prevent_logout; // Added by RoVeRT - - int alchemist_summon_reward; // [Valaris] + + int prevent_logout; // Added by RoVeRT + + int alchemist_summon_reward; // [Valaris] int drops_by_luk; int drops_by_luk2; - int equip_natural_break_rate; //Base Natural break rate for attacks. + int equip_natural_break_rate; //Base Natural break rate for attacks. int equip_self_break_rate; //Natural & Penalty skills break rate int equip_skill_break_rate; //Offensive skills break rate int multi_level_up; int max_exp_gain_rate; //Max amount of exp bar % you can get in one go. int pk_mode; int pk_level_range; - + int manner_system; // end additions [Valaris] int show_mob_info; - + int gx_allhit; int gx_disptype; int devotion_level_difference; @@ -305,13 +306,13 @@ struct Battle_Config { int bone_drop; int buyer_name; int dancing_weaponswitch_fix; - + // eAthena additions int night_at_start; // added by [Yor] int day_duration; // added by [Yor] int night_duration; // added by [Yor] int ban_hack_trade; // added by [Yor] - + int min_hair_style; // added by [MouseJstr] int max_hair_style; // added by [MouseJstr] int min_hair_color; // added by [MouseJstr] @@ -319,12 +320,12 @@ struct Battle_Config { int min_cloth_color; // added by [MouseJstr] int max_cloth_color; // added by [MouseJstr] int pet_hair_style; // added by [Skotlex] - + int castrate_dex_scale; // added by [MouseJstr] int area_size; // added by [MouseJstr] - + int max_def, over_def_bonus; //added by [Skotlex] - + int zeny_from_mobs; // [Valaris] int mobs_level_up; // [Valaris] int mobs_level_up_exp_rate; // [Valaris] @@ -344,12 +345,12 @@ struct Battle_Config { int delay_battle_damage; int hide_woe_damage; int display_version; - - int display_hallucination; // [Skotlex] - int use_statpoint_table; // [Skotlex] - + + int display_hallucination; // [Skotlex] + int use_statpoint_table; // [Skotlex] + int ignore_items_gender; //[Lupus] - + int copyskill_restrict; // [Aru] int berserk_cancels_buffs; // [Aru] int mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex] @@ -359,23 +360,23 @@ struct Battle_Config { int mob_remove_delay; // Dynamic Mobs - delay before removing mobs from a map [Skotlex] int mob_active_time; //Duration through which mobs execute their Hard AI after players leave their area of sight. int boss_active_time; - - int show_hp_sp_drain, show_hp_sp_gain; //[Skotlex] - + + int show_hp_sp_drain, show_hp_sp_gain; //[Skotlex] + int mob_npc_event_type; //Determines on who the npc_event is executed. [Skotlex] - + int character_size; // if riders have size=2, and baby class riders size=1 [Lupus] int rare_drop_announce; // chance <= to show rare drops global announces - - int retaliate_to_master; //Whether when a mob is attacked by another mob, it will retaliate versus the mob or the mob's master. [Skotlex] - + + int retaliate_to_master; //Whether when a mob is attacked by another mob, it will retaliate versus the mob or the mob's master. [Skotlex] + int duel_allow_pvp; // [LuzZza] int duel_allow_gvg; // [LuzZza] int duel_allow_teleport; // [LuzZza] int duel_autoleave_when_die; // [LuzZza] int duel_time_interval; // [LuzZza] int duel_only_on_same_map; // [Toms] - + int skip_teleport_lv1_menu; // possibility to disable (skip) Teleport Lv1 menu, that have only two lines `Random` and `Cancel` [LuzZza] int mob_max_skilllvl; int allow_skill_without_day; // [Komurka] @@ -389,7 +390,7 @@ struct Battle_Config { int mob_sc_def_rate; int pc_max_sc_def; int mob_max_sc_def; - + int sg_angel_skill_ratio; int sg_miracle_skill_ratio; int sg_miracle_skill_duration; @@ -397,9 +398,9 @@ struct Battle_Config { int override_mob_names; //Enables overriding spawn mob names with the mob_db names. [Skotlex] int min_chat_delay; //Minimum time between client messages. [Skotlex] int friend_auto_add; //When accepting friends, both get friended. [Skotlex] - int hvan_explosion_intimate; // fix [albator] + int hvan_explosion_intimate; // fix [albator] int hom_rename; - int homunculus_show_growth ; //[orn] + int homunculus_show_growth; //[orn] int homunculus_friendly_rate; int quest_exp_rate; int autotrade_mapflag; @@ -410,13 +411,13 @@ struct Battle_Config { int ksprotection; int auction_feeperhour; int auction_maximumprice; - int homunculus_auto_vapor; //Keep Homunculus from Vaporizing when master dies. [L0ne_W0lf] - int display_status_timers; //Show or hide skill buff/delay timers in recent clients [Sara] - int skill_add_heal_rate; //skills that bHealPower has effect on [Inkfish] + int homunculus_auto_vapor; //Keep Homunculus from Vaporizing when master dies. [L0ne_W0lf] + int display_status_timers; //Show or hide skill buff/delay timers in recent clients [Sara] + int skill_add_heal_rate; //skills that bHealPower has effect on [Inkfish] int eq_single_target_reflectable; int invincible_nodamage; int mob_slave_keep_target; - int autospell_check_range; //Enable range check for autospell bonus. [L0ne_W0lf] + int autospell_check_range; //Enable range check for autospell bonus. [L0ne_W0lf] int knockback_left; int client_reshuffle_dice; // Reshuffle /dice int client_sort_storage; @@ -431,11 +432,11 @@ struct Battle_Config { int client_emblem_max_blank_percent; int hom_max_level; int hom_S_max_level; - + // [BattleGround Settings] int bg_update_interval; int bg_flee_penalty; - + // rAthena int max_third_parameter; int max_baby_third_parameter; @@ -443,13 +444,13 @@ struct Battle_Config { int atcommand_max_stat_bypass; int max_third_aspd; int vcast_stat_scale; - + int mvp_tomb_enabled; - + int atcommand_suggestions_enabled; int min_npc_vendchat_distance; int atcommand_mobinfo_type; - + int mob_size_influence; // Enable modifications on earned experience, drop rates and monster status depending on monster size. [mkbu95] int bowling_bash_area; int mob_chase_refresh; //How often a monster should refresh its chase [Playtester] @@ -465,11 +466,11 @@ struct Battle_Config { int packet_obfuscation; int idletime_criteria; int gm_ignore_warpable_area; - + int client_accept_chatdori; // [Ai4rei/Mirei] int snovice_call_type; int guild_notice_changemap; - + int feature_banking; int feature_auction; @@ -481,7 +482,7 @@ struct Battle_Config { int song_timer_reset; // [csnv] int snap_dodge; // Enable or disable dodging damage snapping away [csnv] - + int feature_roulette; }; |