From 853d5cd2bc0d206850954b7bf643f529f6a14bf4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 25 Apr 2024 14:50:50 +0800
Subject: [PATCH] 1

---
 server/bin/exported/task/ChiJiMode.xml | 18 +-----------------
 server/gameserver/ability.cc           |  2 ++
 server/gameserver/creature.cc          |  2 +-
 server/gameserver/hero_agent.cc        |  6 ++++--
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/server/bin/exported/task/ChiJiMode.xml b/server/bin/exported/task/ChiJiMode.xml
index 18e8ff39..f199f100 100644
--- a/server/bin/exported/task/ChiJiMode.xml
+++ b/server/bin/exported/task/ChiJiMode.xml
@@ -93,7 +93,7 @@
                       <property DecorateWhenChildEnds="false" />
                       <property Weight="const int 60" />
                       <node class="Action" id="15">
-                        <property Method="Self.HeroAgent::CoIdle(2000,4000)" />
+                        <property Method="Self.HeroAgent::CoIdle(1000,4000)" />
                         <property ResultOption="BT_INVALID" />
                       </node>
                     </node>
@@ -102,22 +102,6 @@
               </node>
             </node>
           </node>
-          <node class="DecoratorWeight" id="25">
-            <property DecorateWhenChildEnds="false" />
-            <property Weight="const int 50" />
-            <node class="IfElse" id="19">
-              <node class="Condition" id="20">
-                <property Operator="Equal" />
-                <property Opl="Self.HeroAgent::SearchTeammate(800)" />
-                <property Opr="const bool true" />
-              </node>
-              <node class="ReferencedBehavior" id="21">
-                <property ReferenceBehavior="const string &quot;task/FollowTeammate&quot;" />
-                <property Task="Self.HeroAgent::FollowTeammate({x=0;y=0;z=0;},0)" />
-              </node>
-              <node class="True" id="22" />
-            </node>
-          </node>
         </node>
       </node>
     </node>
diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc
index c666181e..5d1b8f8b 100644
--- a/server/gameserver/ability.cc
+++ b/server/gameserver/ability.cc
@@ -45,7 +45,9 @@ static bool IsMulCalc(int attr_id)
     case kHAT_pDefendRateIn:
     case kHAT_pBlockRateIn:
     case kHAT_pCritRateIn:
+#if 0
     case kHAT_vSpeedRateIn:
+#endif
     case kHAT_vHaste:
     case kHAT_vDrain:
     case kHAT_vTenacity:
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 5cd5a662..fcdaae93 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -3424,7 +3424,7 @@ float Creature::InternalGetSpeed()
         float rate = addition - ruduce;
         finaly_speed *= 1.0f + rate;
         #ifdef MYDEBUG
-        if (IsPlayer() && finaly_speed >500) {
+        if (IsPlayer() && finaly_speed > 500) {
             a8::XPrintf("player speed:%f\n", {finaly_speed});
         }
         #endif
diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc
index 69391956..aae07632 100644
--- a/server/gameserver/hero_agent.cc
+++ b/server/gameserver/hero_agent.cc
@@ -1640,8 +1640,10 @@ behaviac::EBTStatus HeroAgent::SearchTeammate(int range)
     if (nearest_teammate) {
         float distance = nearest_teammate->GetPos().Distance2D2(owner_->GetPos());
         if (distance <= range) {
-            current_teammate_agent->SetTarget(nearest_teammate);
-            return behaviac::BT_SUCCESS;
+            if (distance > 400) {
+                current_teammate_agent->SetTarget(nearest_teammate);
+                return behaviac::BT_SUCCESS;
+            }
         }
     }
     return behaviac::BT_FAILURE;