From 49966de9d2402dde2c69bcdf15731491c3b57ca0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 28 Mar 2023 17:30:57 +0800
Subject: [PATCH] 1

---
 server/gameserver/ability.cc       | 56 ------------------------------
 server/gameserver/ability.h        | 15 --------
 server/gameserver/buff/callfunc.cc | 11 ------
 server/gameserver/buff/callfunc.h  |  2 --
 server/gameserver/mt/Buff.cc       |  2 ++
 server/gameserver/skill.cc         |  2 ++
 6 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc
index ed9af170..89e551c5 100644
--- a/server/gameserver/ability.cc
+++ b/server/gameserver/ability.cc
@@ -199,56 +199,6 @@ void Ability::Clear()
 
 }
 
-void Ability::DelDmgRuduce(float rate)
-{
-    dmg_ruduce_rate_ -= rate;
-    dmg_ruduce_rate_ = std::max(0.0f, dmg_ruduce_rate_);
-    --dmg_ruduce_times_;
-#ifdef DEBUG
-    if (dmg_ruduce_times_ < 0) {
-        abort();
-    }
-#endif
-}
-
-float Ability::GetDmgRuduce()
-{
-    return dmg_ruduce_rate_;
-}
-
-int Ability::GetDmgRuduceTimes()
-{
-    return dmg_ruduce_times_;
-}
-
-void Ability::AddDmgAddition(float rate)
-{
-    dmg_addition_rate_ += rate;
-    ++dmg_addition_times_;
-}
-
-void Ability::DelDmgAddition(float rate)
-{
-    dmg_addition_rate_ -= rate;
-    dmg_addition_rate_ = std::max(0.0f, dmg_addition_rate_);
-    --dmg_addition_times_;
-#ifdef DEBUG
-    if (dmg_addition_times_ < 0) {
-        abort();
-    }
-#endif
-}
-
-float Ability::GetDmgAddition()
-{
-    return dmg_addition_rate_;
-}
-
-int Ability::GetDmgAdditionTimes()
-{
-    return dmg_addition_times_;
-}
-
 void Ability::AddDefAddition(float rate)
 {
     def_addition_rate_ += rate;
@@ -604,9 +554,3 @@ float Ability::GetAttrRuduce(int attr_id)
         return 0.0f;
     }
 }
-
-void Ability::AddDmgRuduce(float rate)
-{
-    dmg_ruduce_rate_ += rate;
-    ++dmg_ruduce_times_;
-}
diff --git a/server/gameserver/ability.h b/server/gameserver/ability.h
index f8a483bd..1b18d87c 100644
--- a/server/gameserver/ability.h
+++ b/server/gameserver/ability.h
@@ -16,15 +16,6 @@ class Ability
  public:
     Ability(CreatureWeakPtr owner);
 
-    void AddDmgRuduce(float rate);
-    void DelDmgRuduce(float rate);
-    float GetDmgRuduce();
-    int GetDmgRuduceTimes();
-
-    void AddDmgAddition(float rate);
-    void DelDmgAddition(float rate);
-    float GetDmgAddition();
-    int GetDmgAdditionTimes();
     void AddDefAddition(float rate);
     void DelDefAddition(float rate);
     float GetDefAddition();
@@ -79,12 +70,6 @@ private:
     std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_add_ = {};
     std::array<std::tuple<float, list_head>, kHVAT_End - kHVAT_Begin> vattr_dec_ = {};
 
-    int dmg_ruduce_times_ = 0;
-    float dmg_ruduce_rate_ = 0;
-
-    int dmg_addition_times_ = 0;
-    float dmg_addition_rate_ = 0;
-
     int def_addition_times_ = 0;
     float def_addition_rate_ = 0;
 
diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc
index 30e57739..a4b45c66 100644
--- a/server/gameserver/buff/callfunc.cc
+++ b/server/gameserver/buff/callfunc.cc
@@ -86,12 +86,6 @@ void CallFuncBuff::Activate()
             ProcLightCircle();
         }
         break;
-    case BuffCallFunc_e::kDmgRuduce:
-        {
-            hold_param2_ = meta->GetBuffParam2(this);
-            owner->GetAbility()->AddDmgRuduce(hold_param2_);
-        }
-        break;
     case BuffCallFunc_e::kSyncProp:
         {
             hold_param2_ = meta->GetBuffParam2(this);
@@ -116,11 +110,6 @@ void CallFuncBuff::Deactivate()
             }
         }
         break;
-    case BuffCallFunc_e::kDmgRuduce:
-        {
-            owner->GetAbility()->DelDmgRuduce(hold_param2_);
-        }
-        break;
     default:
         {
         }
diff --git a/server/gameserver/buff/callfunc.h b/server/gameserver/buff/callfunc.h
index 7948ad4d..89a30dab 100644
--- a/server/gameserver/buff/callfunc.h
+++ b/server/gameserver/buff/callfunc.h
@@ -13,8 +13,6 @@ A8_DECLARE_CLASS_ENUM(BuffCallFunc_e, int,
                       kAddHp = 11,
                       kFlashMoveToPos = 12,
                       kLightCircle = 13,
-                      kDmgAddition = 14,
-                      kDmgRuduce = 15,
                       kSyncProp = 16
                       );
 
diff --git a/server/gameserver/mt/Buff.cc b/server/gameserver/mt/Buff.cc
index 508f57c2..7e174915 100644
--- a/server/gameserver/mt/Buff.cc
+++ b/server/gameserver/mt/Buff.cc
@@ -280,6 +280,8 @@ namespace mt
         if (buff_effect() == 7 &&
             (_int_buff_param1 == 2 ||
              _int_buff_param1 == 6 ||
+             _int_buff_param1 == 14 ||
+             _int_buff_param1 == 15 ||
              _int_buff_param1 == 9
              )) {
             abort();
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index 70bf2955..fd0bcef6 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -313,6 +313,7 @@ void Skill::InitPassiveSkill()
 
 void Skill::Proc30701BAO()
 {
+    #if 0
     float dmg_ruduce_rate = meta->_number_meta->_float_ratio2;
     a8::XTimerWp dmg_ruduce_timer;
     std::shared_ptr<int> immune_buff_uniid = std::make_shared<int>(0);
@@ -390,6 +391,7 @@ void Skill::Proc30701BAO()
              }
          }
          );
+    #endif
 }
 
 void Skill::ProcSkillPhase(const mt::SkillPhase* phase)