diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc index f53ed23b..7465abd6 100644 --- a/server/gameserver/mt/SkillNumber.cc +++ b/server/gameserver/mt/SkillNumber.cc @@ -21,6 +21,7 @@ A8_DECLARE_CLASS_ENUM(SkillNumberLispField_e, int, range, range2, range3, + range4, time, cd, number, @@ -196,6 +197,11 @@ namespace mt return _float_range3; } break; + case SkillNumberLispField_e::range4: + { + return _float_range4; + } + break; case SkillNumberLispField_e::time: { return _float_time; @@ -248,6 +254,8 @@ namespace mt return (int)SkillNumberLispField_e::range2; } else if (name == "${skillNumber.range3}") { return (int)SkillNumberLispField_e::range3; + } else if (name == "${skillNumber.range4}") { + return (int)SkillNumberLispField_e::range4; } else if (name == "${skillNumber.time}") { return (int)SkillNumberLispField_e::time; } else if (name == "${skillNumber.cd}") { diff --git a/server/gameserver/mt/SkillNumber.h b/server/gameserver/mt/SkillNumber.h index 07a77d0f..c9c23b54 100644 --- a/server/gameserver/mt/SkillNumber.h +++ b/server/gameserver/mt/SkillNumber.h @@ -29,6 +29,9 @@ namespace mt int _int_range3 = 0; float _float_range3 = 0; + int _int_range4 = 0; + float _float_range4 = 0; + int _int_probability = 0; float _float_probability = 0; diff --git a/server/gameserver/mtb/SkillNumber.h b/server/gameserver/mtb/SkillNumber.h index fba5092a..49224bd8 100644 --- a/server/gameserver/mtb/SkillNumber.h +++ b/server/gameserver/mtb/SkillNumber.h @@ -32,6 +32,7 @@ namespace mtb int explosion_effect() const { return explosion_effect_; }; const std::string effect_list() const { return effect_list_; }; const std::string time2() const { return time2_; }; + const std::string range4() const { return range3_; }; bool has_skill_id() const { return __flags__.test(0);}; bool has_skill_type() const { return __flags__.test(1);}; @@ -55,6 +56,7 @@ namespace mtb bool has_explosion_effect() const { return __flags__.test(19);}; bool has_effect_list() const { return __flags__.test(20);}; bool has_time2() const { return __flags__.test(21);}; + bool has_ragne4() const { return __flags__.test(22);}; protected: @@ -72,6 +74,7 @@ namespace mtb std::string range_; std::string range2_; std::string range3_; + std::string range4_; std::string time_; std::string cd_; int buff_id_ = 0; @@ -82,7 +85,7 @@ namespace mtb std::string time2_; public: - std::bitset<22> __flags__; + std::bitset<23> __flags__; }; }; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index df92dbd5..5a1ea95b 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -420,7 +420,7 @@ namespace mtb { a8::reflect::Class* meta_class = nullptr; if (!meta_class) { - meta_class = new a8::reflect::Class("SkillNumber", 22, 0); + meta_class = new a8::reflect::Class("SkillNumber", 23, 0); meta_class->SetSimpleField(0, "skill_id", a8::reflect::ET_INT32, my_offsetof2(SkillNumber, skill_id_)); meta_class->SetSimpleField(1, "skill_type", a8::reflect::ET_INT32, my_offsetof2(SkillNumber, skill_type_)); meta_class->SetSimpleField(2, "number", a8::reflect::ET_FLOAT, my_offsetof2(SkillNumber, number_)); @@ -443,6 +443,7 @@ namespace mtb meta_class->SetSimpleField(19, "explosion_effect", a8::reflect::ET_INT32, my_offsetof2(SkillNumber, explosion_effect_)); meta_class->SetSimpleField(20, "effect_list", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, effect_list_)); meta_class->SetSimpleField(21, "time2", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, time2_)); + meta_class->SetSimpleField(22, "range4", a8::reflect::ET_STRING, my_offsetof2(SkillNumber, range4_)); } return meta_class; } diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index d16333ea..611a7c08 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -356,6 +356,7 @@ message SkillNumber optional string range = 12; optional string range2 = 13; optional string range3 = 21; + optional string range4 = 23; optional string time = 14; optional string cd = 15; optional int32 buff_id = 16;