src/Ai/Class/Shaman/Strategy/GenericShamanStrategy.cpp

@@ -161,7 +161,9 @@ void ShamanAoeStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
     }
     else if (tab == SHAMAN_TAB_ENHANCEMENT)
     {
-        triggers.push_back(new TriggerNode("medium aoe",{ NextAction("fire nova", 23.0f), }));
+        triggers.push_back(new TriggerNode("medium aoe",{ NextAction("magma totem", 24.0f),
+                                                          NextAction("fire nova", 23.0f), }));
+
         triggers.push_back(new TriggerNode("maelstrom weapon 5 and medium aoe", { NextAction("chain lightning", 22.0f), }));
         triggers.push_back(new TriggerNode("maelstrom weapon 4 and medium aoe", { NextAction("chain lightning", 21.0f), }));
         triggers.push_back(new TriggerNode("enemy within melee", { NextAction("fire nova", 5.1f), }));

src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.cpp

@@ -1,7 +1,7 @@
 #include "Playerbots.h"
 #include "AiFactory.h"
-#include "ACTriggers.h"
-#include "ACActions.h"
+#include "AuchenaiCryptsTriggers.h"
+#include "AuchenaiCryptsActions.h"
 
 // Shirrak the Dead Watcher
 

src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.h

@@ -3,7 +3,7 @@
 
 #include "AttackAction.h"
 #include "MovementActions.h"
-#include "ACTriggers.h"
+#include "AuchenaiCryptsTriggers.h"
 
 // Shirrak the Dead Watcher
 

src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsActionContext.h

@@ -3,7 +3,7 @@
 
 #include "AiObjectContext.h"
 #include "Action.h"
-#include "ACActions.h"
+#include "AuchenaiCryptsActions.h"
 
 class TbcDungeonAuchenaiCryptsActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "AiObjectContext.h"
 #include "TriggerContext.h"
-#include "ACTriggers.h"
+#include "AuchenaiCryptsTriggers.h"
 
 class TbcDungeonAuchenaiCryptsTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.cpp

@@ -1,6 +1,6 @@
-#include "ACMultipliers.h"
-#include "ACActions.h"
-#include "ACTriggers.h"
+#include "AuchenaiCryptsMultipliers.h"
+#include "AuchenaiCryptsActions.h"
+#include "AuchenaiCryptsTriggers.h"
 #include "MovementActions.h"
 #include "ReachTargetActions.h"
 #include "FollowActions.h"

src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.cpp

@@ -1,6 +1,6 @@
-#include "ACTriggers.h"
-#include "ACStrategy.h"
-#include "ACMultipliers.h"
+#include "AuchenaiCryptsTriggers.h"
+#include "AuchenaiCryptsStrategy.h"
+#include "AuchenaiCryptsMultipliers.h"
 
 void TbcDungeonAuchenaiCryptsStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {

src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "ACTriggers.h"
+#include "AuchenaiCryptsTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 

src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "ANActions.h"
+#include "AzjolNerubActions.h"
 
 bool AttackWebWrapAction::isUseful() { return !botAI->IsHeal(bot); }
 bool AttackWebWrapAction::Execute(Event /*event*/)

src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.h

@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "ANTriggers.h"
+#include "AzjolNerubTriggers.h"
 
 class AttackWebWrapAction : public AttackAction
 {

src/Ai/Dungeon/AzjolNerub/AzjolNerubActionContext.h

@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "ANActions.h"
+#include "AzjolNerubActions.h"
 
 class WotlkDungeonANActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/AzjolNerub/AzjolNerubTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "ANTriggers.h"
+#include "AzjolNerubTriggers.h"
 
 class WotlkDungeonANTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp

@@ -1,9 +1,9 @@
-#include "ANMultipliers.h"
-#include "ANActions.h"
+#include "AzjolNerubMultipliers.h"
+#include "AzjolNerubActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "ANTriggers.h"
+#include "AzjolNerubTriggers.h"
 #include "Action.h"
 
 float KrikthirMultiplier::GetValue(Action* action)

src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.cpp

@@ -1,5 +1,5 @@
-#include "ANStrategy.h"
-#include "ANMultipliers.h"
+#include "AzjolNerubStrategy.h"
+#include "AzjolNerubMultipliers.h"
 
 void WotlkDungeonANStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {

src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "ANTriggers.h"
+#include "AzjolNerubTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 

src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "CoSActions.h"
+#include "CullingOfStratholmeActions.h"
 
 bool ExplodeGhoulSpreadAction::Execute(Event /*event*/)
 {

src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.h

@@ -6,7 +6,7 @@
 #include "GenericSpellActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "CoSTriggers.h"
+#include "CullingOfStratholmeTriggers.h"
 
 class ExplodeGhoulSpreadAction : public MovementAction
 {

src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeActionContext.h

@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "CoSActions.h"
+#include "CullingOfStratholmeActions.h"
 
 class WotlkDungeonCoSActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "CoSTriggers.h"
+#include "CullingOfStratholmeTriggers.h"
 
 class WotlkDungeonCoSTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp

@@ -1,9 +1,9 @@
-#include "CoSMultipliers.h"
-#include "CoSActions.h"
+#include "CullingOfStratholmeMultipliers.h"
+#include "CullingOfStratholmeActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "CoSTriggers.h"
+#include "CullingOfStratholmeTriggers.h"
 #include "Action.h"
 
 float EpochMultiplier::GetValue(Action* action)

src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp

@@ -1,5 +1,5 @@
-#include "CoSStrategy.h"
-#include "CoSMultipliers.h"
+#include "CullingOfStratholmeStrategy.h"
+#include "CullingOfStratholmeMultipliers.h"
 
 void WotlkDungeonCoSStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {

src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "CoSTriggers.h"
+#include "CullingOfStratholmeTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 

src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "DTKActions.h"
+#include "DrakTharonKeepActions.h"
 
 bool CorpseExplodeSpreadAction::Execute(Event /*event*/)
 {

src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.h

@@ -6,7 +6,7 @@
 #include "GenericSpellActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "DTKTriggers.h"
+#include "DrakTharonKeepTriggers.h"
 
 const Position NOVOS_PARTY_POSITION = Position(-378.852f, -760.349f, 28.587f);
 

src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepActionContext.h

@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "DTKActions.h"
+#include "DrakTharonKeepActions.h"
 
 class WotlkDungeonDTKActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "DTKTriggers.h"
+#include "DrakTharonKeepTriggers.h"
 
 class WotlkDungeonDTKTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp

@@ -1,9 +1,9 @@
-#include "DTKMultipliers.h"
-#include "DTKActions.h"
+#include "DrakTharonKeepMultipliers.h"
+#include "DrakTharonKeepActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "DTKTriggers.h"
+#include "DrakTharonKeepTriggers.h"
 #include "Action.h"
 
 float NovosMultiplier::GetValue(Action* action)

src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp

@@ -1,5 +1,5 @@
-#include "DTKStrategy.h"
-#include "DTKMultipliers.h"
+#include "DrakTharonKeepStrategy.h"
+#include "DrakTharonKeepMultipliers.h"
 
 void WotlkDungeonDTKStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {

src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "DTKTriggers.h"
+#include "DrakTharonKeepTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 

src/Ai/Dungeon/DungeonStrategyContext.h

@@ -2,22 +2,22 @@
 #define _PLAYERBOT_DUNGEONSTRATEGYCONTEXT_H
 
 #include "Strategy.h"
-#include "ACStrategy.h"
-#include "UKStrategy.h"
-#include "NexStrategy.h"
-#include "ANStrategy.h"
-#include "AKStrategy.h"
-#include "DTKStrategy.h"
-#include "VHStrategy.h"
-#include "GDStrategy.h"
-#include "HoSStrategy.h"
-#include "HoLStrategy.h"
-#include "OCStrategy.h"
-#include "UPStrategy.h"
-#include "CoSStrategy.h"
-#include "FoSStrategy.h"
-#include "PoSStrategy.h"
-#include "TOCStrategy.h"
+#include "AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.h"
+#include "UtgardeKeep/Strategy/UtgardeKeepStrategy.h"
+#include "Nexus/Strategy/NexusStrategy.h"
+#include "AzjolNerub/Strategy/AzjolNerubStrategy.h"
+#include "OldKingdom/Strategy/OldKingdomStrategy.h"
+#include "DraktharonKeep/Strategy/DrakTharonKeepStrategy.h"
+#include "VioletHold/Strategy/VioletHoldStrategy.h"
+#include "Gundrak/Strategy/GundrakStrategy.h"
+#include "HallsOfStone/Strategy/HallsOfStoneStrategy.h"
+#include "HallsOfLightning/Strategy/HallsOfLightningStrategy.h"
+#include "Oculus/Strategy/OculusStrategy.h"
+#include "UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h"
+#include "CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h"
+#include "ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h"
+#include "PitOfSaron/Strategy/PitOfSaronStrategy.h"
+#include "TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h"
 
 /*
 Full list/TODO:

src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "FoSActions.h"
+#include "ForgeOfSoulsActions.h"
 
 bool MoveFromBronjahmAction::Execute(Event /*event*/)
 {

src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.h

@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "FoSTriggers.h"
+#include "ForgeOfSoulsTriggers.h"
 
 const Position BRONJAHM_TANK_POSITION = Position(5297.920f, 2506.698f, 686.068f);
 

src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsActionContext.h

@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "FoSActions.h"
+#include "ForgeOfSoulsActions.h"
 
 class WotlkDungeonFoSActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "FoSTriggers.h"
+#include "ForgeOfSoulsTriggers.h"
 
 class WotlkDungeonFoSTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp

@@ -1,10 +1,10 @@
-#include "FoSMultipliers.h"
-#include "FoSActions.h"
+#include "ForgeOfSoulsMultipliers.h"
+#include "ForgeOfSoulsActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "FoSTriggers.h"
-#include "FoSActions.h"
+#include "ForgeOfSoulsTriggers.h"
+#include "ForgeOfSoulsActions.h"
 
 float BronjahmMultiplier::GetValue(Action* action) {
     Unit* boss = AI_VALUE2(Unit *, "find target", "bronjahm");

src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp

@@ -1,5 +1,5 @@
-#include "FoSStrategy.h"
-#include "FoSMultipliers.h"
+#include "ForgeOfSoulsStrategy.h"
+#include "ForgeOfSoulsMultipliers.h"
 
 void WotlkDungeonFoSStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {

src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "FoSTriggers.h"
+#include "ForgeOfSoulsTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 

src/Ai/Dungeon/Gundrak/Action/GundrakActions.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "GDActions.h"
+#include "GundrakActions.h"
 
 bool AvoidPoisonNovaAction::Execute(Event /*event*/)
 {

src/Ai/Dungeon/Gundrak/Action/GundrakActions.h

@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "GDTriggers.h"
+#include "GundrakTriggers.h"
 
 class AvoidPoisonNovaAction : public MovementAction
 {

src/Ai/Dungeon/Gundrak/GundrakActionContext.h

@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "GDActions.h"
+#include "GundrakActions.h"
 
 class WotlkDungeonGDActionContext : public NamedObjectContext<Action>
 {

src/Ai/Dungeon/Gundrak/GundrakTriggerContext.h

@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "GDTriggers.h"
+#include "GundrakTriggers.h"
 
 class WotlkDungeonGDTriggerContext : public NamedObjectContext<Trigger>
 {

src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.cpp

@@ -1,9 +1,9 @@
-#include "GDMultipliers.h"
-#include "GDActions.h"
+#include "GundrakMultipliers.h"
+#include "GundrakActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "GDTriggers.h"
+#include "GundrakTriggers.h"
 #include "Action.h"
 
 float SladranMultiplier::GetValue(Action* action)

src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.cpp

@@ -1,5 +1,5 @@
-#include "GDStrategy.h"
-#include "GDMultipliers.h"
+#include "GundrakStrategy.h"
+#include "GundrakMultipliers.h"
 
 void WotlkDungeonGDStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {

src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.cpp

@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "GDTriggers.h"
+#include "GundrakTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"