From 9da8eebcb9d2a798d3e52d6cfd23af212db3ae36 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 19 Jan 2024 10:53:03 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff/machine_gun.cc | 20 --------------------
 server/gameserver/shot.cc             |  8 --------
 server/gameserver/skill.cc            | 16 ----------------
 3 files changed, 44 deletions(-)

diff --git a/server/gameserver/buff/machine_gun.cc b/server/gameserver/buff/machine_gun.cc
index 6a9603e3..dc561dcb 100644
--- a/server/gameserver/buff/machine_gun.cc
+++ b/server/gameserver/buff/machine_gun.cc
@@ -57,24 +57,4 @@ void MachineGunBuff::SwitchWeapons()
 
 void MachineGunBuff::ProcSkill()
 {
-    if (skill_meta && skill_meta->_number_meta) {
-        switch (skill_meta->GetMagicId()) {
-        case MAGIC_20201_HX:
-            {
-                owner->room->xtimer.ModifyTime
-                    (remover_timer,
-                     skill_meta->_number_meta->_float_time * 1000 / FRAME_RATE_MS);
-                owner->GetTrigger()->DispatchEvent(kStartSwitchWeaponBuffEvent, {this});
-            }
-            break;
-        case MAGIC_20401_MAO:
-            {
-            }
-            break;
-        default:
-            {
-            }
-            break;
-        }
-    }
 }
diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc
index 9f2a9adc..5a680aa2 100644
--- a/server/gameserver/shot.cc
+++ b/server/gameserver/shot.cc
@@ -498,14 +498,6 @@ void InternalShot(Creature* c,
             bullet_info.bullet_num = bulletNum;
             bullet_info.weapon_lv = weapon_lv;
             bullet_info.weapon_buff_id = weapon_buff_id;
-            #if 0
-            if (skill_meta &&
-                (skill_meta->GetMagicId() == MAGIC_20101_HL ||
-                 skill_meta->GetMagicId() == MAGIC_20201_HX)
-                ) {
-                bullet_info.trace_target_uniid = c->GetSkillTargetId();
-            }
-            #endif
             bullet_info.reporter_list = c->CalcReporterList(trace_target_uniid, weapon_meta, bullet_meta);
             if (weapon_meta->double_gun() &&
                 bulletIdx > (int)(bulletNum / 2)) {
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index 8bab6e97..79aadd82 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -411,18 +411,6 @@ void Skill::ProcSpecDirShotPhase(const mt::SkillPhase* phase)
             target_distance = std::max(0.0001f, target_distance);
         }
         if (bullet_meta && target_distance > 0.00001f) {
-            if (GetBaseSkillMeta()->GetMagicId() == MAGIC_20201_HX) {
-#if 1
-                target_distance = owner->skill_distance_;
-#else
-                target_distance = 0;
-#endif
-                owner->TryAddBuff(owner, 202013);
-                owner->TryAddBuff(owner, 202014);
-                #if 0
-                target_id = GetTraceTargetId(owner);
-                #endif
-            }
             glm::vec3 old_attack_dir = owner->GetAttackDir();
             glm::vec3 attack_dir = owner->skill_dir_;
             GlmHelper::Normalize(attack_dir);
@@ -460,10 +448,6 @@ void Skill::ProcNormalShotPhase(const mt::SkillPhase* phase)
     if (entity) {
         float target_distance = entity->GetPos().Distance2D2(owner->GetPos());
         if (bullet_meta && target_distance > 0.00001f) {
-            if (GetBaseSkillMeta()->GetMagicId() == MAGIC_20201_HX) {
-                owner->TryAddBuff(owner, 202013);
-                owner->TryAddBuff(owner, 202014);
-            }
             glm::vec3 old_attack_dir = owner->GetAttackDir();
             glm::vec3 attack_dir = owner->GetPos().CalcDir(entity->GetPos());
             GlmHelper::Normalize(attack_dir);