From 808c2f998a4bed5337b34b74ad84ec1b5a3f60ac Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 13 Mar 2023 15:25:10 +0800
Subject: [PATCH] 1

---
 server/gameserver/ability.cc       | 22 ----------------------
 server/gameserver/buff.cc          | 17 -----------------
 server/gameserver/buff/turnover.cc |  3 +--
 server/gameserver/creature.cc      |  3 +--
 server/gameserver/human.cc         |  5 +----
 5 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc
index 99aac65a..4a8c01ae 100644
--- a/server/gameserver/ability.cc
+++ b/server/gameserver/ability.cc
@@ -12,28 +12,6 @@ float Ability::GetAttrAbs(int attr_id)
     float attr_abs_val = GetBuffAttrAbs(attr_id);
     if (attr_id == kHAT_Atk || attr_id == kHAT_Def) {
         if (owner.Get()) {
-            Buff* buff = owner.Get()->GetBuffByEffectId(kBET_Car);
-            if (buff) {
-                const mt::Equip* equip_meta = mt::Equip::GetById(buff->meta->_buff_param4);
-                if (equip_meta) {
-                    switch (attr_id) {
-                    case kHAT_Atk:
-                        {
-                            attr_abs_val += equip_meta->_atk;
-                        }
-                        break;
-                    case kHAT_Def:
-                        {
-                            attr_abs_val += equip_meta->def();
-                        }
-                        break;
-                    default:
-                        {
-                        }
-                        break;
-                    }
-                }
-            }
         }
     }
     return attr_abs_val;
diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index 73e2a713..25c783e5 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -358,26 +358,9 @@ void Buff::Activate()
 {
     const mt::Buff* buff_meta = meta;
     switch (meta->buff_effect()) {
-    case kBET_Car:
     case kBET_CrazyMode:
         {
             owner->RecalcBuffAttr();
-            if (meta->buff_effect() == kBET_Car) {
-                const mt::Equip* equip_meta = mt::Equip::GetById(meta->_buff_param4);
-                if (equip_meta &&
-                    equip_meta->equip_type() == EQUIP_TYPE_CAR &&
-                    equip_meta->equip_subtype() == 1
-                    ) {
-                    const mt::Equip* spec_weapon_meta = mt::Equip::GetById(equip_meta->_int_param1);
-                    if (spec_weapon_meta) {
-                        owner->second_weapon.weapon_idx = 100;
-                        owner->second_weapon.weapon_id = spec_weapon_meta->id();
-                        owner->second_weapon.meta = spec_weapon_meta;
-                        owner->second_weapon.Recalc();
-                        owner->second_weapon.ammo = owner->second_weapon.GetClipVolume(owner);
-                    }
-                }
-            }
         }
         break;
     default:
diff --git a/server/gameserver/buff/turnover.cc b/server/gameserver/buff/turnover.cc
index 6ae3c83d..ad681960 100644
--- a/server/gameserver/buff/turnover.cc
+++ b/server/gameserver/buff/turnover.cc
@@ -27,8 +27,7 @@ void TurnOverBuff::Activate()
     #endif
     glm::vec3 old_dir = owner->GetMoveDir();
     Position old_pos = owner->GetPos();
-    float distance =
-        owner->HasBuffEffect(kBET_Car) ? phase->phase_param1.GetDouble() * 1.5 : phase->phase_param1.GetDouble();
+    float distance = phase->phase_param1.GetDouble();
 #ifdef DEBUG
     caster_.Get()->SendDebugMsg(a8::Format("ProTurnOver currTimes:%d last_pos:%d,%d curr_pos:%d,%d",
                                            {
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 4fffe8e9..a8e661a6 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -598,8 +598,7 @@ void Creature::RecalcBuffAttr()
     ability_->Clear();
     bool need_refresh_hp = false;
     for (auto& buff : buff_list_) {
-        if (buff->meta->buff_effect() == kBET_Car ||
-            buff->meta->buff_effect() == kBET_CrazyMode) {
+        if (buff->meta->buff_effect() == kBET_CrazyMode) {
             int attr_type = (int)buff->meta->_buff_param1;
             int calc_type = (int)buff->meta->_buff_param2;
             if (IsValidHumanAttr(attr_type)) {
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index ce4a8773..984e0f93 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2907,10 +2907,7 @@ void Human::ProcLootWeapon(AddItemDTO& dto)
         weapon->ammo = 0;
         weapon->meta = dto.item_meta;
         weapon->Recalc();
-        if (HasBuffEffect(kBET_Car)) {
-        } else {
-            AutoLoadingBullet();
-        }
+        AutoLoadingBullet();
         if (switch_gun) {
             SetCurrWeapon(weapon);
         }