From daa5f99bc6fbdb604fb7a56f219c639776bd05c1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 May 2023 17:35:54 +0800
Subject: [PATCH] 1

---
 server/gameserver/compose.cc | 10 ++++++++--
 server/gameserver/compose.h  |  2 ++
 server/gameserver/mt/Param.h |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/compose.cc b/server/gameserver/compose.cc
index 585197d5..e588b971 100644
--- a/server/gameserver/compose.cc
+++ b/server/gameserver/compose.cc
@@ -9,8 +9,7 @@
 #include "weapon.h"
 #include "human.h"
 
-#include "mt/GraspBuff.h"
-#include "mt/Grasp.h"
+#include "mt/MergeItem.h"
 #include "mt/Hero.h"
 #include "mt/Equip.h"
 
@@ -48,8 +47,14 @@ void Compose::Clear()
     hold_buffs_.clear();
 }
 
+void Compose::IncNum()
+{
+    ++num_;
+}
+
 void Compose::TakeOnWeapon(Weapon* weapon)
 {
+    #if 0
     std::set<int>* buffs = mt::Grasp::GetBuffs(owner_->AsHuman()->meta->id(),
                                                owner_->GetBattleContext()->GetHeroLevel(),
                                                weapon->meta->id());
@@ -59,4 +64,5 @@ void Compose::TakeOnWeapon(Weapon* weapon)
             hold_buffs_.push_back(owner_->TryAddBuff(owner_, buff_id, nullptr));
         }
     }
+    #endif
 }
diff --git a/server/gameserver/compose.h b/server/gameserver/compose.h
index 6f815bd6..4f5003de 100644
--- a/server/gameserver/compose.h
+++ b/server/gameserver/compose.h
@@ -16,8 +16,10 @@ class Compose
 
     void Clear();
     void TakeOnWeapon(Weapon* weapon);
+    void IncNum();
 
  private:
     Creature* owner_ = nullptr;
+    int num_ = 0;
     std::vector<int> hold_buffs_;
 };
diff --git a/server/gameserver/mt/Param.h b/server/gameserver/mt/Param.h
index 09b08679..6793cbe3 100644
--- a/server/gameserver/mt/Param.h
+++ b/server/gameserver/mt/Param.h
@@ -97,6 +97,8 @@ namespace mt
         int move_step_len = 80;
 
         int box_open_delay = 0;
+
+        int compose_mode = 1;
     };
     static void StaticPostInit();
     static const S& s() { return s_; };