Use IP4 classes and rename conf variables

1 files changed, 24 insertions, 83 deletions

diff --git a/src/map/battle.hpp b/src/map/battle.hpp
index 6ed32fd..c933e28 100644
--- a/src/map/battle.hpp
+++ b/src/map/battle.hpp
@@ -96,16 +96,10 @@ extern struct Battle_Config
     int enemy_critical_rate;
     int enemy_str;
     int enemy_perfect_flee;
-    int cast_rate, delay_rate, delay_dependon_dex;
-    int sdelay_attack_enable;
-    int left_cardfix_to_right;
-    int pc_skill_add_range;
-    int skill_out_range_consume;
-    int mob_skill_add_range;
-    int pc_damage_delay;
-    int defnotenemy;
-    int random_monster_checklv;
-    int attr_recover;
+    int casting_rate, delay_rate, delay_dependon_dex;
+    int skill_delay_attack_enable;
+    int monster_skill_add_range;
+    int player_damage_delay;
     int flooritem_lifetime;
     int item_auto_get;
     int item_first_get_time;
@@ -114,41 +108,23 @@ extern struct Battle_Config
     int base_exp_rate, job_exp_rate;
     int death_penalty_type;
     int death_penalty_base, death_penalty_job;
-    int gtb_pvp_only;          // [MouseJstr]
-    int zeny_penalty;
     int restart_hp_rate;
     int restart_sp_rate;
     int monster_hp_rate;
     int monster_max_aspd;
-    int atc_gmonly;
-    int atc_spawn_quantity_limit;
-    int gm_allskill;
-    int gm_allskill_addabra;
-    int gm_allequip;
-    int gm_skilluncond;
-    int skillfree;
-    int skillup_limit;
-    int wp_rate;
-    int pp_rate;
+    int atcommand_gm_only;
+    int atcommand_spawn_quantity_limit;
+    int gm_all_equipment;
     int monster_active_enable;
     int mob_skill_use;
     int mob_count_rate;
-    int quest_skill_learn;
-    int quest_skill_reset;
     int basic_skill_check;
-    int pc_invincible_time;
+    int player_invincible_time;
     int skill_min_damage;
-    int finger_offensive_type;
-    int heal_exp;
-    int resurrection_exp;
-    int shop_exp;
-    int combo_delay_rate;
-    int wedding_modifydisplay;
     int natural_healhp_interval;
     int natural_healsp_interval;
     int natural_heal_skill_interval;
     int natural_heal_weight_rate;
-    int item_name_override_grffile;
     int arrow_decrement;
     int max_aspd;
     int max_hp;
@@ -156,89 +132,54 @@ extern struct Battle_Config
     int max_lv;
     int max_parameter;
     int max_cart_weight;
-    int pc_skill_log;
-    int mob_skill_log;
+    int monster_skill_log;
     int battle_log;
     int save_log;
     int error_log;
     int etc_log;
     int save_clothcolor;
     int undead_detect_type;
-    int pc_auto_counter_type;
-    int monster_auto_counter_type;
     int agi_penaly_type;
     int agi_penaly_count;
     int agi_penaly_num;
     int vit_penaly_type;
     int vit_penaly_count;
     int vit_penaly_num;
-    int pc_skill_reiteration;
-    int monster_skill_reiteration;
-    int pc_skill_nofootset;
-    int monster_skill_nofootset;
-    int pc_cloak_check_type;
-    int monster_cloak_check_type;
     int mob_changetarget_byskill;
-    int pc_attack_direction_change;
+    int player_attack_direction_change;
     int monster_attack_direction_change;
-    int pc_undead_nofreeze;
-    int pc_land_skill_limit;
-    int monster_land_skill_limit;
-    int party_skill_penaly;
-    int monster_class_change_full_recover;
-    int produce_item_name_input;
-    int produce_potion_name_input;
-    int making_arrow_name_input;
-    int holywater_name_input;
     int display_delay_skill_fail;
-    int chat_warpportal;
-    int mob_warpportal;
     int dead_branch_active;
     int show_steal_in_same_party;
-    int enable_upper_class;
-    int mob_attack_attr_none;
-    int mob_ghostring_fix;
-    int pc_attack_attr_none;
 
-    int prevent_logout;        // Added by RoVeRT
+    int prevent_logout;
 
-    int alchemist_summon_reward;   // [Valaris]
+    int alchemist_summon_reward;
     int maximum_level;
     int drops_by_luk;
     int monsters_ignore_gm;
     int multi_level_up;
     int pk_mode;
-    int show_mob_hp;           // end additions [Valaris]
 
     int agi_penaly_count_lv;
     int vit_penaly_count_lv;
 
-    int gx_allhit;
-    int gx_cardfix;
-    int gx_dupele;
-    int gx_disptype;
-    int player_skill_partner_check;
     int hide_GM_session;
-    int unit_movement_type;
     int invite_request_check;
-    int skill_removetrap_type;
     int disp_experience;
-    int riding_weight;
-    int backstab_bow_penalty;
 
-    int hack_info_GM_level;    // added by [Yor]
-    int any_warp_GM_min_level; // added by [Yor]
-    int packet_ver_flag;       // added by [Yor]
+    int hack_info_GM_level;
+    int any_warp_GM_min_level;
 
-    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 min_hair_style;
+    int max_hair_style;
+    int min_hair_color;
+    int max_hair_color;
+    int min_cloth_color;
+    int max_cloth_color;
 
-    int castrate_dex_scale;    // added by [MouseJstr]
-    int area_size;             // added by [MouseJstr]
+    int castrate_dex_scale;
+    int area_size;
 
     int chat_lame_penalty;
     int chat_spam_threshold;
@@ -253,8 +194,8 @@ extern struct Battle_Config
 
     int mask_ip_gms;
 
-    int drop_pickup_safety_zone;   // [Fate] Max. distance to an object dropped by a kill by self in which dropsteal protection works
-    int itemheal_regeneration_factor;  // [Fate] itemheal speed factor
+    int drop_pickup_safety_zone;
+    int itemheal_regeneration_factor;
 
     int mob_splash_radius;
 } battle_config;