diff --git a/server/gameserver/ability.h b/server/gameserver/ability.h index ad648e9e..d632e12b 100644 --- a/server/gameserver/ability.h +++ b/server/gameserver/ability.h @@ -1,5 +1,6 @@ #pragma once +#include "attrdefine.h" #include "weakptr.h" class Room; diff --git a/server/gameserver/attrdefine.h b/server/gameserver/attrdefine.h new file mode 100644 index 00000000..045b48b5 --- /dev/null +++ b/server/gameserver/attrdefine.h @@ -0,0 +1,51 @@ +#pragma once + +enum HumanAttrType_e +{ + kHAT_Begin = 0, + kHAT_Hp = 1, + kHAT_HPRecover = 2, + kHAT_Atk = 3, + kHAT_Def = 4, + kHAT_Speed = 5, + kHAT_ShotRange = 6, + kHAT_ShotSpeed = 7, + kHAT_ReloadSpeed = 8, + kHAT_FireRate = 9, + kHAT_Volume = 10, + kHAT_MaxHp = 11, + kHAT_ShotView = 12, + kHAT_ReloadTime = 14, + + kHAT_WeaponDmg = 20, + kHAT_WeaponShotSpeed = 21, + kHAT_WeaponReloadTime = 22, + kHAT_WeaponExplosionRange = 23, + kHAT_WeaponExplosionContinueTime = 24, + kHAT_PoisoningReduction = 25, + kHAT_RescueTime = 26, + kHAT_DrugTime = 27, + kHAT_DrugEfficacy = 28, + kHAT_CarOil = 29, + kHAT_WeaponExplosionDealyTime = 30, + kHAT_RecoverHpAdd = 31, + kHAT_SkillTime = 32, + kHAT_WeaponThrowRange = 33, + kHAT_LUCKY = 34, + kHAT_HP_RATE = 39, + kHAT_ATK_RATE = 40, + kHAT_DEF_RATE = 41, + kHAT_CRIT = 42, + kHAT_CRIT_DAMAGE_RATE = 43, + kHAT_DODGE = 44, + kHAT_DODGE_DAMAGE_RATE = 45, + kHAT_HpRecoverPct = 46, + kHAT_BrainLifePct = 47, + kHAT_ReloadTimePct = 48, + kHAT_BulletSpeed = 49, + kHAT_BulletSpeedPct = 50, + kHAT_CoolDownPct = 51, + kHAT_PickUpPct = 52, + kHAT_Shield = 53, + kHAT_End +}; diff --git a/server/gameserver/attrhelper.h b/server/gameserver/attrhelper.h index 56405126..9cf25406 100644 --- a/server/gameserver/attrhelper.h +++ b/server/gameserver/attrhelper.h @@ -1,5 +1,7 @@ #pragma once +#include "attrdefine.h" + class AttrHelper { public: diff --git a/server/gameserver/buff/once_chg_attr.cc b/server/gameserver/buff/once_chg_attr.cc index 83a037eb..e395a051 100644 --- a/server/gameserver/buff/once_chg_attr.cc +++ b/server/gameserver/buff/once_chg_attr.cc @@ -2,6 +2,7 @@ #include "buff/once_chg_attr.h" +#include "attrdefine.h" #include "creature.h" #include "room.h" diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 213ceb35..c58c224c 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -136,48 +136,6 @@ enum SkillFunc_e kSkill_FuncEnd }; -enum HumanAttrType_e -{ - kHAT_Begin = 0, - kHAT_Hp = 1, - kHAT_HPRecover = 2, - kHAT_Atk = 3, - kHAT_Def = 4, - kHAT_Speed = 5, - kHAT_ShotRange = 6, - kHAT_ShotSpeed = 7, - kHAT_ReloadSpeed = 8, - kHAT_FireRate = 9, - kHAT_Volume = 10, - kHAT_MaxHp = 11, - kHAT_ShotView = 12, - kHAT_ReloadTime = 14, - - kHAT_WeaponDmg = 20, - kHAT_WeaponShotSpeed = 21, - kHAT_WeaponReloadTime = 22, - kHAT_WeaponExplosionRange = 23, - kHAT_WeaponExplosionContinueTime = 24, - kHAT_PoisoningReduction = 25, - kHAT_RescueTime = 26, - kHAT_DrugTime = 27, - kHAT_DrugEfficacy = 28, - kHAT_CarOil = 29, - kHAT_WeaponExplosionDealyTime = 30, - kHAT_RecoverHpAdd = 31, - kHAT_SkillTime = 32, - kHAT_WeaponThrowRange = 33, - kHAT_LUCKY = 34, - kHAT_HP_RATE = 39, - kHAT_ATK_RATE = 40, - kHAT_DEF_RATE = 41, - kHAT_CRIT = 42, - kHAT_CRIT_DAMAGE_RATE = 43, - kHAT_DODGE = 44, - kHAT_DODGE_DAMAGE_RATE = 45, - kHAT_End -}; - enum SkillTarget_e { kST_All = 0, diff --git a/server/gameserver/global.cc b/server/gameserver/global.cc index 85ccdb80..676c4799 100644 --- a/server/gameserver/global.cc +++ b/server/gameserver/global.cc @@ -1,6 +1,8 @@ #include "precompile.h" #include "global.h" +#include "attrdefine.h" + int g_hint_flags = 0; int Global::g_nowtime = time(nullptr);