This commit is contained in:
Yunfan Li
2023-09-03 14:36:40 +08:00
parent 50a2be40f7
commit 0be6cc11aa
5 changed files with 14 additions and 11 deletions

View File

@@ -717,11 +717,11 @@ AiPlayerbot.DefaultTalentsOrder.5.1 =
AiPlayerbot.RandomClassSpecProbability.5.2 = 30
AiPlayerbot.DefaultTalentsOrder.5.2 =
# DeathKnight
AiPlayerbot.RandomClassSpecProbability.6.0 = 33
AiPlayerbot.RandomClassSpecProbability.6.0 = 30
AiPlayerbot.DefaultTalentsOrder.6.0 =
AiPlayerbot.RandomClassSpecProbability.6.1 = 33
AiPlayerbot.RandomClassSpecProbability.6.1 = 40
AiPlayerbot.DefaultTalentsOrder.6.1 =
AiPlayerbot.RandomClassSpecProbability.6.2 = 33
AiPlayerbot.RandomClassSpecProbability.6.2 = 30
AiPlayerbot.DefaultTalentsOrder.6.2 =
# Shaman
AiPlayerbot.RandomClassSpecProbability.7.0 = 33

View File

@@ -1221,9 +1221,9 @@ void PlayerbotFactory::InitEquipment(bool incremental)
items[slot].push_back(itemId);
}
}
if (items[slot].size() >= 10) break;
if (items[slot].size() >= 25) break;
}
} while (items[slot].size() < 10 && desiredQuality-- > ITEM_QUALITY_NORMAL);
} while (items[slot].size() < 25 && desiredQuality-- > ITEM_QUALITY_NORMAL);
}
for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; ++slot)

View File

@@ -641,8 +641,7 @@ std::vector<std::string> PlayerbotHolder::HandlePlayerbotCommand(char const* arg
char* charname = strtok (nullptr, " ");
if (!cmd)
{
messages.push_back("usage: list/reload/tweak/self or add/init/remove PLAYERNAME");
messages.push_back(" addclass CLASSNAME");
messages.push_back("usage: list/reload/tweak/self or add/init/remove PLAYERNAME or addclass CLASSNAME");
return messages;
}
@@ -714,6 +713,10 @@ std::vector<std::string> PlayerbotHolder::HandlePlayerbotCommand(char const* arg
if (!strcmp(cmd, "addclass"))
{
if (!charname) {
messages.push_back("addclass: invalid CLASSNAME(warrior/paladin/hunter/rogue/priest/shaman/mage/warlock/druid/dk)");
return messages;
}
uint8 claz;
if (!strcmp(charname, "warrior"))
{

View File

@@ -36,9 +36,9 @@ bool AttackAnythingAction::isUseful()
if (context->GetValue<TravelTarget*>("travel target")->Get()->isTraveling() &&
ChooseRpgTargetAction::isFollowValid(bot, *context->GetValue<TravelTarget*>("travel target")->Get()->getPosition())) //Bot is traveling
return false;
if (bot->IsInCombat()) {
return false;
}
// if (bot->IsInCombat()) {
// return false;
// }
Unit* target = GetTarget();
if (!target)

View File

@@ -755,7 +755,7 @@ bool MovementAction::IsMovingAllowed()
bot->HasUnitState(UNIT_STATE_LOST_CONTROL))
return false;
if (bot->GetMotionMaster()->GetMotionSlot(MOTION_SLOT_CONTROLLED)) {
if (bot->GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_CONTROLLED) != NULL_MOTION_TYPE) {
return false;
}