Update vendored mod-playerbots to ba46fcd
This commit is contained in:
@@ -1,39 +0,0 @@
|
||||
#include "FlightMasterCache.h"
|
||||
|
||||
void FlightMasterCache::AddHordeFlightMaster(uint32 entry, WorldPosition pos)
|
||||
{
|
||||
hordeFlightMasterCache[entry] = pos;
|
||||
}
|
||||
|
||||
void FlightMasterCache::AddAllianceFlightMaster(uint32 entry, WorldPosition pos)
|
||||
{
|
||||
allianceFlightMasterCache[entry] = pos;
|
||||
}
|
||||
|
||||
Creature* FlightMasterCache::GetNearestFlightMaster(Player* bot)
|
||||
{
|
||||
std::map<uint32, WorldPosition>& flightMasterCache =
|
||||
(bot->GetTeamId() == TEAM_ALLIANCE) ? allianceFlightMasterCache : hordeFlightMasterCache;
|
||||
|
||||
Creature* nearestFlightMaster = nullptr;
|
||||
float nearestDistance = std::numeric_limits<float>::max();
|
||||
|
||||
for (auto const& [entry, pos] : flightMasterCache)
|
||||
{
|
||||
if (pos.GetMapId() == bot->GetMapId())
|
||||
{
|
||||
float distance = bot->GetExactDist2dSq(pos);
|
||||
if (distance < nearestDistance)
|
||||
{
|
||||
Creature* flightMaster = ObjectAccessor::GetSpawnedCreatureByDBGUID(bot->GetMapId(), entry);
|
||||
if (flightMaster)
|
||||
{
|
||||
nearestDistance = distance;
|
||||
nearestFlightMaster = flightMaster;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nearestFlightMaster;
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
#ifndef _PLAYERBOT_FLIGHTMASTER_H
|
||||
#define _PLAYERBOT_FLIGHTMASTER_H
|
||||
|
||||
#include "Creature.h"
|
||||
#include "Player.h"
|
||||
#include "TravelMgr.h"
|
||||
|
||||
class FlightMasterCache
|
||||
{
|
||||
public:
|
||||
static FlightMasterCache& Instance()
|
||||
{
|
||||
static FlightMasterCache instance;
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
Creature* GetNearestFlightMaster(Player* bot);
|
||||
void AddHordeFlightMaster(uint32 entry, WorldPosition pos);
|
||||
void AddAllianceFlightMaster(uint32 entry, WorldPosition pos);
|
||||
|
||||
private:
|
||||
FlightMasterCache() = default;
|
||||
~FlightMasterCache() = default;
|
||||
|
||||
FlightMasterCache(const FlightMasterCache&) = delete;
|
||||
FlightMasterCache& operator=(const FlightMasterCache&) = delete;
|
||||
|
||||
FlightMasterCache(FlightMasterCache&&) = delete;
|
||||
FlightMasterCache& operator=(FlightMasterCache&&) = delete;
|
||||
|
||||
std::map<uint32, WorldPosition> allianceFlightMasterCache;
|
||||
std::map<uint32, WorldPosition> hordeFlightMasterCache;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
||||
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "Log.h"
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
/*
|
||||
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
||||
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
|
||||
#define _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
|
||||
#ifndef PLAYERBOTS_PLAYERBOTDUNGEONREPOSITORY_H
|
||||
#define PLAYERBOTS_PLAYERBOTDUNGEONREPOSITORY_H
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
||||
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "PlayerbotRepository.h"
|
||||
@@ -39,6 +40,8 @@ void PlayerbotRepository::Load(PlayerbotAI* botAI)
|
||||
botAI->ChangeStrategy(value, BOT_STATE_DEAD);
|
||||
} while (result->NextRow());
|
||||
|
||||
botAI->GetAiObjectContext()->GetUntypedValue("outfit list");
|
||||
|
||||
botAI->GetAiObjectContext()->Load(values);
|
||||
}
|
||||
}
|
||||
@@ -65,7 +68,7 @@ void PlayerbotRepository::Save(PlayerbotAI* botAI)
|
||||
SaveValue(guid, "dead", FormatStrategies("dead", botAI->GetStrategies(BOT_STATE_DEAD)));
|
||||
}
|
||||
|
||||
std::string const PlayerbotRepository::FormatStrategies(std::string const type, std::vector<std::string> strategies)
|
||||
std::string const PlayerbotRepository::FormatStrategies(std::string const /*type*/, std::vector<std::string> strategies)
|
||||
{
|
||||
std::ostringstream out;
|
||||
for (std::vector<std::string>::iterator i = strategies.begin(); i != strategies.end(); ++i)
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
/*
|
||||
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
||||
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef _PLAYERBOT_PLAYERBOTREPOSITORY_H
|
||||
#define _PLAYERBOT_PLAYERBOTREPOSITORY_H
|
||||
#ifndef PLAYERBOTS_PLAYERBOTREPOSITORY_H
|
||||
#define PLAYERBOTS_PLAYERBOTREPOSITORY_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
/*
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "Log.h"
|
||||
#include "DBCStores.h"
|
||||
#include "DatabaseEnv.h"
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
/*
|
||||
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license, you may redistribute it
|
||||
* and/or modify it under version 3 of the License, or (at your option), any later version.
|
||||
* This file is part of the mod-playerbots module for AzerothCore. See AUTHORS file for Copyright
|
||||
* information; released under GNU GPL v2 license, redistribute/modify under version 2 of the License,
|
||||
* or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
|
||||
#define _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
|
||||
#ifndef PLAYERBOTS_PLAYERBOTSPELLREPOSITORY_H
|
||||
#define PLAYERBOTS_PLAYERBOTSPELLREPOSITORY_H
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user