From b2c693268932b488d0e43782d57cf28c6311dbc0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 8 Sep 2022 20:50:49 +0800
Subject: [PATCH] remove GetBaseAtk() GetDefAtk()

---
 server/gameserver/car.cc    | 10 ----------
 server/gameserver/car.h     |  2 --
 server/gameserver/entity.cc | 10 ----------
 server/gameserver/entity.h  |  2 --
 server/gameserver/hero.cc   | 10 ----------
 server/gameserver/hero.h    |  2 --
 server/gameserver/human.cc  | 10 ----------
 server/gameserver/human.h   |  2 --
 8 files changed, 48 deletions(-)

diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc
index 81f9f58a..32af1ab3 100644
--- a/server/gameserver/car.cc
+++ b/server/gameserver/car.cc
@@ -542,13 +542,3 @@ void Car::OnKillTarget(Creature* target)
         }
     }
 }
-
-float Car::GetBaseAtk()
-{
-    return hero_meta_->i->damage();
-}
-
-float Car::GetBaseDef()
-{
-    return hero_meta_->i->defence();
-}
diff --git a/server/gameserver/car.h b/server/gameserver/car.h
index 274d4e96..652eba7f 100644
--- a/server/gameserver/car.h
+++ b/server/gameserver/car.h
@@ -30,8 +30,6 @@ class Car : public Creature
     virtual void GetAabbBox(AabbCollider& aabb_box) override;
     virtual void GetHitAabbBox(AabbCollider& aabb_box) override;
     virtual std::string GetName() override;
-    virtual float GetBaseAtk() override;
-    virtual float GetBaseDef() override;
 
     bool IsDriver(Human* hum) { return driver_ == hum && driver_; }
     Human* GetPassengerBySeat(int seat);
diff --git a/server/gameserver/entity.cc b/server/gameserver/entity.cc
index 69f290fb..acaccea8 100644
--- a/server/gameserver/entity.cc
+++ b/server/gameserver/entity.cc
@@ -250,13 +250,3 @@ EntityWeakPtr& Entity::GetEntityWeakPtrRef()
     }
     return entity_weak_ptr_;
 }
-
-float Entity::GetBaseAtk()
-{
-    return 0;
-}
-
-float Entity::GetBaseDef()
-{
-    return 0;
-}
diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h
index 9563d54a..c54e388b 100644
--- a/server/gameserver/entity.h
+++ b/server/gameserver/entity.h
@@ -80,8 +80,6 @@ class Entity
     EntityWeakPtr& GetEntityWeakPtrRef();
     bool IsClientCached(Human* hum);
     bool CanClientCache(Human* hum);
-    virtual float GetBaseAtk();
-    virtual float GetBaseDef();
 
 protected:
     void AddClientCache(Human* hum);
diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index 90970ee0..b62173a6 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -414,13 +414,3 @@ void Hero::DropItems(Obstacle* obstacle)
     }
     room->ScatterDrop(obstacle->GetPos(), drop_id);
 }
-
-float Hero::GetBaseAtk()
-{
-    return meta->i->damage();
-}
-
-float Hero::GetBaseDef()
-{
-    return meta->i->defence();
-}
diff --git a/server/gameserver/hero.h b/server/gameserver/hero.h
index e84a885a..03519b43 100644
--- a/server/gameserver/hero.h
+++ b/server/gameserver/hero.h
@@ -32,8 +32,6 @@ public:
     virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) override;
     virtual std::string GetName() override;
     virtual void DropItems(Obstacle* obstacle) override;
-    virtual float GetBaseAtk() override;
-    virtual float GetBaseDef() override;
 
     virtual float GetSpeed() override;
     virtual float GetRadius() override;
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 62f8c558..70948e63 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -4233,16 +4233,6 @@ void Human::DecOxygen(int val)
     oxygen_ = std::max(0, oxygen_);
 }
 
-float Human::GetBaseAtk()
-{
-    return meta->i->damage();
-}
-
-float Human::GetBaseDef()
-{
-    return meta->i->defence();
-}
-
 void Human::WinPveScore(int score)
 {
     stats.pve_score += score;
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 31939d6e..305d6053 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -347,8 +347,6 @@ class Human : public Creature
     void SetOxygen(int oxygen) { oxygen_ = oxygen; };
     void AddOxygen(int val);
     void DecOxygen(int val);
-    virtual float GetBaseAtk() override;
-    virtual float GetBaseDef() override;
     void WinPveScore(int score);
 
 protected: