diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist index 0d9a9a4a..98aa9eec 100644 --- a/conf/playerbots.conf.dist +++ b/conf/playerbots.conf.dist @@ -282,7 +282,7 @@ AiPlayerbot.MediumMana = 40 # Random bot default strategies (applied after defaults) AiPlayerbot.RandomBotCombatStrategies = "+dps,+dps assist,-threat" # AiPlayerbot.RandomBotNonCombatStrategies = "+grind,+loot,+rpg,+custom::say" -AiPlayerbot.RandomBotNonCombatStrategies = "+grind,+loot" +AiPlayerbot.RandomBotNonCombatStrategies = "" AiPlayerbot.CombatStrategies = "" AiPlayerbot.NonCombatStrategies = "" diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp index e2fb5d1c..0fe96724 100644 --- a/src/AiFactory.cpp +++ b/src/AiFactory.cpp @@ -541,8 +541,8 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const if (!player->GetGroup() || player->GetGroup()->GetLeaderGUID() == player->GetGUID()) { // let 25% of random not grouped (or grp leader) bots help other players - if (!urand(0, 3)) - nonCombatEngine->addStrategy("attack tagged"); + // if (!urand(0, 3)) + // nonCombatEngine->addStrategy("attack tagged"); nonCombatEngine->addStrategy("pvp"); // nonCombatEngine->addStrategy("collision"); @@ -577,7 +577,6 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const { nonCombatEngine->addStrategy("pvp"); // nonCombatEngine->addStrategy("collision"); - nonCombatEngine->addStrategy("grind"); // nonCombatEngine->addStrategy("group"); // nonCombatEngine->addStrategy("guild"); diff --git a/src/strategy/actions/ChooseTargetActions.cpp b/src/strategy/actions/ChooseTargetActions.cpp index a9bc1a36..d4a9f237 100644 --- a/src/strategy/actions/ChooseTargetActions.cpp +++ b/src/strategy/actions/ChooseTargetActions.cpp @@ -48,8 +48,8 @@ bool AttackAnythingAction::isUseful() if (!name.empty() && name.find("Dummy") != std::string::npos) // Target is not a targetdummy return false; - if (!ChooseRpgTargetAction::isFollowValid(bot, target)) //Do not grind mobs far away from master. - return false; + // if (!ChooseRpgTargetAction::isFollowValid(bot, target)) //Do not grind mobs far away from master. + // return false; return true; } diff --git a/src/strategy/actions/MovementActions.cpp b/src/strategy/actions/MovementActions.cpp index d0618cff..0b068b56 100644 --- a/src/strategy/actions/MovementActions.cpp +++ b/src/strategy/actions/MovementActions.cpp @@ -1491,7 +1491,7 @@ bool MoveRandomAction::Execute(Event event) bool MoveRandomAction::isUseful() { - return !AI_VALUE(GuidPosition, "rpg target") && !botAI->HasRealPlayerMaster(); + return !AI_VALUE(GuidPosition, "rpg target"); } bool MoveInsideAction::Execute(Event event)