premerge 202306271411

jokerlfm · Jun 27, 2023 · 1672c27 · 1672c27
1 parent 0cdf104
commit 1672c27
Show file tree

Hide file tree

Showing 24 changed files with 2,772 additions and 1,533 deletions.
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
@@ -424,6 +424,8 @@ set (game_SRCS
 	Nier/NierManager.cpp
 	Nier/NierStrategies/NierStrategy_Base.h
 	Nier/NierStrategies/NierStrategy_Base.cpp
+	Nier/NierStrategies/GroupStrategy_Base.h
+	Nier/NierStrategies/GroupStrategy_Base.cpp
 	Nier/NierActions/NierAction_Base.h
 	Nier/NierActions/NierAction_Base.cpp
 	Nier/NierActions/NierAction_Druid.h

diff --git a/src/game/Group/Group.h b/src/game/Group/Group.h
@@ -35,6 +35,9 @@
 #include <map>
 #include <vector>
 
+ // lfm nier 
+#include "Nier/NierStrategies/GroupStrategy_Base.h"
+
 class WorldSession;
 class Map;
 class BattleGround;
@@ -210,6 +213,8 @@ class Group
         // lfm nier
         uint32 GetTargetIconByGuid(ObjectGuid ogTarget);
         ObjectGuid GetGuidByTargetIcon(uint32 icon);
+        std::unordered_map<uint32, GroupStrategy_Base*> nierGroupStrategyMap;
+        uint32 activeStrategyIndex;
 
         // lfm group target arrangement
         std::unordered_map<ObjectGuid, ObjectGuid> groupTargetArrangementMap;