diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 981bf84f..32f1fd28 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -439,32 +439,31 @@ enum SamplePolyFlags
     SAMPLE_POLYFLAGS_ALL                = 0xffff        // All abilities.
 };
 
-enum MagicType_e
-{
-   MAGIC_NONE = 0,
-   MAGIC_20101_HL, //20101 狐狸-爱心香风
-   MAGIC_20701_BAO, //20701 豹-瞬间移动回血
-   MAGIC_20801_LONG, //20801 龙-火力压制
-   MAGIC_20901_XIONG, //20901 熊野蛮冲撞
-   MAGIC_21001_NIU, //21001 牛-立盾防御
-   MAGIC_20201_HX, //20201 浣熊-火箭浣熊
-   MAGIC_20401_MAO, //20401 猫-飞勾
-   MAGIC_20601_DJS, //20601 独角兽-威力翻倍
-   MAGIC_20301_XL, //20301 小鹿-医疗站
-   MAGIC_20501_TZ, //20501 兔子-隐身
+A8_DECLARE_ENUM(MagicType_e,
+                MAGIC_NONE = 0,
+                MAGIC_20101_HL, //20101 狐狸-爱心香风
+                MAGIC_20701_BAO, //20701 豹-瞬间移动回血
+                MAGIC_20801_LONG, //20801 龙-火力压制
+                MAGIC_20901_XIONG, //20901 熊野蛮冲撞
+                MAGIC_21001_NIU, //21001 牛-立盾防御
+                MAGIC_20201_HX, //20201 浣熊-火箭浣熊
+                MAGIC_20401_MAO, //20401 猫-飞勾
+                MAGIC_20601_DJS, //20601 独角兽-威力翻倍
+                MAGIC_20301_XL, //20301 小鹿-医疗站
+                MAGIC_20501_TZ, //20501 兔子-隐身
 
-   MAGIC_30101_HL, //30101 狐狸-自然恢复
-   MAGIC_30201_HX, //30201 浣熊-受伤加速
-   MAGIC_30301_XL, //30301 小鹿-击杀回血
-   MAGIC_30401_MAO, //30401 猫-死亡自曝
-   MAGIC_30501_TZ, //30501 兔子-此面向敌
-   MAGIC_30601_DJS, //30601 独角兽-免疫眩晕
-   MAGIC_30701_BAO, //30701 豹-钩爪拉动减伤
-   MAGIC_30801_LONG, //30801 龙-救援防护
-   MAGIC_30901_XIONG, //30901 熊-复活
-   MAGIC_31001_NIU, //31001 牛-隐身恢复
-   MAGIC_END
-};
+                MAGIC_30101_HL, //30101 狐狸-自然恢复
+                MAGIC_30201_HX, //30201 浣熊-受伤加速
+                MAGIC_30301_XL, //30301 小鹿-击杀回血
+                MAGIC_30401_MAO, //30401 猫-死亡自曝
+                MAGIC_30501_TZ, //30501 兔子-隐身恢复
+                MAGIC_30601_DJS, //30601 独角兽-免疫眩晕
+                MAGIC_30701_BAO, //30701 豹-钩爪拉动减伤
+                MAGIC_30801_LONG, //30801 龙-救援防护
+                MAGIC_30901_XIONG, //30901 熊-复活
+                MAGIC_31001_NIU, //31001 牛-此面向敌
+                MAGIC_END
+                );
 
 enum PolyExtDataFlag_e
 {
diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc
index 6223b768..284b2284 100644
--- a/server/gameserver/skillhelper.cc
+++ b/server/gameserver/skillhelper.cc
@@ -20,115 +20,6 @@ std::map<int, int> SkillHelper::skill_magic_hash_;
 
 static int GetMagicSkillId(int magic_id)
 {
-    switch (magic_id) {
-    case MAGIC_20101_HL:
-        {
-            return 20101;
-        }
-        break;
-    case MAGIC_20701_BAO:
-        {
-            return 20701;
-        }
-        break;
-    case MAGIC_20801_LONG:
-        {
-            return 20801;
-        }
-        break;
-    case MAGIC_20901_XIONG:
-        {
-            return 20901;
-        }
-        break;
-    case MAGIC_21001_NIU:
-        {
-            return 21001;
-        }
-        break;
-    case MAGIC_20201_HX:
-        {
-            return 20201;
-        }
-        break;
-    case MAGIC_20401_MAO:
-        {
-            return 20401;
-        }
-        break;
-    case MAGIC_20601_DJS:
-        {
-            return 20601;
-        }
-        break;
-    case MAGIC_20301_XL:
-        {
-            return 20301;
-        }
-        break;
-    case MAGIC_20501_TZ:
-        {
-            return 20501;
-        }
-        break;
-
-    case MAGIC_30101_HL:
-        {
-            return 30101;
-        }
-        break;
-    case MAGIC_30201_HX:
-        {
-            return 30701;
-        }
-        break;
-    case MAGIC_30301_XL:
-        {
-            return 30801;
-        }
-        break;
-    case MAGIC_30401_MAO:
-        {
-            return 30901;
-        }
-        break;
-    case MAGIC_30501_TZ:
-        {
-            return 31001;
-        }
-        break;
-    case MAGIC_30601_DJS:
-        {
-            return 30201;
-        }
-        break;
-    case MAGIC_30701_BAO:
-        {
-            return 30401;
-        }
-        break;
-    case MAGIC_30801_LONG:
-        {
-            return 30601;
-        }
-        break;
-    case MAGIC_30901_XIONG:
-        {
-            return 30301;
-        }
-        break;
-    case MAGIC_31001_NIU:
-        {
-            return 30501;
-        }
-        break;
-
-    default:
-        {
-            return 0;
-        }
-        break;
-    }
 }
 
 void SkillHelper::Init()