Merge pull request liyunfan1223#315 from noisiver/summon-conditions

Conditions for Summon
AthenaSui · Jul 10, 2024 · 9d4c478 · 9d4c478
2 parents 51d3b0e + c3ec1da
commit 9d4c478
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/strategy/actions/UseMeetingStoneAction.cpp b/src/strategy/actions/UseMeetingStoneAction.cpp
@@ -176,8 +176,28 @@ bool SummonAction::Teleport(Player* summoner, Player* player)
 
             if (summoner->IsWithinLOS(x, y, z))
             {
-                bool allowed = sPlayerbotAIConfig->botReviveWhenSummon == 2 || (sPlayerbotAIConfig->botReviveWhenSummon == 1 && !master->IsInCombat() && master->IsAlive());
-                if (allowed && bot->isDead())
+                if (sPlayerbotAIConfig->botReviveWhenSummon < 2)
+                {
+                    if (master->IsInCombat())
+                    {
+                        botAI->TellError("You cannot summon me while you're in combat");
+                        return false;
+                    }
+
+                    if (!master->IsAlive())
+                    {
+                        botAI->TellError("You cannot summon me while you're dead");
+                        return false;
+                    }
+
+                    if (bot->isDead() && !bot->HasPlayerFlag(PLAYER_FLAGS_GHOST))
+                    {
+                        botAI->TellError("You cannot summon me while I'm dead, you need to release my spirit first");
+                        return false;
+                    }
+                }
+
+                if (sPlayerbotAIConfig->botReviveWhenSummon > 0 && bot->isDead())
                 {
                     bot->ResurrectPlayer(1.0f, false);
                     bot->DurabilityRepairAll(false, 1.0f, false);