From d0fed1b0a5f5868e93e16524ef0195a08582479b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 22 Dec 2022 17:42:42 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/Map.cc | 66 ++++++++++++ server/gameserver/mt/Map.h | 36 +++++++ server/gameserver/mt/Param.cc | 6 +- server/gameserver/mtb/AI.h | 36 +++---- server/gameserver/mtb/AirDrop.h | 8 +- server/gameserver/mtb/AirLine.h | 12 +-- server/gameserver/mtb/AirRaid.h | 12 +-- server/gameserver/mtb/Attr.h | 6 +- server/gameserver/mtb/Buff.h | 62 +++++------ server/gameserver/mtb/Dress.h | 10 +- server/gameserver/mtb/Drop.h | 10 +- server/gameserver/mtb/Equip.h | 130 +++++++++++------------ server/gameserver/mtb/EquipUpgrade.h | 6 +- server/gameserver/mtb/FormulaPvp.h | 12 +-- server/gameserver/mtb/GunQuality.h | 8 +- server/gameserver/mtb/GunTalentGrow.h | 10 +- server/gameserver/mtb/HeroQuality.h | 8 +- server/gameserver/mtb/Item.h | 20 ++-- server/gameserver/mtb/KillPoint.h | 6 +- server/gameserver/mtb/KillReward.h | 4 +- server/gameserver/mtb/Map.h | 36 +++---- server/gameserver/mtb/MapThing.h | 72 ++++++------- server/gameserver/mtb/NpcStandard.h | 10 +- server/gameserver/mtb/Parameter.h | 4 +- server/gameserver/mtb/Player.h | 98 ++++++++--------- server/gameserver/mtb/PveGemini.h | 8 +- server/gameserver/mtb/PveGeminiContent.h | 10 +- server/gameserver/mtb/PveGeminiMode.h | 16 +-- server/gameserver/mtb/RankPoint.h | 8 +- server/gameserver/mtb/RankReward.h | 6 +- server/gameserver/mtb/RankRoom.h | 20 ++-- server/gameserver/mtb/Robot.h | 14 +-- server/gameserver/mtb/SafeArea.h | 18 ++-- server/gameserver/mtb/SafeAreaPos.h | 42 ++++---- server/gameserver/mtb/Skill.h | 56 +++++----- server/gameserver/mtb/SkillNumber.h | 26 ++--- server/gameserver/mtb/Text.h | 4 +- 37 files changed, 509 insertions(+), 407 deletions(-) create mode 100644 server/gameserver/mt/Map.cc create mode 100644 server/gameserver/mt/Map.h diff --git a/server/gameserver/mt/Map.cc b/server/gameserver/mt/Map.cc new file mode 100644 index 00000000..467ea4be --- /dev/null +++ b/server/gameserver/mt/Map.cc @@ -0,0 +1,66 @@ +#include "precompile.h" + +#include "mt/Map.h" + +IMPL_TABLE(mt::Map) + +namespace mt +{ + + void Map::Init1() + { +#if DEBUG + scale_ = 0.1f; +#else +#endif + rand_space = 0; + { + std::vector strings; + a8::Split(template_list(), strings, '|'); + #if 0 + for (auto& str : strings) { + std::vector strings2; + a8::Split(str, strings2, ':'); + assert(strings2.size() == 2); + rand_space += a8::XValue(strings2[1]).GetInt(); + template_list.push_back(std::make_tuple( + strings2[0], + rand_space + )); + } + #endif + } + } + + void Map::Init2() + { + + } + + + std::string Map::RandTemplate() + { + + } + + int Map::GetCarLimit(int car_id) + { + + } + + glm::vec3 Map::GetCenter() const + { + + } + + int Map::RandSafeArea() const + { + + } + + bool Map::IsPveMap() const + { + + } + +} diff --git a/server/gameserver/mt/Map.h b/server/gameserver/mt/Map.h new file mode 100644 index 00000000..d6aa3e9d --- /dev/null +++ b/server/gameserver/mt/Map.h @@ -0,0 +1,36 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/Map.h" + +namespace mt +{ + + DECLARE_ID_TABLE(Map, mtb::Map, + "map@map.csv", + "map_id") + public: + std::vector> template_list_; + int rand_space = 0; + std::vector airdrops; + std::vector airraids; + int refresh_robot_min_num = 0; + int refresh_robot_max_num = 0; + int refresh_robot_min_time = 0; + int refresh_robot_max_time = 0; + std::vector buff_list; + glm::vec3 first_safearea_center; + std::map car_num_limit; + std::vector safearea_list; + + std::string RandTemplate(); + int GetCarLimit(int car_id); + glm::vec3 GetCenter() const; + int RandSafeArea() const; + bool IsPveMap() const; + + void Init1(); + void Init2(); + }; + +} diff --git a/server/gameserver/mt/Param.cc b/server/gameserver/mt/Param.cc index 48447cdf..ba77e944 100644 --- a/server/gameserver/mt/Param.cc +++ b/server/gameserver/mt/Param.cc @@ -172,19 +172,19 @@ namespace mt int Param::GetIntParam(const std::string& param_name, int def_val) { auto p = GetByName(param_name); - return p ? a8::XValue(p->get_param_value()).GetInt() : def_val; + return p ? a8::XValue(p->param_value()).GetInt() : def_val; } double Param::GetFloatParam(const std::string& param_name, double def_val) { auto p = GetByName(param_name); - return p ? a8::XValue(p->get_param_value()).GetDouble() : def_val; + return p ? a8::XValue(p->param_value()).GetDouble() : def_val; } std::string Param::GetStringParam(const std::string& param_name, const char* def_val) { auto p = GetByName(param_name); - return p ? a8::XValue(p->get_param_value()).GetString() : def_val; + return p ? a8::XValue(p->param_value()).GetString() : def_val; } } diff --git a/server/gameserver/mtb/AI.h b/server/gameserver/mtb/AI.h index 49187a14..305487a0 100644 --- a/server/gameserver/mtb/AI.h +++ b/server/gameserver/mtb/AI.h @@ -10,24 +10,24 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_pursuit_radius() const { return pursuit_radius_; }; - int get_attack_interval() const { return attack_interval_; }; - int get_attack_times() const { return attack_times_; }; - int get_attack_type() const { return attack_type_; }; - int get_shot_offset_angle() const { return shot_offset_angle_; }; - const std::string get_random_move_idle_time() const { return random_move_idle_time_; }; - const std::string get_random_move_time() const { return random_move_time_; }; - int get_attack_range() const { return attack_range_; }; - float get_attack_rate() const { return attack_rate_; }; - int get_ai_mode() const { return ai_mode_; }; - int get_ai_kind() const { return ai_kind_; }; - const std::string get_param1() const { return param1_; }; - const std::string get_param2() const { return param2_; }; - const std::string get_param3() const { return param3_; }; - const std::string get_param4() const { return param4_; }; - const std::string get_param5() const { return param5_; }; - int get_peace_time() const { return peace_time_; }; + int id() const { return id_; }; + int pursuit_radius() const { return pursuit_radius_; }; + int attack_interval() const { return attack_interval_; }; + int attack_times() const { return attack_times_; }; + int attack_type() const { return attack_type_; }; + int shot_offset_angle() const { return shot_offset_angle_; }; + const std::string random_move_idle_time() const { return random_move_idle_time_; }; + const std::string random_move_time() const { return random_move_time_; }; + int attack_range() const { return attack_range_; }; + float attack_rate() const { return attack_rate_; }; + int ai_mode() const { return ai_mode_; }; + int ai_kind() const { return ai_kind_; }; + const std::string param1() const { return param1_; }; + const std::string param2() const { return param2_; }; + const std::string param3() const { return param3_; }; + const std::string param4() const { return param4_; }; + const std::string param5() const { return param5_; }; + int peace_time() const { return peace_time_; }; bool has_id() const { return __flags__.test(0);}; bool has_pursuit_radius() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/AirDrop.h b/server/gameserver/mtb/AirDrop.h index 415d22a5..9f12ab16 100644 --- a/server/gameserver/mtb/AirDrop.h +++ b/server/gameserver/mtb/AirDrop.h @@ -10,10 +10,10 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_time() const { return time_; }; - int get_appear_time() const { return appear_time_; }; - const std::string get_drop_id() const { return drop_id_; }; + int id() const { return id_; }; + int time() const { return time_; }; + int appear_time() const { return appear_time_; }; + const std::string drop_id() const { return drop_id_; }; bool has_id() const { return __flags__.test(0);}; bool has_time() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/AirLine.h b/server/gameserver/mtb/AirLine.h index 0add284d..b7460574 100644 --- a/server/gameserver/mtb/AirLine.h +++ b/server/gameserver/mtb/AirLine.h @@ -10,12 +10,12 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - const std::string get_start_point() const { return start_point_; }; - const std::string get_end_point() const { return end_point_; }; - float get_plane_speed() const { return plane_speed_; }; - int get_weight() const { return weight_; }; - int get_map_id() const { return map_id_; }; + int id() const { return id_; }; + const std::string start_point() const { return start_point_; }; + const std::string end_point() const { return end_point_; }; + float plane_speed() const { return plane_speed_; }; + int weight() const { return weight_; }; + int map_id() const { return map_id_; }; bool has_id() const { return __flags__.test(0);}; bool has_start_point() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/AirRaid.h b/server/gameserver/mtb/AirRaid.h index 2f7410b0..51d20ca4 100644 --- a/server/gameserver/mtb/AirRaid.h +++ b/server/gameserver/mtb/AirRaid.h @@ -10,12 +10,12 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_time() const { return time_; }; - int get_appear_time() const { return appear_time_; }; - const std::string get_bomb_id() const { return bomb_id_; }; - const std::string get_raid_wave() const { return raid_wave_; }; - float get_rad() const { return rad_; }; + int id() const { return id_; }; + int time() const { return time_; }; + int appear_time() const { return appear_time_; }; + const std::string bomb_id() const { return bomb_id_; }; + const std::string raid_wave() const { return raid_wave_; }; + float rad() const { return rad_; }; bool has_id() const { return __flags__.test(0);}; bool has_time() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Attr.h b/server/gameserver/mtb/Attr.h index 7545727d..7b7eb664 100644 --- a/server/gameserver/mtb/Attr.h +++ b/server/gameserver/mtb/Attr.h @@ -10,9 +10,9 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_attr_id() const { return attr_id_; }; - const std::string get_attr_cname() const { return attr_cname_; }; - const std::string get_attr_ename() const { return attr_ename_; }; + int attr_id() const { return attr_id_; }; + const std::string attr_cname() const { return attr_cname_; }; + const std::string attr_ename() const { return attr_ename_; }; bool has_attr_id() const { return __flags__.test(0);}; bool has_attr_cname() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Buff.h b/server/gameserver/mtb/Buff.h index 2f012502..4ff3b219 100644 --- a/server/gameserver/mtb/Buff.h +++ b/server/gameserver/mtb/Buff.h @@ -10,37 +10,37 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_buff_id() const { return buff_id_; }; - const std::string get_name() const { return name_; }; - int get_buff_target() const { return buff_target_; }; - int get_buff_effect() const { return buff_effect_; }; - int get_trigger_type() const { return trigger_type_; }; - const std::string get_buff_param1() const { return buff_param1_; }; - const std::string get_buff_param2() const { return buff_param2_; }; - const std::string get_buff_param3() const { return buff_param3_; }; - const std::string get_buff_param4() const { return buff_param4_; }; - const std::string get_buff_param5() const { return buff_param5_; }; - float get_duration_time() const { return duration_time_; }; - float get_buff_valueup() const { return buff_valueup_; }; - const std::string get_immune_buffeffect_list() const { return immune_buffeffect_list_; }; - const std::string get_post_remove_action() const { return post_remove_action_; }; - int get_only_server() const { return only_server_; }; - int get_only_self() const { return only_self_; }; - int get_depend_effect() const { return depend_effect_; }; - const std::string get_child_buff() const { return child_buff_; }; - int get_coexist_num() const { return coexist_num_; }; - int get_dead_valid() const { return dead_valid_; }; - int get_buff_interval() const { return buff_interval_; }; - const std::string get_tag() const { return tag_; }; - int get_post_battle_valid() const { return post_battle_valid_; }; - const std::string get_only_spec_race() const { return only_spec_race_; }; - const std::string get_exclude_spec_race() const { return exclude_spec_race_; }; - int get_dead_remove() const { return dead_remove_; }; - int get_no_immune() const { return no_immune_; }; - int get_lock_move() const { return lock_move_; }; - int get_lock_dir() const { return lock_dir_; }; - int get_disable_shot() const { return disable_shot_; }; - int get_disable_useskill() const { return disable_useskill_; }; + int buff_id() const { return buff_id_; }; + const std::string name() const { return name_; }; + int buff_target() const { return buff_target_; }; + int buff_effect() const { return buff_effect_; }; + int trigger_type() const { return trigger_type_; }; + const std::string buff_param1() const { return buff_param1_; }; + const std::string buff_param2() const { return buff_param2_; }; + const std::string buff_param3() const { return buff_param3_; }; + const std::string buff_param4() const { return buff_param4_; }; + const std::string buff_param5() const { return buff_param5_; }; + float duration_time() const { return duration_time_; }; + float buff_valueup() const { return buff_valueup_; }; + const std::string immune_buffeffect_list() const { return immune_buffeffect_list_; }; + const std::string post_remove_action() const { return post_remove_action_; }; + int only_server() const { return only_server_; }; + int only_self() const { return only_self_; }; + int depend_effect() const { return depend_effect_; }; + const std::string child_buff() const { return child_buff_; }; + int coexist_num() const { return coexist_num_; }; + int dead_valid() const { return dead_valid_; }; + int buff_interval() const { return buff_interval_; }; + const std::string tag() const { return tag_; }; + int post_battle_valid() const { return post_battle_valid_; }; + const std::string only_spec_race() const { return only_spec_race_; }; + const std::string exclude_spec_race() const { return exclude_spec_race_; }; + int dead_remove() const { return dead_remove_; }; + int no_immune() const { return no_immune_; }; + int lock_move() const { return lock_move_; }; + int lock_dir() const { return lock_dir_; }; + int disable_shot() const { return disable_shot_; }; + int disable_useskill() const { return disable_useskill_; }; bool has_buff_id() const { return __flags__.test(0);}; bool has_name() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Dress.h b/server/gameserver/mtb/Dress.h index 6f5a43ca..282e2bd0 100644 --- a/server/gameserver/mtb/Dress.h +++ b/server/gameserver/mtb/Dress.h @@ -10,11 +10,11 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_level() const { return level_; }; - int get_skill_id() const { return skill_id_; }; - const std::string get_attr_type() const { return attr_type_; }; - int get_max_lv() const { return max_lv_; }; + int id() const { return id_; }; + int level() const { return level_; }; + int skill_id() const { return skill_id_; }; + const std::string attr_type() const { return attr_type_; }; + int max_lv() const { return max_lv_; }; bool has_id() const { return __flags__.test(0);}; bool has_level() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Drop.h b/server/gameserver/mtb/Drop.h index 9c399104..1a79a9ec 100644 --- a/server/gameserver/mtb/Drop.h +++ b/server/gameserver/mtb/Drop.h @@ -10,11 +10,11 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_drop_id() const { return drop_id_; }; - const std::string get_item_id() const { return item_id_; }; - const std::string get_num() const { return num_; }; - const std::string get_weight() const { return weight_; }; - int get_type() const { return type_; }; + int drop_id() const { return drop_id_; }; + const std::string item_id() const { return item_id_; }; + const std::string num() const { return num_; }; + const std::string weight() const { return weight_; }; + int type() const { return type_; }; bool has_drop_id() const { return __flags__.test(0);}; bool has_item_id() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Equip.h b/server/gameserver/mtb/Equip.h index 5ab7b7d0..ef52ff2a 100644 --- a/server/gameserver/mtb/Equip.h +++ b/server/gameserver/mtb/Equip.h @@ -10,71 +10,71 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_equip_type() const { return equip_type_; }; - int get_equip_subtype() const { return equip_subtype_; }; - int get_equip_lv() const { return equip_lv_; }; - int get_fire_mode() const { return fire_mode_; }; - int get_use_bullet() const { return use_bullet_; }; - int get_clip_volume() const { return clip_volume_; }; - int get_reload_time() const { return reload_time_; }; - int get_fire_rate() const { return fire_rate_; }; - int get_atk() const { return atk_; }; - int get_def() const { return def_; }; - int get_max_hp() const { return max_hp_; }; - int get_explosion_range() const { return explosion_range_; }; - int get_bullet_speed() const { return bullet_speed_; }; - int get_range() const { return range_; }; - int get_use_time() const { return use_time_; }; - int get_heal() const { return heal_; }; - int get_time() const { return time_; }; - const std::string get_volume() const { return volume_; }; - int get_bullet_rad() const { return bullet_rad_; }; - int get_group_num() const { return group_num_; }; - int get_is_luck() const { return is_luck_; }; - const std::string get_bullet_born_offset() const { return bullet_born_offset_; }; - float get_bullet_angle() const { return bullet_angle_; }; - const std::string get_name() const { return name_; }; - float get_rad() const { return rad_; }; - float get_rad2() const { return rad2_; }; - int get_buffid() const { return buffid_; }; - int get_drop_id() const { return drop_id_; }; - int get_explosion_effect() const { return explosion_effect_; }; - const std::string get_param1() const { return param1_; }; - const std::string get_param2() const { return param2_; }; - int get_reloadtype() const { return reloadtype_; }; - float get_recoil_force() const { return recoil_force_; }; - int get_missiles_time() const { return missiles_time_; }; - int get_heroid() const { return heroid_; }; - const std::string get_launch_dev() const { return launch_dev_; }; - const std::string get_power_time() const { return power_time_; }; - const std::string get_power_gun() const { return power_gun_; }; - const std::string get_power_buff() const { return power_buff_; }; - int get_through_teammate() const { return through_teammate_; }; - const std::string get_text_icon() const { return text_icon_; }; - const std::string get_special_damage_type() const { return special_damage_type_; }; - float get_max_oil() const { return max_oil_; }; - float get_average_oil() const { return average_oil_; }; - float get_atk_mech() const { return atk_mech_; }; - int get_use_scene() const { return use_scene_; }; - int get_ispenetrate() const { return ispenetrate_; }; - int get_is_penetrate_thing() const { return is_penetrate_thing_; }; - int get_reload_delay_time() const { return reload_delay_time_; }; - int get_cast_time() const { return cast_time_; }; - int get_aiming_cast_time() const { return aiming_cast_time_; }; - int get_auto_switch_weapon_time() const { return auto_switch_weapon_time_; }; - int get_quality() const { return quality_; }; - int get_explosion_damage_delay() const { return explosion_damage_delay_; }; - int get_bullet_consume_type() const { return bullet_consume_type_; }; - const std::string get_inventory_slot() const { return inventory_slot_; }; - int get__inventory_slot() const { return _inventory_slot_; }; - float get_critical() const { return critical_; }; - float get_cri_damage() const { return cri_damage_; }; - int get_shootfire() const { return shootfire_; }; - const std::string get_hit_buff() const { return hit_buff_; }; - int get_auto_trace() const { return auto_trace_; }; - int get_trace_range() const { return trace_range_; }; - int get_double_gun() const { return double_gun_; }; + int id() const { return id_; }; + int equip_type() const { return equip_type_; }; + int equip_subtype() const { return equip_subtype_; }; + int equip_lv() const { return equip_lv_; }; + int fire_mode() const { return fire_mode_; }; + int use_bullet() const { return use_bullet_; }; + int clip_volume() const { return clip_volume_; }; + int reload_time() const { return reload_time_; }; + int fire_rate() const { return fire_rate_; }; + int atk() const { return atk_; }; + int def() const { return def_; }; + int max_hp() const { return max_hp_; }; + int explosion_range() const { return explosion_range_; }; + int bullet_speed() const { return bullet_speed_; }; + int range() const { return range_; }; + int use_time() const { return use_time_; }; + int heal() const { return heal_; }; + int time() const { return time_; }; + const std::string volume() const { return volume_; }; + int bullet_rad() const { return bullet_rad_; }; + int group_num() const { return group_num_; }; + int is_luck() const { return is_luck_; }; + const std::string bullet_born_offset() const { return bullet_born_offset_; }; + float bullet_angle() const { return bullet_angle_; }; + const std::string name() const { return name_; }; + float rad() const { return rad_; }; + float rad2() const { return rad2_; }; + int buffid() const { return buffid_; }; + int drop_id() const { return drop_id_; }; + int explosion_effect() const { return explosion_effect_; }; + const std::string param1() const { return param1_; }; + const std::string param2() const { return param2_; }; + int reloadtype() const { return reloadtype_; }; + float recoil_force() const { return recoil_force_; }; + int missiles_time() const { return missiles_time_; }; + int heroid() const { return heroid_; }; + const std::string launch_dev() const { return launch_dev_; }; + const std::string power_time() const { return power_time_; }; + const std::string power_gun() const { return power_gun_; }; + const std::string power_buff() const { return power_buff_; }; + int through_teammate() const { return through_teammate_; }; + const std::string text_icon() const { return text_icon_; }; + const std::string special_damage_type() const { return special_damage_type_; }; + float max_oil() const { return max_oil_; }; + float average_oil() const { return average_oil_; }; + float atk_mech() const { return atk_mech_; }; + int use_scene() const { return use_scene_; }; + int ispenetrate() const { return ispenetrate_; }; + int is_penetrate_thing() const { return is_penetrate_thing_; }; + int reload_delay_time() const { return reload_delay_time_; }; + int cast_time() const { return cast_time_; }; + int aiming_cast_time() const { return aiming_cast_time_; }; + int auto_switch_weapon_time() const { return auto_switch_weapon_time_; }; + int quality() const { return quality_; }; + int explosion_damage_delay() const { return explosion_damage_delay_; }; + int bullet_consume_type() const { return bullet_consume_type_; }; + const std::string inventory_slot() const { return inventory_slot_; }; + int _inventory_slot() const { return _inventory_slot_; }; + float critical() const { return critical_; }; + float cri_damage() const { return cri_damage_; }; + int shootfire() const { return shootfire_; }; + const std::string hit_buff() const { return hit_buff_; }; + int auto_trace() const { return auto_trace_; }; + int trace_range() const { return trace_range_; }; + int double_gun() const { return double_gun_; }; bool has_id() const { return __flags__.test(0);}; bool has_equip_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/EquipUpgrade.h b/server/gameserver/mtb/EquipUpgrade.h index 08a4ade2..6833b070 100644 --- a/server/gameserver/mtb/EquipUpgrade.h +++ b/server/gameserver/mtb/EquipUpgrade.h @@ -10,9 +10,9 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - const std::string get_attr_type() const { return attr_type_; }; - const std::string get_spera_attr() const { return spera_attr_; }; + int id() const { return id_; }; + const std::string attr_type() const { return attr_type_; }; + const std::string spera_attr() const { return spera_attr_; }; bool has_id() const { return __flags__.test(0);}; bool has_attr_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/FormulaPvp.h b/server/gameserver/mtb/FormulaPvp.h index c6abdc67..37e11b1a 100644 --- a/server/gameserver/mtb/FormulaPvp.h +++ b/server/gameserver/mtb/FormulaPvp.h @@ -10,12 +10,12 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - float get_top() const { return top_; }; - float get_ranked_topx() const { return ranked_topx_; }; - float get_kills_topx() const { return kills_topx_; }; - float get_hero_topx() const { return hero_topx_; }; - float get_weapon_topx() const { return weapon_topx_; }; - float get_survival_topx() const { return survival_topx_; }; + float top() const { return top_; }; + float ranked_topx() const { return ranked_topx_; }; + float kills_topx() const { return kills_topx_; }; + float hero_topx() const { return hero_topx_; }; + float weapon_topx() const { return weapon_topx_; }; + float survival_topx() const { return survival_topx_; }; bool has_top() const { return __flags__.test(0);}; bool has_ranked_topx() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/GunQuality.h b/server/gameserver/mtb/GunQuality.h index f3cc6831..927c11b2 100644 --- a/server/gameserver/mtb/GunQuality.h +++ b/server/gameserver/mtb/GunQuality.h @@ -10,10 +10,10 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_quality() const { return quality_; }; - int get_gold_limit() const { return gold_limit_; }; - int get_lucky() const { return lucky_; }; + int id() const { return id_; }; + int quality() const { return quality_; }; + int gold_limit() const { return gold_limit_; }; + int lucky() const { return lucky_; }; bool has_id() const { return __flags__.test(0);}; bool has_quality() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/GunTalentGrow.h b/server/gameserver/mtb/GunTalentGrow.h index b731e635..e4244198 100644 --- a/server/gameserver/mtb/GunTalentGrow.h +++ b/server/gameserver/mtb/GunTalentGrow.h @@ -10,11 +10,11 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_talent_id() const { return talent_id_; }; - int get_talent_lv() const { return talent_lv_; }; - int get_addtype() const { return addtype_; }; - const std::string get_addattr() const { return addattr_; }; + int id() const { return id_; }; + int talent_id() const { return talent_id_; }; + int talent_lv() const { return talent_lv_; }; + int addtype() const { return addtype_; }; + const std::string addattr() const { return addattr_; }; bool has_id() const { return __flags__.test(0);}; bool has_talent_id() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/HeroQuality.h b/server/gameserver/mtb/HeroQuality.h index debbd143..b87eae61 100644 --- a/server/gameserver/mtb/HeroQuality.h +++ b/server/gameserver/mtb/HeroQuality.h @@ -10,10 +10,10 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_quality() const { return quality_; }; - int get_gold_limit() const { return gold_limit_; }; - int get_lucky() const { return lucky_; }; + int id() const { return id_; }; + int quality() const { return quality_; }; + int gold_limit() const { return gold_limit_; }; + int lucky() const { return lucky_; }; bool has_id() const { return __flags__.test(0);}; bool has_quality() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Item.h b/server/gameserver/mtb/Item.h index facfdfa9..d7dad66a 100644 --- a/server/gameserver/mtb/Item.h +++ b/server/gameserver/mtb/Item.h @@ -10,16 +10,16 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_type() const { return type_; }; - int get_sub_type() const { return sub_type_; }; - int get_quality() const { return quality_; }; - int get_use() const { return use_; }; - int get_skinid() const { return skinid_; }; - int get_isdefaultskin() const { return isdefaultskin_; }; - int get_playerid() const { return playerid_; }; - int get_relationship() const { return relationship_; }; - const std::string get_name() const { return name_; }; + int id() const { return id_; }; + int type() const { return type_; }; + int sub_type() const { return sub_type_; }; + int quality() const { return quality_; }; + int use() const { return use_; }; + int skinid() const { return skinid_; }; + int isdefaultskin() const { return isdefaultskin_; }; + int playerid() const { return playerid_; }; + int relationship() const { return relationship_; }; + const std::string name() const { return name_; }; bool has_id() const { return __flags__.test(0);}; bool has_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/KillPoint.h b/server/gameserver/mtb/KillPoint.h index fc67787c..0d81d465 100644 --- a/server/gameserver/mtb/KillPoint.h +++ b/server/gameserver/mtb/KillPoint.h @@ -10,9 +10,9 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_kill_num() const { return kill_num_; }; - int get_parameter() const { return parameter_; }; - int get_parameter2() const { return parameter2_; }; + int kill_num() const { return kill_num_; }; + int parameter() const { return parameter_; }; + int parameter2() const { return parameter2_; }; bool has_kill_num() const { return __flags__.test(0);}; bool has_parameter() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/KillReward.h b/server/gameserver/mtb/KillReward.h index 7441657d..bc9b9015 100644 --- a/server/gameserver/mtb/KillReward.h +++ b/server/gameserver/mtb/KillReward.h @@ -10,8 +10,8 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_kill_num() const { return kill_num_; }; - float get_parameter() const { return parameter_; }; + int kill_num() const { return kill_num_; }; + float parameter() const { return parameter_; }; bool has_kill_num() const { return __flags__.test(0);}; bool has_parameter() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Map.h b/server/gameserver/mtb/Map.h index a5f7de74..48b8c577 100644 --- a/server/gameserver/mtb/Map.h +++ b/server/gameserver/mtb/Map.h @@ -10,24 +10,24 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_map_id() const { return map_id_; }; - const std::string get_template_list() const { return template_list_; }; - const std::string get_map_name() const { return map_name_; }; - float get_map_width() const { return map_width_; }; - float get_map_height() const { return map_height_; }; - const std::string get_airdrops() const { return airdrops_; }; - int get_terminator_airdrop() const { return terminator_airdrop_; }; - int get_player() const { return player_; }; - const std::string get_refresh_robot() const { return refresh_robot_; }; - int get_map_mode() const { return map_mode_; }; - const std::string get_safearea() const { return safearea_; }; - const std::string get_game_start_buff_list() const { return game_start_buff_list_; }; - const std::string get_map_pic() const { return map_pic_; }; - const std::string get_first_safearea_center() const { return first_safearea_center_; }; - int get_init_gas_ring() const { return init_gas_ring_; }; - const std::string get_airraids() const { return airraids_; }; - const std::string get_car_num_limit() const { return car_num_limit_; }; - float get_scale() const { return scale_; }; + int map_id() const { return map_id_; }; + const std::string template_list() const { return template_list_; }; + const std::string map_name() const { return map_name_; }; + float map_width() const { return map_width_; }; + float map_height() const { return map_height_; }; + const std::string airdrops() const { return airdrops_; }; + int terminator_airdrop() const { return terminator_airdrop_; }; + int player() const { return player_; }; + const std::string refresh_robot() const { return refresh_robot_; }; + int map_mode() const { return map_mode_; }; + const std::string safearea() const { return safearea_; }; + const std::string game_start_buff_list() const { return game_start_buff_list_; }; + const std::string map_pic() const { return map_pic_; }; + const std::string first_safearea_center() const { return first_safearea_center_; }; + int init_gas_ring() const { return init_gas_ring_; }; + const std::string airraids() const { return airraids_; }; + const std::string car_num_limit() const { return car_num_limit_; }; + float scale() const { return scale_; }; bool has_map_id() const { return __flags__.test(0);}; bool has_template_list() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/MapThing.h b/server/gameserver/mtb/MapThing.h index b5b73f6f..8e966582 100644 --- a/server/gameserver/mtb/MapThing.h +++ b/server/gameserver/mtb/MapThing.h @@ -10,42 +10,42 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_thing_id() const { return thing_id_; }; - int get_thing_type() const { return thing_type_; }; - int get_time() const { return time_; }; - int get_type() const { return type_; }; - int get_height() const { return height_; }; - int get_width() const { return width_; }; - int get_hp() const { return hp_; }; - float get_damage() const { return damage_; }; - float get_damage_dia() const { return damage_dia_; }; - const std::string get_drop() const { return drop_; }; - int get_is_door() const { return is_door_; }; - int get_is_house() const { return is_house_; }; - int get_is_tree() const { return is_tree_; }; - int get_house_id() const { return house_id_; }; - const std::string get_buff_list() const { return buff_list_; }; - int get_explosion_effect() const { return explosion_effect_; }; - int get_explosion_interval() const { return explosion_interval_; }; - int get_explosion_dmg_delay() const { return explosion_dmg_delay_; }; - int get_explosion_times() const { return explosion_times_; }; - int get_explosion_float() const { return explosion_float_; }; - const std::string get_preexplosion_summon() const { return preexplosion_summon_; }; - const std::string get_monster_list() const { return monster_list_; }; - const std::string get_special_damage_type() const { return special_damage_type_; }; - const std::string get_receive_special_damage_type() const { return receive_special_damage_type_; }; - const std::string get_param1() const { return param1_; }; - const std::string get_param2() const { return param2_; }; - int get_interaction_mode() const { return interaction_mode_; }; - int get_view_mode() const { return view_mode_; }; - int get_bullet_hit() const { return bullet_hit_; }; - int get_collision_hit() const { return collision_hit_; }; - int get_explosion_hit() const { return explosion_hit_; }; - const std::string get_sweep_tags() const { return sweep_tags_; }; - int get_prebattle_hide() const { return prebattle_hide_; }; - int get_life_time() const { return life_time_; }; - int get_summon_born_rad() const { return summon_born_rad_; }; - const std::string get_shapes() const { return shapes_; }; + int thing_id() const { return thing_id_; }; + int thing_type() const { return thing_type_; }; + int time() const { return time_; }; + int type() const { return type_; }; + int height() const { return height_; }; + int width() const { return width_; }; + int hp() const { return hp_; }; + float damage() const { return damage_; }; + float damage_dia() const { return damage_dia_; }; + const std::string drop() const { return drop_; }; + int is_door() const { return is_door_; }; + int is_house() const { return is_house_; }; + int is_tree() const { return is_tree_; }; + int house_id() const { return house_id_; }; + const std::string buff_list() const { return buff_list_; }; + int explosion_effect() const { return explosion_effect_; }; + int explosion_interval() const { return explosion_interval_; }; + int explosion_dmg_delay() const { return explosion_dmg_delay_; }; + int explosion_times() const { return explosion_times_; }; + int explosion_float() const { return explosion_float_; }; + const std::string preexplosion_summon() const { return preexplosion_summon_; }; + const std::string monster_list() const { return monster_list_; }; + const std::string special_damage_type() const { return special_damage_type_; }; + const std::string receive_special_damage_type() const { return receive_special_damage_type_; }; + const std::string param1() const { return param1_; }; + const std::string param2() const { return param2_; }; + int interaction_mode() const { return interaction_mode_; }; + int view_mode() const { return view_mode_; }; + int bullet_hit() const { return bullet_hit_; }; + int collision_hit() const { return collision_hit_; }; + int explosion_hit() const { return explosion_hit_; }; + const std::string sweep_tags() const { return sweep_tags_; }; + int prebattle_hide() const { return prebattle_hide_; }; + int life_time() const { return life_time_; }; + int summon_born_rad() const { return summon_born_rad_; }; + const std::string shapes() const { return shapes_; }; bool has_thing_id() const { return __flags__.test(0);}; bool has_thing_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/NpcStandard.h b/server/gameserver/mtb/NpcStandard.h index dd5c3183..db7dcd6f 100644 --- a/server/gameserver/mtb/NpcStandard.h +++ b/server/gameserver/mtb/NpcStandard.h @@ -10,11 +10,11 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_quality() const { return quality_; }; - int get_hp() const { return hp_; }; - int get_damage() const { return damage_; }; - int get_defence() const { return defence_; }; + int id() const { return id_; }; + int quality() const { return quality_; }; + int hp() const { return hp_; }; + int damage() const { return damage_; }; + int defence() const { return defence_; }; bool has_id() const { return __flags__.test(0);}; bool has_quality() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Parameter.h b/server/gameserver/mtb/Parameter.h index cc2030b4..18e40942 100644 --- a/server/gameserver/mtb/Parameter.h +++ b/server/gameserver/mtb/Parameter.h @@ -10,8 +10,8 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - const std::string get_param_name() const { return param_name_; }; - const std::string get_param_value() const { return param_value_; }; + const std::string param_name() const { return param_name_; }; + const std::string param_value() const { return param_value_; }; bool has_param_name() const { return __flags__.test(0);}; bool has_param_value() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Player.h b/server/gameserver/mtb/Player.h index 59aaa3d6..2b644994 100644 --- a/server/gameserver/mtb/Player.h +++ b/server/gameserver/mtb/Player.h @@ -10,55 +10,55 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - float get_move_offset_x() const { return move_offset_x_; }; - float get_move_offset_y() const { return move_offset_y_; }; - float get_radius() const { return radius_; }; - int get_move_speed() const { return move_speed_; }; - int get_jump_speed() const { return jump_speed_; }; - int get_move_speed3() const { return move_speed3_; }; - int get_shot_speed() const { return shot_speed_; }; - int get_aiming_speed() const { return aiming_speed_; }; - int get_move_speed4() const { return move_speed4_; }; - int get_reload_speed() const { return reload_speed_; }; - int get_useitem_speed() const { return useitem_speed_; }; - const std::string get_volume() const { return volume_; }; - int get_level() const { return level_; }; - int get_race() const { return race_; }; - int get_active_skill() const { return active_skill_; }; - int get_passive_skill() const { return passive_skill_; }; - int get_exp() const { return exp_; }; - int get_dead_exp() const { return dead_exp_; }; - int get_killer_exp() const { return killer_exp_; }; - int get_revive_time() const { return revive_time_; }; - const std::string get_name() const { return name_; }; - int get_normal_skill() const { return normal_skill_; }; - float get_hit_offset_x() const { return hit_offset_x_; }; - float get_hit_offset_y() const { return hit_offset_y_; }; - float get_hit_radius() const { return hit_radius_; }; - const std::string get_ai_script() const { return ai_script_; }; - const std::string get_init_buffs() const { return init_buffs_; }; - int get_default_weapon() const { return default_weapon_; }; - const std::string get_dead_drop() const { return dead_drop_; }; - int get_delay_delete() const { return delay_delete_; }; - int get_ai() const { return ai_; }; - int get_delay_remove() const { return delay_remove_; }; - int get_skinlist() const { return skinlist_; }; - const std::string get_pre_appear_effect() const { return pre_appear_effect_; }; - const std::string get_pve_score() const { return pve_score_; }; - int get_hp() const { return hp_; }; - int get_damage() const { return damage_; }; - int get_defence() const { return defence_; }; - float get_crit_atk() const { return crit_atk_; }; - float get_crit_atk_ratio() const { return crit_atk_ratio_; }; - float get_miss() const { return miss_; }; - float get_miss_damage_ruduce() const { return miss_damage_ruduce_; }; - int get_skill1list() const { return skill1list_; }; - int get_skill2list() const { return skill2list_; }; - int get_skill3list() const { return skill3list_; }; - float get_hp_ratio() const { return hp_ratio_; }; - float get_damage_ratio() const { return damage_ratio_; }; - float get_defence_ratio() const { return defence_ratio_; }; + int id() const { return id_; }; + float move_offset_x() const { return move_offset_x_; }; + float move_offset_y() const { return move_offset_y_; }; + float radius() const { return radius_; }; + int move_speed() const { return move_speed_; }; + int jump_speed() const { return jump_speed_; }; + int move_speed3() const { return move_speed3_; }; + int shot_speed() const { return shot_speed_; }; + int aiming_speed() const { return aiming_speed_; }; + int move_speed4() const { return move_speed4_; }; + int reload_speed() const { return reload_speed_; }; + int useitem_speed() const { return useitem_speed_; }; + const std::string volume() const { return volume_; }; + int level() const { return level_; }; + int race() const { return race_; }; + int active_skill() const { return active_skill_; }; + int passive_skill() const { return passive_skill_; }; + int exp() const { return exp_; }; + int dead_exp() const { return dead_exp_; }; + int killer_exp() const { return killer_exp_; }; + int revive_time() const { return revive_time_; }; + const std::string name() const { return name_; }; + int normal_skill() const { return normal_skill_; }; + float hit_offset_x() const { return hit_offset_x_; }; + float hit_offset_y() const { return hit_offset_y_; }; + float hit_radius() const { return hit_radius_; }; + const std::string ai_script() const { return ai_script_; }; + const std::string init_buffs() const { return init_buffs_; }; + int default_weapon() const { return default_weapon_; }; + const std::string dead_drop() const { return dead_drop_; }; + int delay_delete() const { return delay_delete_; }; + int ai() const { return ai_; }; + int delay_remove() const { return delay_remove_; }; + int skinlist() const { return skinlist_; }; + const std::string pre_appear_effect() const { return pre_appear_effect_; }; + const std::string pve_score() const { return pve_score_; }; + int hp() const { return hp_; }; + int damage() const { return damage_; }; + int defence() const { return defence_; }; + float crit_atk() const { return crit_atk_; }; + float crit_atk_ratio() const { return crit_atk_ratio_; }; + float miss() const { return miss_; }; + float miss_damage_ruduce() const { return miss_damage_ruduce_; }; + int skill1list() const { return skill1list_; }; + int skill2list() const { return skill2list_; }; + int skill3list() const { return skill3list_; }; + float hp_ratio() const { return hp_ratio_; }; + float damage_ratio() const { return damage_ratio_; }; + float defence_ratio() const { return defence_ratio_; }; bool has_id() const { return __flags__.test(0);}; bool has_move_offset_x() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/PveGemini.h b/server/gameserver/mtb/PveGemini.h index 2c597338..2155c69d 100644 --- a/server/gameserver/mtb/PveGemini.h +++ b/server/gameserver/mtb/PveGemini.h @@ -10,10 +10,10 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_gemini_id() const { return gemini_id_; }; - int get_gemini_lv() const { return gemini_lv_; }; - int get_gemini_limit() const { return gemini_limit_; }; - const std::string get_multiplayer_enemy_hp_mul() const { return multiplayer_enemy_hp_mul_; }; + int gemini_id() const { return gemini_id_; }; + int gemini_lv() const { return gemini_lv_; }; + int gemini_limit() const { return gemini_limit_; }; + const std::string multiplayer_enemy_hp_mul() const { return multiplayer_enemy_hp_mul_; }; bool has_gemini_id() const { return __flags__.test(0);}; bool has_gemini_lv() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/PveGeminiContent.h b/server/gameserver/mtb/PveGeminiContent.h index f14ef375..c6380234 100644 --- a/server/gameserver/mtb/PveGeminiContent.h +++ b/server/gameserver/mtb/PveGeminiContent.h @@ -10,11 +10,11 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_mode_id() const { return mode_id_; }; - int get_round() const { return round_; }; - const std::string get_spawn_point() const { return spawn_point_; }; - const std::string get_enemy_id() const { return enemy_id_; }; + int id() const { return id_; }; + int mode_id() const { return mode_id_; }; + int round() const { return round_; }; + const std::string spawn_point() const { return spawn_point_; }; + const std::string enemy_id() const { return enemy_id_; }; bool has_id() const { return __flags__.test(0);}; bool has_mode_id() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/PveGeminiMode.h b/server/gameserver/mtb/PveGeminiMode.h index 36782cc0..8e767754 100644 --- a/server/gameserver/mtb/PveGeminiMode.h +++ b/server/gameserver/mtb/PveGeminiMode.h @@ -10,14 +10,14 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_map_id() const { return map_id_; }; - const std::string get_mode_time() const { return mode_time_; }; - const std::string get_area() const { return area_; }; - const std::string get_score_reward() const { return score_reward_; }; - const std::string get_round_score() const { return round_score_; }; - const std::string get_next_door() const { return next_door_; }; - int get_wave_prepare_time() const { return wave_prepare_time_; }; + int id() const { return id_; }; + int map_id() const { return map_id_; }; + const std::string mode_time() const { return mode_time_; }; + const std::string area() const { return area_; }; + const std::string score_reward() const { return score_reward_; }; + const std::string round_score() const { return round_score_; }; + const std::string next_door() const { return next_door_; }; + int wave_prepare_time() const { return wave_prepare_time_; }; bool has_id() const { return __flags__.test(0);}; bool has_map_id() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/RankPoint.h b/server/gameserver/mtb/RankPoint.h index d0ead6fc..f3226ac6 100644 --- a/server/gameserver/mtb/RankPoint.h +++ b/server/gameserver/mtb/RankPoint.h @@ -10,10 +10,10 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_rank() const { return rank_; }; - int get_parameter() const { return parameter_; }; - int get_parameter2() const { return parameter2_; }; - int get_parameter3() const { return parameter3_; }; + int rank() const { return rank_; }; + int parameter() const { return parameter_; }; + int parameter2() const { return parameter2_; }; + int parameter3() const { return parameter3_; }; bool has_rank() const { return __flags__.test(0);}; bool has_parameter() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/RankReward.h b/server/gameserver/mtb/RankReward.h index 56b8e5cd..ef73fb71 100644 --- a/server/gameserver/mtb/RankReward.h +++ b/server/gameserver/mtb/RankReward.h @@ -10,9 +10,9 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_rank() const { return rank_; }; - float get_parameter() const { return parameter_; }; - int get_drop() const { return drop_; }; + int rank() const { return rank_; }; + float parameter() const { return parameter_; }; + int drop() const { return drop_; }; bool has_rank() const { return __flags__.test(0);}; bool has_parameter() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/RankRoom.h b/server/gameserver/mtb/RankRoom.h index 436ee4a6..060284e7 100644 --- a/server/gameserver/mtb/RankRoom.h +++ b/server/gameserver/mtb/RankRoom.h @@ -10,16 +10,16 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_elo_min() const { return elo_min_; }; - int get_elo_max() const { return elo_max_; }; - int get_elo_expansion1() const { return elo_expansion1_; }; - int get_elo_expansion2() const { return elo_expansion2_; }; - int get_expand_time1() const { return expand_time1_; }; - int get_expand_time2() const { return expand_time2_; }; - int get_player_num_standard() const { return player_num_standard_; }; - int get_final_time() const { return final_time_; }; - int get_final_player_num() const { return final_player_num_; }; + int id() const { return id_; }; + int elo_min() const { return elo_min_; }; + int elo_max() const { return elo_max_; }; + int elo_expansion1() const { return elo_expansion1_; }; + int elo_expansion2() const { return elo_expansion2_; }; + int expand_time1() const { return expand_time1_; }; + int expand_time2() const { return expand_time2_; }; + int player_num_standard() const { return player_num_standard_; }; + int final_time() const { return final_time_; }; + int final_player_num() const { return final_player_num_; }; bool has_id() const { return __flags__.test(0);}; bool has_elo_min() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Robot.h b/server/gameserver/mtb/Robot.h index e5616673..2fe602a2 100644 --- a/server/gameserver/mtb/Robot.h +++ b/server/gameserver/mtb/Robot.h @@ -10,13 +10,13 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - const std::string get_name() const { return name_; }; - int get_hero_id() const { return hero_id_; }; - const std::string get_skin_id() const { return skin_id_; }; - int get_weapon_id() const { return weapon_id_; }; - int get_weapon_lv() const { return weapon_lv_; }; - int get_sex() const { return sex_; }; + int id() const { return id_; }; + const std::string name() const { return name_; }; + int hero_id() const { return hero_id_; }; + const std::string skin_id() const { return skin_id_; }; + int weapon_id() const { return weapon_id_; }; + int weapon_lv() const { return weapon_lv_; }; + int sex() const { return sex_; }; bool has_id() const { return __flags__.test(0);}; bool has_name() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/SafeArea.h b/server/gameserver/mtb/SafeArea.h index 72cd3c6d..32b84d4d 100644 --- a/server/gameserver/mtb/SafeArea.h +++ b/server/gameserver/mtb/SafeArea.h @@ -10,15 +10,15 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_level() const { return level_; }; - int get_rad() const { return rad_; }; - int get_wait_time() const { return wait_time_; }; - int get_shrink_speed() const { return shrink_speed_; }; - float get_hurt() const { return hurt_; }; - int get_type() const { return type_; }; - int get_x1() const { return x1_; }; - int get_y1() const { return y1_; }; + int id() const { return id_; }; + int level() const { return level_; }; + int rad() const { return rad_; }; + int wait_time() const { return wait_time_; }; + int shrink_speed() const { return shrink_speed_; }; + float hurt() const { return hurt_; }; + int type() const { return type_; }; + int x1() const { return x1_; }; + int y1() const { return y1_; }; bool has_id() const { return __flags__.test(0);}; bool has_level() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/SafeAreaPos.h b/server/gameserver/mtb/SafeAreaPos.h index 708ee005..29830fdd 100644 --- a/server/gameserver/mtb/SafeAreaPos.h +++ b/server/gameserver/mtb/SafeAreaPos.h @@ -10,27 +10,27 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_id() const { return id_; }; - int get_x1() const { return x1_; }; - int get_y1() const { return y1_; }; - int get_x2() const { return x2_; }; - int get_y2() const { return y2_; }; - int get_x3() const { return x3_; }; - int get_y3() const { return y3_; }; - int get_x4() const { return x4_; }; - int get_y4() const { return y4_; }; - int get_x5() const { return x5_; }; - int get_y5() const { return y5_; }; - int get_x6() const { return x6_; }; - int get_y6() const { return y6_; }; - int get_x7() const { return x7_; }; - int get_y7() const { return y7_; }; - int get_x8() const { return x8_; }; - int get_y8() const { return y8_; }; - int get_x9() const { return x9_; }; - int get_y9() const { return y9_; }; - int get_x10() const { return x10_; }; - int get_y10() const { return y10_; }; + int id() const { return id_; }; + int x1() const { return x1_; }; + int y1() const { return y1_; }; + int x2() const { return x2_; }; + int y2() const { return y2_; }; + int x3() const { return x3_; }; + int y3() const { return y3_; }; + int x4() const { return x4_; }; + int y4() const { return y4_; }; + int x5() const { return x5_; }; + int y5() const { return y5_; }; + int x6() const { return x6_; }; + int y6() const { return y6_; }; + int x7() const { return x7_; }; + int y7() const { return y7_; }; + int x8() const { return x8_; }; + int y8() const { return y8_; }; + int x9() const { return x9_; }; + int y9() const { return y9_; }; + int x10() const { return x10_; }; + int y10() const { return y10_; }; bool has_id() const { return __flags__.test(0);}; bool has_x1() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Skill.h b/server/gameserver/mtb/Skill.h index a19cece8..8f0508d3 100644 --- a/server/gameserver/mtb/Skill.h +++ b/server/gameserver/mtb/Skill.h @@ -10,34 +10,34 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_skill_id() const { return skill_id_; }; - int get_skill_type() const { return skill_type_; }; - const std::string get_value_up() const { return value_up_; }; - int get_skill_cd() const { return skill_cd_; }; - int get_skill_target() const { return skill_target_; }; - const std::string get_buff_list() const { return buff_list_; }; - float get_skill_distance() const { return skill_distance_; }; - int get_cold_time_up() const { return cold_time_up_; }; - int get_max_times() const { return max_times_; }; - int get_phase1_time_offset() const { return phase1_time_offset_; }; - int get_phase1_func() const { return phase1_func_; }; - const std::string get_phase1_param1() const { return phase1_param1_; }; - const std::string get_phase1_param2() const { return phase1_param2_; }; - const std::string get_phase1_param3() const { return phase1_param3_; }; - int get_phase2_time_offset() const { return phase2_time_offset_; }; - int get_phase2_func() const { return phase2_func_; }; - const std::string get_phase2_param1() const { return phase2_param1_; }; - const std::string get_phase2_param2() const { return phase2_param2_; }; - const std::string get_phase2_param3() const { return phase2_param3_; }; - int get_phase3_time_offset() const { return phase3_time_offset_; }; - int get_phase3_func() const { return phase3_func_; }; - const std::string get_phase3_param1() const { return phase3_param1_; }; - const std::string get_phase3_param2() const { return phase3_param2_; }; - const std::string get_phase3_param3() const { return phase3_param3_; }; - int get_cast_time() const { return cast_time_; }; - int get_up_exp() const { return up_exp_; }; - int get_nextlv_skill() const { return nextlv_skill_; }; - int get_attack_dir_lock_time() const { return attack_dir_lock_time_; }; + int skill_id() const { return skill_id_; }; + int skill_type() const { return skill_type_; }; + const std::string value_up() const { return value_up_; }; + int skill_cd() const { return skill_cd_; }; + int skill_target() const { return skill_target_; }; + const std::string buff_list() const { return buff_list_; }; + float skill_distance() const { return skill_distance_; }; + int cold_time_up() const { return cold_time_up_; }; + int max_times() const { return max_times_; }; + int phase1_time_offset() const { return phase1_time_offset_; }; + int phase1_func() const { return phase1_func_; }; + const std::string phase1_param1() const { return phase1_param1_; }; + const std::string phase1_param2() const { return phase1_param2_; }; + const std::string phase1_param3() const { return phase1_param3_; }; + int phase2_time_offset() const { return phase2_time_offset_; }; + int phase2_func() const { return phase2_func_; }; + const std::string phase2_param1() const { return phase2_param1_; }; + const std::string phase2_param2() const { return phase2_param2_; }; + const std::string phase2_param3() const { return phase2_param3_; }; + int phase3_time_offset() const { return phase3_time_offset_; }; + int phase3_func() const { return phase3_func_; }; + const std::string phase3_param1() const { return phase3_param1_; }; + const std::string phase3_param2() const { return phase3_param2_; }; + const std::string phase3_param3() const { return phase3_param3_; }; + int cast_time() const { return cast_time_; }; + int up_exp() const { return up_exp_; }; + int nextlv_skill() const { return nextlv_skill_; }; + int attack_dir_lock_time() const { return attack_dir_lock_time_; }; bool has_skill_id() const { return __flags__.test(0);}; bool has_skill_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/SkillNumber.h b/server/gameserver/mtb/SkillNumber.h index 34831331..90bf4cde 100644 --- a/server/gameserver/mtb/SkillNumber.h +++ b/server/gameserver/mtb/SkillNumber.h @@ -10,19 +10,19 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - int get_skill_id() const { return skill_id_; }; - int get_skill_type() const { return skill_type_; }; - const std::string get_ratio() const { return ratio_; }; - const std::string get_ratio2() const { return ratio2_; }; - const std::string get_speed() const { return speed_; }; - const std::string get_range() const { return range_; }; - const std::string get_range2() const { return range2_; }; - const std::string get_probability() const { return probability_; }; - const std::string get_time() const { return time_; }; - const std::string get_cd() const { return cd_; }; - int get_buff_id() const { return buff_id_; }; - float get_buff_time() const { return buff_time_; }; - int get_explosion_effect() const { return explosion_effect_; }; + int skill_id() const { return skill_id_; }; + int skill_type() const { return skill_type_; }; + const std::string ratio() const { return ratio_; }; + const std::string ratio2() const { return ratio2_; }; + const std::string speed() const { return speed_; }; + const std::string range() const { return range_; }; + const std::string range2() const { return range2_; }; + const std::string probability() const { return probability_; }; + const std::string time() const { return time_; }; + const std::string cd() const { return cd_; }; + int buff_id() const { return buff_id_; }; + float buff_time() const { return buff_time_; }; + int explosion_effect() const { return explosion_effect_; }; bool has_skill_id() const { return __flags__.test(0);}; bool has_skill_type() const { return __flags__.test(1);}; diff --git a/server/gameserver/mtb/Text.h b/server/gameserver/mtb/Text.h index 660de64e..50e4883e 100644 --- a/server/gameserver/mtb/Text.h +++ b/server/gameserver/mtb/Text.h @@ -10,8 +10,8 @@ namespace mtb public: a8::reflect::Class* GetClass() const; - const std::string get_textid() const { return textid_; }; - const std::string get_text() const { return text_; }; + const std::string textid() const { return textid_; }; + const std::string text() const { return text_; }; bool has_textid() const { return __flags__.test(0);}; bool has_text() const { return __flags__.test(1);};