From 6f0fee72f6c53b4031a12678c9a6af8a99ef00cb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 14 Feb 2023 15:37:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h     | 4 ++--
 server/gameserver/shot.cc        | 2 +-
 server/gameserver/skill.cc       | 2 +-
 server/gameserver/skillhelper.cc | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 655e75e3..1791e283 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -442,7 +442,7 @@ enum SamplePolyFlags
 enum MagicType_e
 {
    MAGIC_NONE = 0,
-   MAGIC_20101, //20101 爱心香风
+   MAGIC_20101_XL, //20101 爱心香风
    MAGIC_20701, //20701 瞬间移动回血
    MAGIC_20801, //20801 火力压制
    MAGIC_20901, //20901 野蛮冲撞
@@ -453,7 +453,7 @@ enum MagicType_e
    MAGIC_20301, //20301 医疗站
    MAGIC_20501, //20501 隐身
 
-   MAGIC_30101, //30101 自然恢复
+   MAGIC_30101_XL, //30101 自然恢复
    MAGIC_30201, //30201 受伤加速
    MAGIC_30301, //30301 击杀回血
    MAGIC_30401, //30401 死亡自曝
diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc
index e9be42f1..db7939d7 100644
--- a/server/gameserver/shot.cc
+++ b/server/gameserver/shot.cc
@@ -499,7 +499,7 @@ void InternalShot(Creature* c,
             bullet_info.bullet_idx = bulletIdx;
             bullet_info.bullet_num = bulletNum;
             if (skill_meta &&
-                (skill_meta->GetMagicId() == MAGIC_20101 ||
+                (skill_meta->GetMagicId() == MAGIC_20101_XL ||
                  skill_meta->GetMagicId() == MAGIC_20201)
                 ) {
                 bullet_info.trace_target_uniid = c->GetSkillTargetId();
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index da8fd583..d3c570ed 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -250,7 +250,7 @@ void Skill::InitActiveSkill()
 void Skill::InitPassiveSkill()
 {
     switch (meta->GetMagicId()) {
-    case MAGIC_30101:
+    case MAGIC_30101_XL:
         {
             ProcSJXY();
         }
diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc
index 3a7ff7a1..1557afea 100644
--- a/server/gameserver/skillhelper.cc
+++ b/server/gameserver/skillhelper.cc
@@ -21,7 +21,7 @@ std::map<int, int> SkillHelper::skill_magic_hash_;
 static int GetMagicSkillId(int magic_id)
 {
     switch (magic_id) {
-    case MAGIC_20101:
+    case MAGIC_20101_XL:
         {
             return 20101;
         }
@@ -72,7 +72,7 @@ static int GetMagicSkillId(int magic_id)
         }
         break;
 
-    case MAGIC_30101:
+    case MAGIC_30101_XL:
         {
             return 30101;
         }
@@ -254,7 +254,7 @@ void SkillHelper::ProcBulletHitBuff(IBullet* bullet, Creature* c, int buff_uniid
         return;
     }
     switch (skill_meta->GetMagicId()) {
-    case MAGIC_20101:
+    case MAGIC_20101_XL:
         {
             if (buff->meta->buff_effect() == kBET_Vertigo) {
                 c->room->xtimer.ModifyTime
@@ -347,7 +347,7 @@ bool SkillHelper::ProcBulletDmg(IBullet* bullet, Creature* target, float& finaly
         return false;
     }
    switch (skill_meta->GetMagicId()) {
-   case MAGIC_20101:
+   case MAGIC_20101_XL:
    case MAGIC_20401:
         {
             finaly_dmg =