From c25d6f5e6c3f092f70bf28cb0a3ac71e2ab89ead Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 15 Aug 2007 17:13:04 +0000 Subject: * Some serious code cleanups - adjusted @reloadbattleconf to not depend on variable ordering - changed all battle vars to 'int' (removes pointless duplicit coding) - added min, max and default columns to battle config data structure - added properly bounded values for these columns (or at least tried to) - battle-conf loading will now complain if it finds unknown settings, and will reject values that are outside of the allowed range - added CHATROOM_TITLE_SIZE and CHATROOM_PASS_SIZE - partially cleaned up chatroom manipulation code * Fixed 'Job_Professer' typo in mage jobchange quest git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11017 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.h | 622 +++++++++++++++++++++++++++---------------------------- 1 file changed, 311 insertions(+), 311 deletions(-) (limited to 'src/map/battle.h') diff --git a/src/map/battle.h b/src/map/battle.h index ff4270bce..1bd781f2b 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -87,31 +87,32 @@ int 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); // ݒ -extern struct Battle_Config { - unsigned short warp_point_debug; - unsigned short enable_critical; - unsigned short mob_critical_rate; - unsigned short critical_rate; - unsigned short enable_baseatk; - unsigned short enable_perfect_flee; - unsigned short cast_rate, delay_rate; - unsigned short delay_dependon_dex, delay_dependon_agi; - unsigned short sdelay_attack_enable; - unsigned short left_cardfix_to_right; - unsigned short skill_add_range; - unsigned short skill_out_range_consume; - unsigned short skillrange_by_distance; //[Skotlex] - unsigned short use_weapon_skill_range; //[Skotlex] - unsigned short pc_damage_delay_rate; - unsigned short defnotenemy; - unsigned short vs_traps_bctall; - unsigned short traps_setting; - unsigned short summon_flora; //[Skotlex] - unsigned short clear_unit_ondeath; //[Skotlex] - unsigned short clear_unit_onwarp; //[Skotlex] - unsigned short random_monster_checklv; - unsigned short attr_recover; - unsigned short item_auto_get; +extern struct Battle_Config +{ + int warp_point_debug; + int enable_critical; + int mob_critical_rate; + int critical_rate; + int enable_baseatk; + int enable_perfect_flee; + int cast_rate, delay_rate; + int delay_dependon_dex, delay_dependon_agi; + int sdelay_attack_enable; + int left_cardfix_to_right; + int skill_add_range; + int skill_out_range_consume; + int skillrange_by_distance; //[Skotlex] + int use_weapon_skill_range; //[Skotlex] + int pc_damage_delay_rate; + int defnotenemy; + int vs_traps_bctall; + int traps_setting; + int summon_flora; //[Skotlex] + int clear_unit_ondeath; //[Skotlex] + int clear_unit_onwarp; //[Skotlex] + int random_monster_checklv; + int attr_recover; + int item_auto_get; int flooritem_lifetime; int item_first_get_time; int item_second_get_time; @@ -120,321 +121,320 @@ extern struct Battle_Config { int mvp_item_second_get_time; int mvp_item_third_get_time; int base_exp_rate,job_exp_rate; - unsigned short drop_rate0item; - unsigned short death_penalty_type; - unsigned short death_penalty_base,death_penalty_job; - unsigned short pvp_exp; // [MouseJstr] - unsigned short gtb_sc_immunity; + int drop_rate0item; + int death_penalty_type; + int death_penalty_base,death_penalty_job; + int pvp_exp; // [MouseJstr] + int gtb_sc_immunity; int zeny_penalty; - unsigned short restart_hp_rate; - unsigned short restart_sp_rate; + int restart_hp_rate; + int restart_sp_rate; int mvp_exp_rate; - unsigned short mvp_hp_rate; - unsigned short monster_hp_rate; - unsigned short monster_max_aspd; - unsigned short view_range_rate; - unsigned short chase_range_rate; - unsigned short atc_gmonly; - unsigned short atc_spawn_quantity_limit; - unsigned short atc_slave_clone_limit; - unsigned short partial_name_scan; - unsigned short gm_allskill; - unsigned short gm_allequip; - unsigned short gm_skilluncond; - unsigned short gm_join_chat; - unsigned short gm_kick_chat; - unsigned short skillfree; - unsigned short skillup_limit; - unsigned short wp_rate; - unsigned short pp_rate; - unsigned short monster_active_enable; - unsigned short monster_damage_delay_rate; - unsigned short monster_loot_type; - unsigned short mob_skill_rate; //[Skotlex] - unsigned short mob_skill_delay; //[Skotlex] - unsigned short mob_count_rate; - unsigned short no_spawn_on_player; //[Skotlex] - unsigned short force_random_spawn; //[Skotlex] - unsigned short mob_spawn_delay, plant_spawn_delay, boss_spawn_delay; // [Skotlex] - unsigned short slaves_inherit_mode; - unsigned short slaves_inherit_speed; - unsigned short summons_trigger_autospells; - unsigned short pc_walk_delay_rate; //Adjusts can't walk delay after being hit for players. [Skotlex] - unsigned short walk_delay_rate; //Adjusts can't walk delay after being hit. [Skotlex] - unsigned short multihit_delay; //Adjusts can't walk delay per hit on multi-hitting skills. [Skotlex] - unsigned short quest_skill_learn; - unsigned short quest_skill_reset; - unsigned short basic_skill_check; - unsigned short guild_emperium_check; - unsigned short guild_exp_limit; - unsigned short guild_max_castles; - unsigned short emergency_call; - unsigned short guild_aura; - unsigned short pc_invincible_time; - unsigned short pet_catch_rate; - unsigned short pet_rename; - unsigned short pet_friendly_rate; - unsigned short pet_hungry_delay_rate; - unsigned short pet_hungry_friendly_decrease; - unsigned short pet_status_support; - unsigned short pet_attack_support; - unsigned short pet_damage_support; - unsigned short pet_support_min_friendly; //[Skotlex] - unsigned short pet_support_rate; - unsigned short pet_attack_exp_to_master; - unsigned short pet_attack_exp_rate; - unsigned short pet_lv_rate; //[Skotlex] - unsigned short pet_max_stats; //[Skotlex] - unsigned short pet_max_atk1; //[Skotlex] - unsigned short pet_max_atk2; //[Skotlex] - unsigned short pet_no_gvg; //Disables pets in gvg. [Skotlex] - unsigned short skill_min_damage; - unsigned short finger_offensive_type; - unsigned short heal_exp; - unsigned short max_heal_lv; + int mvp_hp_rate; + int monster_hp_rate; + int monster_max_aspd; + int view_range_rate; + int chase_range_rate; + int atc_gmonly; + int atc_spawn_quantity_limit; + int atc_slave_clone_limit; + int partial_name_scan; + int gm_allskill; + int gm_allequip; + int gm_skilluncond; + int gm_join_chat; + int gm_kick_chat; + int skillfree; + int skillup_limit; + int wp_rate; + int pp_rate; + 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_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 slaves_inherit_mode; + int slaves_inherit_speed; + int summons_trigger_autospells; + int pc_walk_delay_rate; //Adjusts can't walk delay after being hit for players. [Skotlex] + int walk_delay_rate; //Adjusts can't walk delay after being hit. [Skotlex] + int multihit_delay; //Adjusts can't walk delay per hit on multi-hitting skills. [Skotlex] + int quest_skill_learn; + int quest_skill_reset; + int basic_skill_check; + int guild_emperium_check; + int guild_exp_limit; + int guild_max_castles; + int emergency_call; + int guild_aura; + int pc_invincible_time; + int pet_catch_rate; + int pet_rename; + int pet_friendly_rate; + int pet_hungry_delay_rate; + int pet_hungry_friendly_decrease; + int pet_status_support; + int pet_attack_support; + int pet_damage_support; + int pet_support_min_friendly; //[Skotlex] + int pet_support_rate; + int pet_attack_exp_to_master; + int pet_attack_exp_rate; + int pet_lv_rate; //[Skotlex] + int pet_max_stats; //[Skotlex] + int pet_max_atk1; //[Skotlex] + int pet_max_atk2; //[Skotlex] + int pet_no_gvg; //Disables pets in gvg. [Skotlex] + int skill_min_damage; + int finger_offensive_type; + int heal_exp; + int max_heal_lv; int max_heal; //Mitternacht - unsigned short resurrection_exp; - unsigned short shop_exp; - unsigned short combo_delay_rate; - unsigned short item_check; - unsigned short item_use_interval; //[Skotlex] - unsigned short wedding_modifydisplay; - unsigned short wedding_ignorepalette; //[Skotlex] - unsigned short xmas_ignorepalette; // [Valaris] + int resurrection_exp; + int shop_exp; + int combo_delay_rate; + int item_check; + int item_use_interval; //[Skotlex] + int wedding_modifydisplay; + int wedding_ignorepalette; //[Skotlex] + int xmas_ignorepalette; // [Valaris] int natural_healhp_interval; int natural_healsp_interval; int natural_heal_skill_interval; - unsigned short natural_heal_weight_rate; - unsigned short arrow_decrement; - unsigned short max_aspd; - unsigned short max_walk_speed; //Maximum walking speed after buffs [Skotlex] + int natural_heal_weight_rate; + int arrow_decrement; + int max_aspd; + int max_walk_speed; //Maximum walking speed after buffs [Skotlex] int max_hp; int max_sp; - unsigned short max_lv, aura_lv; - unsigned short max_parameter, max_baby_parameter; + int max_lv, aura_lv; + int max_parameter, max_baby_parameter; int max_cart_weight; - unsigned short skill_log; - unsigned short battle_log; - unsigned short save_log; - unsigned short error_log; - unsigned short etc_log; - unsigned short save_clothcolor; - unsigned short undead_detect_type; - unsigned short auto_counter_type; - unsigned short min_hitrate; //[Skotlex] - unsigned short max_hitrate; //[Skotlex] - unsigned short agi_penalty_target; - unsigned short agi_penalty_type; - unsigned short agi_penalty_count; - unsigned short agi_penalty_num; - unsigned short vit_penalty_target; - unsigned short vit_penalty_type; - unsigned short vit_penalty_count; - unsigned short vit_penalty_num; - unsigned short weapon_defense_type; - unsigned short magic_defense_type; - unsigned short skill_reiteration; - unsigned short skill_nofootset; - unsigned short pc_cloak_check_type; - unsigned short monster_cloak_check_type; - unsigned short estimation_type; - unsigned short gvg_short_damage_rate; - unsigned short gvg_long_damage_rate; - unsigned short gvg_weapon_damage_rate; - unsigned short gvg_magic_damage_rate; - unsigned short gvg_misc_damage_rate; - unsigned short gvg_flee_penalty; + int skill_log; + int battle_log; + int save_log; + int error_log; + int etc_log; + int save_clothcolor; + int undead_detect_type; + int auto_counter_type; + int min_hitrate; //[Skotlex] + int max_hitrate; //[Skotlex] + int agi_penalty_target; + int agi_penalty_type; + int agi_penalty_count; + int agi_penalty_num; + int vit_penalty_target; + int vit_penalty_type; + int vit_penalty_count; + int vit_penalty_num; + int weapon_defense_type; + int magic_defense_type; + int skill_reiteration; + int skill_nofootset; + int pc_cloak_check_type; + int monster_cloak_check_type; + int estimation_type; + int gvg_short_damage_rate; + int gvg_long_damage_rate; + int gvg_weapon_damage_rate; + int gvg_magic_damage_rate; + int gvg_misc_damage_rate; + int gvg_flee_penalty; int gvg_eliminate_time; - unsigned short pk_short_damage_rate; - unsigned short pk_long_damage_rate; - unsigned short pk_weapon_damage_rate; - unsigned short pk_magic_damage_rate; - unsigned short pk_misc_damage_rate; - unsigned short mob_changetarget_byskill; - unsigned short attack_direction_change; - unsigned short land_skill_limit; - unsigned short party_skill_penalty; - unsigned short monster_class_change_full_recover; - unsigned short produce_item_name_input; - unsigned short display_skill_fail; - unsigned short chat_warpportal; - unsigned short mob_warp; - unsigned short dead_branch_active; + int pk_short_damage_rate; + int pk_long_damage_rate; + int pk_weapon_damage_rate; + int pk_magic_damage_rate; + int pk_misc_damage_rate; + int mob_changetarget_byskill; + int attack_direction_change; + int land_skill_limit; + int party_skill_penalty; + int monster_class_change_recover; + int produce_item_name_input; + int display_skill_fail; + int chat_warpportal; + int mob_warp; + int dead_branch_active; int vending_max_value; - unsigned short vending_tax; - unsigned short show_steal_in_same_party; - unsigned short party_share_type; - unsigned short party_hp_mode; - unsigned short party_show_share_picker; - unsigned short attack_attr_none; - int item_rate_mvp, item_rate_common, item_rate_common_boss, item_rate_card, item_rate_card_boss, // added support for MVP drops [Reddozen] + int vending_tax; + int show_steal_in_same_party; + int party_share_type; + int party_hp_mode; + int party_show_share_picker; + int attack_attr_none; + 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, // Added by RoVeRT, Additional Heal and Usable item rate by Val - item_rate_adddrop; + item_rate_use_boss, item_rate_treasure, item_rate_adddrop; - unsigned short logarithmic_drops; - unsigned short item_drop_common_min,item_drop_common_max; // Added by TyrNemesis^ - unsigned short item_drop_card_min,item_drop_card_max; - unsigned short item_drop_equip_min,item_drop_equip_max; - unsigned short item_drop_mvp_min,item_drop_mvp_max; // End Addition - unsigned short item_drop_heal_min,item_drop_heal_max; // Added by Valatris - unsigned short item_drop_use_min,item_drop_use_max; //End - unsigned short item_drop_treasure_min,item_drop_treasure_max; //by [Skotlex] - unsigned short item_drop_adddrop_min,item_drop_adddrop_max; //[Skotlex] - unsigned short prevent_logout; // Added by RoVeRT - - unsigned short alchemist_summon_reward; // [Valaris] - unsigned short drops_by_luk; - unsigned short drops_by_luk2; - unsigned short equip_natural_break_rate; //Base Natural break rate for attacks. - unsigned short equip_self_break_rate; //Natural & Penalty skills break rate - unsigned short equip_skill_break_rate; //Offensive skills break rate - unsigned short pet_equip_required; - unsigned short multi_level_up; - unsigned short max_exp_gain_rate; //Max amount of exp bar % you can get in one go. - unsigned short pk_mode; - unsigned short pk_level_range; - - unsigned short manner_system; // end additions [Valaris] - unsigned short show_mob_info; - - unsigned short agi_penalty_count_lv; - unsigned short vit_penalty_count_lv; - - unsigned short gx_allhit; - unsigned short gx_disptype; - unsigned short devotion_level_difference; - unsigned short player_skill_partner_check; - unsigned short hide_GM_session; - unsigned short invite_request_check; - unsigned short skill_removetrap_type; - unsigned short disp_experience; - unsigned short disp_zeny; - unsigned short castle_defense_rate; - unsigned short backstab_bow_penalty; - unsigned short hp_rate; - unsigned short sp_rate; - unsigned short gm_cant_drop_min_lv; - unsigned short gm_cant_drop_max_lv; - unsigned short disp_hpmeter; - unsigned short bone_drop; - unsigned short buyer_name; + int logarithmic_drops; + 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_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 drops_by_luk; + int drops_by_luk2; + 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 pet_equip_required; + 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 agi_penalty_count_lv; + int vit_penalty_count_lv; + + int gx_allhit; + int gx_disptype; + int devotion_level_difference; + int player_skill_partner_check; + int hide_GM_session; + int invite_request_check; + int skill_removetrap_type; + int disp_experience; + int disp_zeny; + int castle_defense_rate; + int backstab_bow_penalty; + int hp_rate; + int sp_rate; + int gm_cant_drop_min_lv; + int gm_cant_drop_max_lv; + int disp_hpmeter; + int bone_drop; + int buyer_name; // eAthena additions - unsigned short night_at_start; // added by [Yor] + int night_at_start; // added by [Yor] int day_duration; // added by [Yor] int night_duration; // added by [Yor] - short ban_hack_trade; // added by [Yor] - unsigned short hack_info_GM_level; // added by [Yor] - unsigned short any_warp_GM_min_level; // added by [Yor] - unsigned short packet_ver_flag; // added by [Yor] + int ban_hack_trade; // added by [Yor] + int hack_info_GM_level; // added by [Yor] + int any_warp_GM_min_level; // added by [Yor] + int packet_ver_flag; // added by [Yor] - unsigned short min_hair_style; // added by [MouseJstr] - unsigned short max_hair_style; // added by [MouseJstr] - unsigned short min_hair_color; // added by [MouseJstr] - unsigned short max_hair_color; // added by [MouseJstr] - unsigned short min_cloth_color; // added by [MouseJstr] - unsigned short max_cloth_color; // added by [MouseJstr] - unsigned short pet_hair_style; // added by [Skotlex] - - unsigned short castrate_dex_scale; // added by [MouseJstr] - unsigned short area_size; // added by [MouseJstr] - - unsigned short max_def, over_def_bonus; //added by [Skotlex] + int min_hair_style; // added by [MouseJstr] + int max_hair_style; // added by [MouseJstr] + int min_hair_color; // added by [MouseJstr] + int max_hair_color; // added by [MouseJstr] + 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] - unsigned short zeny_from_mobs; // [Valaris] - unsigned short mobs_level_up; // [Valaris] - unsigned short mobs_level_up_exp_rate; // [Valaris] - unsigned short pk_min_level; // [celest] - unsigned short skill_steal_type; // [celest] - unsigned short skill_steal_rate; // [celest] - unsigned short skill_steal_max_tries; //max steal skill tries on a mob. if 0, then w/o limit [Lupus] - unsigned short motd_type; // [celest] - unsigned short finding_ore_rate; // orn - unsigned short exp_calc_type; - unsigned short exp_bonus_attacker; - unsigned short exp_bonus_max_attacker; - unsigned short min_skill_delay_limit; - unsigned short default_skill_delay; - unsigned short no_skill_delay; - unsigned short attack_walk_delay; - unsigned short require_glory_guild; - unsigned short idle_no_share; - unsigned short party_update_interval; - unsigned short party_even_share_bonus; - unsigned short delay_battle_damage; - unsigned short hide_woe_damage; - unsigned short display_version; - unsigned short who_display_aid; - - unsigned short display_hallucination; // [Skotlex] - unsigned short use_statpoint_table; // [Skotlex] - - unsigned short ignore_items_gender; //[Lupus] - - unsigned short copyskill_restrict; // [Aru] - unsigned short berserk_cancels_buffs; // [Aru] - unsigned short debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex] - unsigned short mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex] - unsigned short hom_setting; //Configures various homunc settings which make them behave unlike normal characters.. [Skotlex] - unsigned short dynamic_mobs; // Dynamic Mobs [Wizputer] - battle_athena flag implemented by [random] - unsigned short mob_remove_damaged; // Dynamic Mobs - Remove mobs even if damaged [Wizputer] + int zeny_from_mobs; // [Valaris] + int mobs_level_up; // [Valaris] + int mobs_level_up_exp_rate; // [Valaris] + int pk_min_level; // [celest] + int skill_steal_type; // [celest] + int skill_steal_rate; // [celest] + int skill_steal_max_tries; //max steal skill tries on a mob. if 0, then w/o limit [Lupus] + int motd_type; // [celest] + int finding_ore_rate; // orn + int exp_calc_type; + int exp_bonus_attacker; + int exp_bonus_max_attacker; + int min_skill_delay_limit; + int default_skill_delay; + int no_skill_delay; + int attack_walk_delay; + int require_glory_guild; + int idle_no_share; + int party_update_interval; + int party_even_share_bonus; + int delay_battle_damage; + int hide_woe_damage; + int display_version; + int who_display_aid; + + int display_hallucination; // [Skotlex] + int use_statpoint_table; // [Skotlex] + + int ignore_items_gender; //[Lupus] + + int copyskill_restrict; // [Aru] + int berserk_cancels_buffs; // [Aru] + int debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex] + int mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex] + int hom_setting; //Configures various homunc settings which make them behave unlike normal characters.. [Skotlex] + int dynamic_mobs; // Dynamic Mobs [Wizputer] - battle_athena flag implemented by [random] + int mob_remove_damaged; // Dynamic Mobs - Remove mobs even if damaged [Wizputer] int mob_remove_delay; // Dynamic Mobs - delay before removing mobs from a map [Skotlex] - unsigned short show_hp_sp_drain, show_hp_sp_gain; //[Skotlex] + int show_hp_sp_drain, show_hp_sp_gain; //[Skotlex] - unsigned short mob_npc_event_type; //Determines on who the npc_event is executed. [Skotlex] - unsigned short mob_clear_delay; // [Valaris] + int mob_npc_event_type; //Determines on who the npc_event is executed. [Skotlex] + int mob_clear_delay; // [Valaris] - unsigned short character_size; // if riders have size=2, and baby class riders size=1 [Lupus] - unsigned short mob_max_skilllvl; // Max possible skill level [Lupus] - unsigned short rare_drop_announce; // chance <= to show rare drops global announces + int character_size; // if riders have size=2, and baby class riders size=1 [Lupus] + int mob_max_skilllvl; // Max possible skill level [Lupus] + int rare_drop_announce; // chance <= to show rare drops global announces - unsigned short retaliate_to_master; //Whether when a mob is attacked by another mob, it will retaliate versus the mob or the mob's master. [Skotlex] - unsigned short firewall_hits_on_undead; //Number of hits firewall does at a time on undead. [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 firewall_hits_on_undead; //Number of hits firewall does at a time on undead. [Skotlex] - unsigned short title_lvl1; // Players titles [Lupus] - unsigned short title_lvl2; // Players titles [Lupus] - unsigned short title_lvl3; // Players titles [Lupus] - unsigned short title_lvl4; // Players titles [Lupus] - unsigned short title_lvl5; // Players titles [Lupus] - unsigned short title_lvl6; // Players titles [Lupus] - unsigned short title_lvl7; // Players titles [Lupus] - unsigned short title_lvl8; // Players titles [Lupus] + int title_lvl1; // Players titles [Lupus] + int title_lvl2; // Players titles [Lupus] + int title_lvl3; // Players titles [Lupus] + int title_lvl4; // Players titles [Lupus] + int title_lvl5; // Players titles [Lupus] + int title_lvl6; // Players titles [Lupus] + int title_lvl7; // Players titles [Lupus] + int title_lvl8; // Players titles [Lupus] - unsigned short duel_allow_pvp; // [LuzZza] - unsigned short duel_allow_gvg; // [LuzZza] - unsigned short duel_allow_teleport; // [LuzZza] - unsigned short duel_autoleave_when_die; // [LuzZza] - unsigned short duel_time_interval; // [LuzZza] - unsigned short duel_only_on_same_map; // [Toms] + 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] - unsigned short skip_teleport_lv1_menu; // possibility to disable (skip) Teleport Lv1 menu, that have only two lines `Random` and `Cancel` [LuzZza] - - unsigned short allow_skill_without_day; // [Komurka] - unsigned short allow_es_magic_pc; // [Skotlex] - unsigned short skill_wall_check; // [Skotlex] - unsigned short cell_stack_limit; // [Skotlex] - unsigned short skill_caster_check; // [Skotlex] - unsigned short sc_castcancel; // [Skotlex] - unsigned short pc_sc_def_rate; // [Skotlex] - unsigned short mob_sc_def_rate; - unsigned short pc_luk_sc_def; - unsigned short mob_luk_sc_def; - unsigned short pc_max_sc_def; - unsigned short mob_max_sc_def; - - unsigned short sg_angel_skill_ratio; - unsigned short sg_miracle_skill_ratio; + int skip_teleport_lv1_menu; // possibility to disable (skip) Teleport Lv1 menu, that have only two lines `Random` and `Cancel` [LuzZza] + + int allow_skill_without_day; // [Komurka] + int allow_es_magic_pc; // [Skotlex] + int skill_wall_check; // [Skotlex] + int cell_stack_limit; // [Skotlex] + int skill_caster_check; // [Skotlex] + int sc_castcancel; // [Skotlex] + int pc_sc_def_rate; // [Skotlex] + int mob_sc_def_rate; + int pc_luk_sc_def; + int mob_luk_sc_def; + 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; - unsigned short autospell_stacking; //Enables autospell cards to stack. [Skotlex] - unsigned short override_mob_names; //Enables overriding spawn mob names with the mob_db names. [Skotlex] - unsigned short min_chat_delay; //Minimum time between client messages. [Skotlex] - unsigned short friend_auto_add; //When accepting friends, both get friended. [Skotlex] + int autospell_stacking; //Enables autospell cards to stack. [Skotlex] + 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] - unsigned short hom_rename; - unsigned short homunculus_show_growth ; //[orn] - unsigned short homunculus_friendly_rate; + int hom_rename; + int homunculus_show_growth ; //[orn] + int homunculus_friendly_rate; } battle_config; void do_init_battle(void); -- cgit v1.2.3-70-g09d2