diff --git a/server/gameserver/mt/Dress.cc b/server/gameserver/mt/Dress.cc index e69de29b..c5aae4dd 100644 --- a/server/gameserver/mt/Dress.cc +++ b/server/gameserver/mt/Dress.cc @@ -0,0 +1,10 @@ +#include "precompile.h" + +#include "mt/Dress.h" + +IMPL_TABLE(mt::Dress) + +namespace mt +{ + +} diff --git a/server/gameserver/mt/Dress.h b/server/gameserver/mt/Dress.h index e69de29b..7f700587 100644 --- a/server/gameserver/mt/Dress.h +++ b/server/gameserver/mt/Dress.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/Dress.h" + +namespace mt +{ + + DECLARE_ID_TABLE(Dress, mtb::Dress, + "dress@dress.csv", + "id") + public: + + }; + +} diff --git a/server/gameserver/mt/EquipUpgrade.cc b/server/gameserver/mt/EquipUpgrade.cc index e69de29b..fc82aa53 100644 --- a/server/gameserver/mt/EquipUpgrade.cc +++ b/server/gameserver/mt/EquipUpgrade.cc @@ -0,0 +1,10 @@ +#include "precompile.h" + +#include "mt/EquipUpgrade.h" + +IMPL_TABLE(mt::EquipUpgrade) + +namespace mt +{ + +} diff --git a/server/gameserver/mt/EquipUpgrade.h b/server/gameserver/mt/EquipUpgrade.h index e69de29b..90d20456 100644 --- a/server/gameserver/mt/EquipUpgrade.h +++ b/server/gameserver/mt/EquipUpgrade.h @@ -0,0 +1,16 @@ +#pragma once + +#include "mt/macro.h" +#include "mtb/EquipUpgrade.h" + +namespace mt +{ + + DECLARE_ID_TABLE(EquipUpgrade, mtb::EquipUpgrade, + "equipUpgrade@equipUpgrade.csv", + "id") + public: + + }; + +} diff --git a/server/gameserver/mt/HeroQuality.cc b/server/gameserver/mt/HeroQuality.cc index 69a9c95f..d33618fa 100644 --- a/server/gameserver/mt/HeroQuality.cc +++ b/server/gameserver/mt/HeroQuality.cc @@ -1,8 +1,10 @@ #include "precompile.h" +#include + #include "mt/HeroQuality.h" -IMPL_TABLE(mt::HeroQualiy) +IMPL_TABLE(mt::HeroQuality) namespace mt { @@ -10,7 +12,6 @@ namespace mt long long HeroQuality::GetPvpCegUpLimit() { double sys_param = 0; - double lucky = lucky(); long long up_limit = round ( ( @@ -20,9 +21,9 @@ namespace mt 4.01892 ) + ( - 0.0268*pow(lucky, 3) - - 2.15712*pow(lucky, 2) + - 60.944*lucky - + 0.0268*pow(lucky(), 3) - + 2.15712*pow(lucky(), 2) + + 60.944*lucky() - 560.24 ) ) + sys_param; diff --git a/server/gameserver/mt/MapThing.cc b/server/gameserver/mt/MapThing.cc index 04ffed19..35cc27ee 100644 --- a/server/gameserver/mt/MapThing.cc +++ b/server/gameserver/mt/MapThing.cc @@ -13,7 +13,7 @@ namespace mt std::vector strings; a8::Split(buff_list(), strings, '|'); for (const std::string& tmp_str : strings) { - buff_list.push_back(a8::XValue(tmp_str)); + _buff_list.push_back(a8::XValue(tmp_str)); } } { @@ -23,7 +23,7 @@ namespace mt std::vector strings2; a8::Split(str, strings2, ':'); assert(strings2.size() == 2); - preexplosion_summon.push_back + _preexplosion_summon.push_back (std::make_tuple( a8::XValue(strings2[0]), a8::XValue(strings2[1]) @@ -41,7 +41,7 @@ namespace mt int drop_id = a8::XValue(strings2[0]); int weight = strings2.size() > 1 ? a8::XValue(strings2[1]).GetInt() : 10000; total_weight += weight; - drop.push_back + _drop.push_back (std::make_tuple( drop_id, total_weight @@ -53,7 +53,7 @@ namespace mt std::vector strings; a8::Split(monster_list(), strings, '|'); for (const std::string& tmp_str : strings) { - airdrop_mon_list.push_back(a8::XValue(tmp_str)); + _airdrop_mon_list.push_back(a8::XValue(tmp_str)); } } { @@ -64,7 +64,7 @@ namespace mt if (n <= 0 || n > 63) { A8_ABORT(); } - a8::SetBitFlag(special_damage_type, n); + a8::SetBitFlag(_special_damage_type, n); } } { @@ -75,7 +75,7 @@ namespace mt if (n <= 0 || n > 63) { A8_ABORT(); } - a8::SetBitFlag(receive_special_damage_type, n); + a8::SetBitFlag(_receive_special_damage_type, n); } } { @@ -86,22 +86,22 @@ namespace mt if (n <= 0 || n > 63) { A8_ABORT(); } - a8::SetBitFlag(sweep_tags, n); + a8::SetBitFlag(_sweep_tags, n); } } { - int_param1 = a8::XValue(param1()); - float_param1 = a8::XValue(param1()).GetDouble(); + _int_param1 = a8::XValue(param1()); + _float_param1 = a8::XValue(param1()).GetDouble(); } { - int_param2 = a8::XValue(param2()); - float_param2 = a8::XValue(param2()).GetDouble(); + _int_param2 = a8::XValue(param2()); + _float_param2 = a8::XValue(param2()).GetDouble(); } { std::vector strings; a8::Split(param2(), strings, '|'); for (auto& str : strings) { - param2_list.push_back(a8::XValue(str)); + _param2_list.push_back(a8::XValue(str)); } } { @@ -110,7 +110,7 @@ namespace mt for (auto& str : strings) { std::vector strings2; a8::Split(str, strings2, ':'); - shapes.push_back(std::make_tuple + _shapes.push_back(std::make_tuple ( a8::XValue(strings2[0]).GetInt(), a8::XValue(strings2[1]).GetInt(), @@ -123,9 +123,9 @@ namespace mt int MapThing::RandDrop() { if (HasDrop()) { - int total_weight = std::get<1>(drop[drop.size() - 1]); + int total_weight = std::get<1>(_drop[_drop.size() - 1]); int rnd = rand() % total_weight; - for (auto& tuple : drop) { + for (auto& tuple : _drop) { if (rnd < std::get<1>(tuple)) { return std::get<0>(tuple); } diff --git a/server/gameserver/mt/MapTplThingJson.h b/server/gameserver/mt/MapTplThingJson.h index 1e7a0fa1..0f305ec1 100644 --- a/server/gameserver/mt/MapTplThingJson.h +++ b/server/gameserver/mt/MapTplThingJson.h @@ -7,8 +7,8 @@ namespace mt { DECLARE_AUTO_ID_TABLE(MapTplThingJson, mtb::MapTplThingJson, - "", - "") + "" + ) public: }; diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index f5823efe..2e139e56 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -23,7 +23,7 @@ #include "mt/Robot.h" #include "mt/AirLine.h" #include "mt/AirRaid.h" -#include "mt/AirdDrop.h" +#include "mt/AirDrop.h" #include "mt/Dress.h" #include "mt/Drop.h" #include "mt/NpcStandard.h" diff --git a/server/gameserver/mt/PveGeminiMode.h b/server/gameserver/mt/PveGeminiMode.h index a76fd58e..8c1d4a29 100644 --- a/server/gameserver/mt/PveGeminiMode.h +++ b/server/gameserver/mt/PveGeminiMode.h @@ -11,12 +11,12 @@ namespace mt "id") public: - std::vector mode_time; - std::vector area; - std::vector> waves; - std::vector score_reward; - std::vector round_score; - std::vector next_door; + std::vector _mode_time; + std::vector _area; + std::vector> _waves; + std::vector _score_reward; + std::vector _round_score; + std::vector _next_door; void Init1(); int CalcStar(int score); diff --git a/server/gameserver/mt/Robot.h b/server/gameserver/mt/Robot.h index 8176a27f..9a1a8e21 100644 --- a/server/gameserver/mt/Robot.h +++ b/server/gameserver/mt/Robot.h @@ -12,7 +12,7 @@ namespace mt public: void Init1(); - static const mt::Robot* RandRobot(std::set& refreshed_robot_set) + static const mt::Robot* RandRobot(std::set& refreshed_robot_set); private: std::vector _skin_id; }; diff --git a/server/gameserver/mt/Skill.h b/server/gameserver/mt/Skill.h index bda786e9..9f620f36 100644 --- a/server/gameserver/mt/Skill.h +++ b/server/gameserver/mt/Skill.h @@ -37,9 +37,9 @@ namespace mt Skill* base_skill_meta = nullptr; float value_up = 0.0f; std::set buff_list; - std::map> trigger_type_buffs; - std::vector phases; - std::vector raw_phases; + std::map> trigger_type_buffs; + std::vector phases; + std::vector raw_phases; bool IsTurnOverSkill() const; int GetMagicId() const; private: