nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-01-24 05:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rewrite-equip-score2

Browse Source
This commit is contained in:
Yunfan Li
2024-08-11 23:47:25 +08:00
parent 840f5b8f2e b84741714f
commit 538d14691f
14 changed files with 622 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/strategy/triggers/PvpTriggers.cpp
View File

@@ -117,22 +117,53 @@ bool PlayerIsInBattlegroundWithoutFlag::IsActive()
}
bool PlayerHasFlag::IsActive()
{
return IsCapturingFlag(bot);
}
bool PlayerHasFlag::IsCapturingFlag(Player* bot)
{
if (bot->InBattleground())
{
if (bot->GetBattlegroundTypeId() == BATTLEGROUND_WS)
{
BattlegroundWS* bg = (BattlegroundWS*)botAI->GetBot()->GetBattleground();
if (bot->GetGUID() == bg->GetFlagPickerGUID(TEAM_ALLIANCE) ||
bot->GetGUID() == bg->GetFlagPickerGUID(TEAM_HORDE))
BattlegroundWS* bg = (BattlegroundWS*)bot->GetBattleground();
// bot is horde and has ally flag
if (bot->GetGUID() == bg->GetFlagPickerGUID(TEAM_ALLIANCE))
{
return true;
if (bg->GetFlagPickerGUID(TEAM_HORDE)) // enemy has flag too
{
if (GameObject* go = bg->GetBGObject(BG_WS_OBJECT_H_FLAG))
{
// only indicate capturing if signicant distance from own flag
// (otherwise allow bot to defend itself)
return bot->GetDistance(go) > 36.0f;
}
}
return true; // enemy doesnt have flag so we can cap immediately
}
// bot is ally and has horde flag
if (bot->GetGUID() == bg->GetFlagPickerGUID(TEAM_HORDE))
{
if (bg->GetFlagPickerGUID(TEAM_ALLIANCE)) // enemy has flag too
{
if (GameObject* go = bg->GetBGObject(BG_WS_OBJECT_A_FLAG))
{
// only indicate capturing if signicant distance from own flag
// (otherwise allow bot to defend itself)
return bot->GetDistance(go) > 36.0f;
}
}
return true; // enemy doesnt have flag so we can cap immediately
}
return false; // bot doesn't have flag
}
if (bot->GetBattlegroundTypeId() == BATTLEGROUND_EY)
{
BattlegroundEY* bg = (BattlegroundEY*)botAI->GetBot()->GetBattleground();
// TODO we should probably add similiar logic as WSG to allow combat
// when bot has flag but no bases are available to take it to
BattlegroundEY* bg = (BattlegroundEY*)bot->GetBattleground();
return bot->GetGUID() == bg->GetFlagPickerGUID();
}

3
src/strategy/triggers/PvpTriggers.h
View File

@@ -26,12 +26,15 @@ public:
bool IsActive() override;
};
// NOTE this trigger is only active when bot is actively returning flag
// (not when hiding in base because enemy has flag too)
class PlayerHasFlag : public Trigger
{
public:
PlayerHasFlag(PlayerbotAI* botAI) : Trigger(botAI, "player has flag") {}
bool IsActive() override;
static bool IsCapturingFlag(Player* bot);
};
class EnemyFlagCarrierNear : public Trigger