Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/CreatureGroups: Add fields to creature_formations and code to prevent creature crossover in formations.

Browse Source 
Wiki update and db values too follow.
This commit is contained in:
Malcrom
2013-11-06 23:20:06 -03:30
parent a4b62d873f
commit b4a0533d81
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/2013_11_06_00_world_creature_formations.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE creature_formations ADD point_1 MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;
ALTER TABLE creature_formations ADD point_2 MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;

12
src/server/game/Entities/Creature/CreatureGroups.cpp
View File

@@ -80,7 +80,7 @@ void FormationMgr::LoadCreatureFormations()
CreatureGroupMap.clear();
//Get group data
QueryResult result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID");
QueryResult result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI, point_1, point_2 FROM creature_formations ORDER BY leaderGUID");
if (!result)
{
@@ -101,6 +101,8 @@ void FormationMgr::LoadCreatureFormations()
group_member->leaderGUID = fields[0].GetUInt32();
uint32 memberGUID = fields[1].GetUInt32();
group_member->groupAI = fields[4].GetUInt32();
group_member->point_1 = fields[5].GetUInt16();
group_member->point_2 = fields[6].GetUInt16();
//If creature is group leader we may skip loading of dist/angle
if (group_member->leaderGUID != memberGUID)
{
@@ -224,6 +226,14 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z)
if (member == m_leader || !member->IsAlive() || member->GetVictim())
continue;
if (itr->second->point_1)
{
if (m_leader->GetCurrentWaypointID() == itr->second->point_1)
itr->second->follow_angle = itr->second->follow_angle + M_PI;
if (m_leader->GetCurrentWaypointID() == itr->second->point_2)
itr->second->follow_angle = itr->second->follow_angle - M_PI;
}
float angle = itr->second->follow_angle;
float dist = itr->second->follow_dist;

2
src/server/game/Entities/Creature/CreatureGroups.h
View File

@@ -32,6 +32,8 @@ struct FormationInfo
float follow_dist;
float follow_angle;
uint8 groupAI;
uint16 point_1;
uint16 point_2;
};
typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType;