aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/DataStores/DB2Stores.cpp34
-rw-r--r--src/server/game/DataStores/DBCEnums.h6
-rw-r--r--src/server/game/Entities/Player/Player.cpp3
-rw-r--r--src/server/game/Entities/Player/PlayerTaxi.cpp3
-rw-r--r--src/server/game/Entities/Taxi/TaxiPathGraph.cpp116
-rw-r--r--src/server/game/Entities/Taxi/TaxiPathGraph.h36
-rw-r--r--src/server/game/Server/Packets/MovementPackets.h6
7 files changed, 70 insertions, 134 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 24cd20f7427..f4ccf767c52 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -455,11 +455,6 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale)
TaxiMaskSize, (((sTaxiNodesStore.GetNumRows() - 1) / 8) + 1));
}
- std::set<uint32> spellPaths;
- for (SpellEffectEntry const* sInfo : sSpellEffectStore)
- if (sInfo->Effect == SPELL_EFFECT_SEND_TAXI)
- spellPaths.insert(sInfo->EffectMiscValue);
-
sTaxiNodesMask.fill(0);
sOldContinentsNodesMask.fill(0);
sHordeTaxiNodesMask.fill(0);
@@ -467,43 +462,24 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale)
sDeathKnightTaxiNodesMask.fill(0);
for (TaxiNodesEntry const* node : sTaxiNodesStore)
{
- TaxiPathSetBySource::const_iterator src_i = sTaxiPathSetBySource.find(node->ID);
- if (src_i != sTaxiPathSetBySource.end() && !src_i->second.empty())
- {
- bool ok = false;
- for (TaxiPathSetForSource::const_iterator dest_i = src_i->second.begin(); dest_i != src_i->second.end(); ++dest_i)
- {
- // not spell path
- if (spellPaths.find(dest_i->second.ID) == spellPaths.end())
- {
- ok = true;
- break;
- }
- }
-
- if (!ok)
- continue;
- }
+ if (!(node->Flags & (TAXI_NODE_FLAG_ALLIANCE | TAXI_NODE_FLAG_HORDE)))
+ continue;
// valid taxi network node
uint8 field = (uint8)((node->ID - 1) / 8);
uint32 submask = 1 << ((node->ID - 1) % 8);
sTaxiNodesMask[field] |= submask;
- if (node->MountCreatureID[0] && node->MountCreatureID[0] != 32981)
+ if (node->Flags & TAXI_NODE_FLAG_HORDE)
sHordeTaxiNodesMask[field] |= submask;
- if (node->MountCreatureID[1] && node->MountCreatureID[1] != 32981)
+ if (node->Flags & TAXI_NODE_FLAG_ALLIANCE)
sAllianceTaxiNodesMask[field] |= submask;
if (node->MountCreatureID[0] == 32981 || node->MountCreatureID[1] == 32981)
sDeathKnightTaxiNodesMask[field] |= submask;
- // old continent node (+ nodes virtually at old continents, check explicitly to avoid loading map files for zone info)
+ // todo: use WorldMapTransforms.dbc for this
if (node->MapID < 2 || node->ID == 82 || node->ID == 83 || node->ID == 93 || node->ID == 94)
sOldContinentsNodesMask[field] |= submask;
-
- // fix DK node at Ebon Hold and Shadow Vault flight master
- if (node->ID == 315 || node->ID == 333)
- ((TaxiNodesEntry*)node)->MountCreatureID[1] = 32981;
}
}
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index ed1a1470e91..a89ffddd99d 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -684,6 +684,12 @@ enum SummonPropFlags
SUMMON_PROP_FLAG_UNK21 = 0x00100000 // Totems
};
+enum TaxiNodeFlags
+{
+ TAXI_NODE_FLAG_ALLIANCE = 0x1,
+ TAXI_NODE_FLAG_HORDE = 0x2,
+};
+
enum VehicleSeatFlags
{
VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_ENTER = 0x00000001,
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 95cd705beba..8d9d9426596 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20792,7 +20792,10 @@ void Player::SetRestBonus(float rest_bonus_new)
bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc /*= NULL*/, uint32 spellid /*= 0*/)
{
if (nodes.size() < 2)
+ {
+ GetSession()->SendActivateTaxiReply(ERR_TAXINOSUCHPATH);
return false;
+ }
// not let cheating with start flight in time of logout process || while in combat || has type state: stunned || has type state: root
if (GetSession()->isLogingOut() || IsInCombat() || HasUnitState(UNIT_STATE_STUNNED) || HasUnitState(UNIT_STATE_ROOT))
diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp
index 63e3d303129..b937d7d6e38 100644
--- a/src/server/game/Entities/Player/PlayerTaxi.cpp
+++ b/src/server/game/Entities/Player/PlayerTaxi.cpp
@@ -7,12 +7,13 @@
void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level)
{
// class specific initial known nodes
+ TaxiMask const& factionMask = Player::TeamForRace(race) == HORDE ? sHordeTaxiNodesMask : sAllianceTaxiNodesMask;
switch (chrClass)
{
case CLASS_DEATH_KNIGHT:
{
for (uint8 i = 0; i < TaxiMaskSize; ++i)
- m_taximask[i] |= sOldContinentsNodesMask[i];
+ m_taximask[i] |= sOldContinentsNodesMask[i] & factionMask[i];
break;
}
}
diff --git a/src/server/game/Entities/Taxi/TaxiPathGraph.cpp b/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
index 589cbe04047..f08940c64b8 100644
--- a/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
+++ b/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
@@ -1,15 +1,13 @@
#include "TaxiPathGraph.h"
-#include <utility>
-#include "Util.h"
+#include "ObjectMgr.h"
#include "DBCStores.h"
#include "DB2Stores.h"
#include "Config.h"
-#include <boost/property_map/transform_value_property_map.hpp>
-
+#include "Util.h"
TaxiPathGraph::Graph TaxiPathGraph::m_graph = TaxiPathGraph::Graph();
std::vector<TaxiPathGraph::TaxiNodeInfo> TaxiPathGraph::m_vertices = std::vector<TaxiPathGraph::TaxiNodeInfo>();
-std::map<uint32, TaxiPathGraph::vertex> TaxiPathGraph::m_nodeIDToVertexID = std::map<uint32, TaxiPathGraph::vertex>();
+std::map<uint32, TaxiPathGraph::vertex_descriptor> TaxiPathGraph::m_nodeIDToVertexID = std::map<uint32, TaxiPathGraph::vertex_descriptor>();
std::set<TaxiPathGraph::edge> TaxiPathGraph::m_edgeDuplicateControl = std::set<TaxiPathGraph::edge>();
const int TaxiPathGraph::MaxFlightDistanceThreshold = 4000; //Because the client seems not to chose long flight paths even if that means the chosen path is not the minimum one
@@ -33,6 +31,7 @@ void DeterminaAlternateMapPosition(TaxiPathGraph::TaxiNodeInfo& info)
continue;
transformation = transform;
+ break;
}
if (!transformation)
@@ -56,19 +55,12 @@ void TaxiPathGraph::Initialize()
m_edgeDuplicateControl.clear();
std::vector<std::pair<edge, cost>> edges;
- std::set<uint32> returnableNodeIDs; // Used to omit special nodes which you can't return from
-
- for (TaxiPathEntry const* nodeInfo : sTaxiPathStore)
- if (nodeInfo->From != nodeInfo->To)
- returnableNodeIDs.insert(nodeInfo->From);
-
// Initialize here
for (TaxiPathEntry const* nodeInfo : sTaxiPathStore)
{
TaxiNodesEntry const* from = sTaxiNodesStore.LookupEntry(nodeInfo->From);
TaxiNodesEntry const* to = sTaxiNodesStore.LookupEntry(nodeInfo->To);
- if (from && to &&
- returnableNodeIDs.find(nodeInfo->From) != returnableNodeIDs.end() && returnableNodeIDs.find(nodeInfo->To) != returnableNodeIDs.end())
+ if (from && to && from->Flags & (TAXI_NODE_FLAG_ALLIANCE | TAXI_NODE_FLAG_HORDE) && to->Flags & (TAXI_NODE_FLAG_ALLIANCE | TAXI_NODE_FLAG_HORDE))
{
TaxiNodeInfo fromInfo(from->ID, from->Name->Str[sConfigMgr->GetIntDefault("DBC.Locale", LOCALE_enUS)], from->MapID, from->Pos.X, from->Pos.Y, from->Pos.Z);
TaxiNodeInfo toInfo(to->ID, to->Name->Str[sConfigMgr->GetIntDefault("DBC.Locale", LOCALE_enUS)], to->MapID, to->Pos.X, to->Pos.Y, to->Pos.Z);
@@ -80,25 +72,23 @@ void TaxiPathGraph::Initialize()
}
}
- returnableNodeIDs.clear();
// create graph
m_graph = Graph(_getVertexCount());
- WeightMap& weightmap = boost::get(boost::edge_weight, m_graph);
- /*IndexMap indexmap = boost::get(boost::vertex_index, m_graph);*/
+ WeightMap weightmap = boost::get(boost::edge_weight, m_graph);
- for(std::size_t j = 0; j < edges.size(); ++j)
+ for (std::size_t j = 0; j < edges.size(); ++j)
{
edge_descriptor e;
bool inserted;
boost::tie(e, inserted) = boost::add_edge(edges[j].first.first,
- edges[j].first.second,
- m_graph);
+ edges[j].first.second,
+ m_graph);
weightmap[e] = edges[j].second;
}
m_edgeDuplicateControl.clear();
}
-uint32 TaxiPathGraph::_getNodeIDFromVertexID(vertex vertexID)
+uint32 TaxiPathGraph::_getNodeIDFromVertexID(vertex_descriptor vertexID)
{
if (vertexID < m_vertices.size())
return m_vertices[vertexID].nodeID;
@@ -106,20 +96,20 @@ uint32 TaxiPathGraph::_getNodeIDFromVertexID(vertex vertexID)
return std::numeric_limits<uint32>::max();
}
-TaxiPathGraph::vertex TaxiPathGraph::_getVertexIDFromNodeID(uint32_t nodeID)
+TaxiPathGraph::vertex_descriptor TaxiPathGraph::_getVertexIDFromNodeID(uint32 nodeID)
{
if (m_nodeIDToVertexID.find(nodeID) != m_nodeIDToVertexID.end())
return m_nodeIDToVertexID[nodeID];
- return std::numeric_limits<vertex>::max();
+ return std::numeric_limits<vertex_descriptor>::max();
}
-TaxiPathGraph::vertex TaxiPathGraph::_getVertexIDFromNodeID(TaxiNodeInfo const& nodeInfo)
+TaxiPathGraph::vertex_descriptor TaxiPathGraph::_getVertexIDFromNodeID(TaxiNodeInfo const& nodeInfo)
{
if (m_nodeIDToVertexID.find(nodeInfo.nodeID) != m_nodeIDToVertexID.end())
return m_nodeIDToVertexID[nodeInfo.nodeID];
- return std::numeric_limits<vertex>::max();
+ return std::numeric_limits<vertex_descriptor>::max();
}
size_t TaxiPathGraph::_getVertexCount()
@@ -132,92 +122,72 @@ void TaxiPathGraph::_addVerticeAndEdgeFromNodeInfo(const TaxiNodeInfo& from, con
{
if (from.nodeID != to.nodeID && m_edgeDuplicateControl.find(edge(from.nodeID, to.nodeID)) == m_edgeDuplicateControl.end())
{
- vertex fromVertexID = _createVertexFromFromNodeInfoIfNeeded(from);
- vertex toVertexID = _createVertexFromFromNodeInfoIfNeeded(to);
+ vertex_descriptor fromVertexID = _createVertexFromFromNodeInfoIfNeeded(from);
+ vertex_descriptor toVertexID = _createVertexFromFromNodeInfoIfNeeded(to);
+ // TODO: Calculate distance using TaxiPathNode
edges.push_back(std::make_pair(edge(fromVertexID, toVertexID), from.pos.Distance(to.pos)));
m_edgeDuplicateControl.insert(edge(from.nodeID, to.nodeID));
}
}
-size_t TaxiPathGraph::GetCompleteNodeRoute(uint32_t sourceNodeID, uint32_t destinationNodeID, std::vector<uint32>& shortestPath)
+size_t TaxiPathGraph::GetCompleteNodeRoute(uint32 sourceNodeID, uint32 destinationNodeID, std::vector<uint32>& shortestPath)
{
/*
Information about node algorithm from client
- Since client does not give information about *ALL* nodes you have to pass by when going from sourceNodeID to destinationNodeID, algorithms like A* on directed graph of taxi
- nodes are needed. But since, 6.x implemented early landing request feature, client seems not to be picking the least expensive path in terms in neither distance neither money cost.
- Examining several paths I discovered the following algorithm:
+ Since client does not give information about *ALL* nodes you have to pass by when going from sourceNodeID to destinationNodeID, we need to use Dijkstra algorithm.
+ Examining several paths I discovered the following algorithm:
* If destinationNodeID has is the next destination, connected directly to sourceNodeID, then, client just pick up this route regardless of distance
- * else, client will avoid to pick a node which distance is equal or greater than TaxiPathGraph::MaxFlightDistanceThreshold to avoid long node to node distances for requesting
- early landings, so we use A* algorithm with a custom weight property map to reflect this condition.
-
+ * else we use dijkstra to find the shortest path.
* When early landing is requested, according to behavior on retail, you can never end in a node you did not discovered before
*/
- bool hasDirectPath = false;
- shortestPath.clear();
- // Find if we have a direct path from sourceNodeID to destinationNodeID in graph
- boost::graph_traits<Graph>::out_edge_iterator ei, ei_end;
- for (boost::tie(ei, ei_end) = boost::out_edges(_getVertexIDFromNodeID(sourceNodeID), m_graph); ei != ei_end && !hasDirectPath; ++ei)
- if (boost::target(*ei, m_graph) == _getVertexIDFromNodeID(destinationNodeID))
- hasDirectPath = true;
-
- if (hasDirectPath)
+ // Find if we have a direct path
+ uint32 pathId, goldCost;
+ sObjectMgr->GetTaxiPath(sourceNodeID, destinationNodeID, pathId, goldCost);
+ if (pathId)
shortestPath = { sourceNodeID, destinationNodeID };
else
{
- std::vector<Graph::vertex_descriptor> p(boost::num_vertices(m_graph));
- std::vector<cost> d(boost::num_vertices(m_graph));
+ shortestPath.clear();
+ std::vector<vertex_descriptor> p(boost::num_vertices(m_graph));
- vertex start = _getVertexIDFromNodeID(sourceNodeID);
- vertex goal = _getVertexIDFromNodeID(destinationNodeID);
+ boost::dijkstra_shortest_paths(m_graph, _getVertexIDFromNodeID(sourceNodeID),
+ boost::predecessor_map(boost::make_iterator_property_map(p.begin(), get(boost::vertex_index, m_graph))));
- try
+ // found a path to the goal
+ for (vertex_descriptor v = _getVertexIDFromNodeID(destinationNodeID); ; v = p[v])
{
- auto wow_custom_weight_map = boost::make_transform_value_property_map(
- [](float w) { return w>MaxFlightDistanceThreshold ? w*1000 : w; },
- boost::get(boost::edge_weight, m_graph)
- );
- boost::astar_search(m_graph, start,
- boost::astar_heuristic<Graph, cost>(),
- boost::weight_map(wow_custom_weight_map)
- .predecessor_map(boost::make_iterator_property_map(p.begin(), get(boost::vertex_index, m_graph)))
- .distance_map(boost::make_iterator_property_map(d.begin(), get(boost::vertex_index, m_graph)))
- .visitor(astar_goal_visitor<vertex>(goal)));
- }
- catch(found_goal fg)
- { // found a path to the goal
- std::list<vertex> shortest_path;
- for(vertex v = goal;; v = p[v]) {
- shortest_path.push_front(v);
- if(p[v] == v)
- break;
- }
-
- for(std::list<vertex>::const_iterator spi = shortest_path.begin(); spi != shortest_path.end(); spi++)
- shortestPath.push_back(_getNodeIDFromVertexID(*spi));
+ shortestPath.push_back(_getNodeIDFromVertexID(v));
+ if (v == p[v])
+ break;
}
+
+ std::reverse(shortestPath.begin(), shortestPath.end());
}
+
return shortestPath.size();
}
-TaxiPathGraph::TaxiNodeInfo const* TaxiPathGraph::GetTaxiNodeInfoByID(uint32_t nodeID)
+TaxiPathGraph::TaxiNodeInfo const* TaxiPathGraph::GetTaxiNodeInfoByID(uint32 nodeID)
{
- vertex vertexID = _getVertexIDFromNodeID(nodeID);
+ vertex_descriptor vertexID = _getVertexIDFromNodeID(nodeID);
if (m_vertices.size() < vertexID)
return nullptr;
+
return &m_vertices[vertexID];
}
-TaxiPathGraph::vertex TaxiPathGraph::_createVertexFromFromNodeInfoIfNeeded(const TaxiNodeInfo& nodeInfo)
+TaxiPathGraph::vertex_descriptor TaxiPathGraph::_createVertexFromFromNodeInfoIfNeeded(TaxiNodeInfo const& nodeInfo)
{
//Check if we need a new one or if it may be already created
if (m_nodeIDToVertexID.find(nodeInfo.nodeID) == m_nodeIDToVertexID.end())
{
- vertex verID = m_vertices.size();
+ vertex_descriptor verID = m_vertices.size();
m_vertices.push_back(nodeInfo);
m_nodeIDToVertexID[nodeInfo.nodeID] = verID;
return verID;
}
+
return m_nodeIDToVertexID[nodeInfo.nodeID];
}
diff --git a/src/server/game/Entities/Taxi/TaxiPathGraph.h b/src/server/game/Entities/Taxi/TaxiPathGraph.h
index a6b8797793a..43443bbb7fe 100644
--- a/src/server/game/Entities/Taxi/TaxiPathGraph.h
+++ b/src/server/game/Entities/Taxi/TaxiPathGraph.h
@@ -1,7 +1,7 @@
#ifndef TAXIPATHGRAPH_HPP
#define TAXIPATHGRAPH_HPP
-#include <boost/graph/astar_search.hpp>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <vector>
#include "Define.h"
@@ -42,36 +42,16 @@ public:
private:
typedef float cost;
- struct found_goal {}; // exception for termination
-
- // visitor that terminates when we find the goal
- template <class Vertex>
- class astar_goal_visitor : public boost::default_astar_visitor
- {
- public:
- astar_goal_visitor(Vertex goal) : m_goal(goal) {}
- template <class Graph>
- void examine_vertex(Vertex u, Graph& /* g */) {
- if(u == m_goal)
- throw found_goal();
- }
- private:
- Vertex m_goal;
- };
-
// specify some types
- typedef boost::adjacency_list<boost::listS, boost::vecS, boost::directedS, boost::property<boost::vertex_index_t, uint32>, boost::property<boost::edge_weight_t, cost> > Graph;
+ typedef boost::adjacency_list<boost::listS, boost::vecS, boost::directedS, boost::property<boost::vertex_index_t, uint32>, boost::property<boost::edge_weight_t, cost>> Graph;
typedef boost::property_map<Graph, boost::edge_weight_t>::type WeightMap;
- typedef boost::property_map<Graph, boost::vertex_index_t>::type IndexMap;
- typedef Graph::vertex_descriptor vertex;
- typedef Graph::edge_descriptor edge_descriptor;
typedef Graph::vertex_descriptor vertex_descriptor;
- typedef Graph::vertex_iterator vertex_iterator;
+ typedef Graph::edge_descriptor edge_descriptor;
typedef std::pair<uint32, uint32> edge;
static Graph m_graph;
static std::vector<TaxiNodeInfo> m_vertices;
- static std::map<uint32, vertex> m_nodeIDToVertexID;
+ static std::map<uint32, vertex_descriptor> m_nodeIDToVertexID;
static std::set<edge> m_edgeDuplicateControl;
static const int MaxFlightDistanceThreshold;
@@ -80,10 +60,10 @@ private:
TaxiPathGraph(TaxiPathGraph const&) = delete;
TaxiPathGraph& operator=(TaxiPathGraph const&) = delete;
- static vertex _getVertexIDFromNodeID(uint32 nodeID);
- static vertex _getVertexIDFromNodeID(TaxiNodeInfo const& nodeInfo);
- static uint32 _getNodeIDFromVertexID(vertex vertexID);
- static vertex _createVertexFromFromNodeInfoIfNeeded(TaxiNodeInfo const&);
+ static vertex_descriptor _getVertexIDFromNodeID(uint32 nodeID);
+ static vertex_descriptor _getVertexIDFromNodeID(TaxiNodeInfo const& nodeInfo);
+ static uint32 _getNodeIDFromVertexID(vertex_descriptor vertexID);
+ static vertex_descriptor _createVertexFromFromNodeInfoIfNeeded(TaxiNodeInfo const&);
static size_t _getVertexCount();
};
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index 2fef4d10227..7ce4abb3726 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -423,14 +423,14 @@ namespace WorldPackets
ObjectGuid Guid;
bool On = false;
};
-
+
class MoveSplineDone final : public ClientPacket
{
public:
MoveSplineDone(WorldPacket&& packet) : ClientPacket(CMSG_MOVE_SPLINE_DONE, std::move(packet)) { }
-
+
void Read() override;
-
+
MovementInfo movementInfo;
int32 SplineID;
};