F scripts 2

Finish up removing extraneous includes from scripts that start with the letter F

dScripts/CppScripts.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "dCommonVars.h"
-#include <string>
 #include "MissionState.h"
+#include <string>
 
 class User;
 class Entity;

dScripts/FountainOfImagination.cpp

@@ -1,4 +1,6 @@
 #include "FountainOfImagination.h"
+#include "dCommonVars.h"
+#include "Entity.h"
 
 void FountainOfImagination::OnStartup(Entity *self) {
     self->SetVar<uint32_t>(u"numCycles", 6);

dScripts/FvCandle.cpp

@@ -1,5 +1,6 @@
 #include "FvCandle.h"
 #include "MissionComponent.h"
+#include "RenderComponent.h"
 
 std::vector<int32_t> FvCandle::m_Missions = {850, 1431, 1529, 1566, 1603};
 

dScripts/FvCandle.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "RenderComponent.h"
 
 class FvCandle : public CppScripts::Script 
 {

dScripts/FvConsoleLeftQuickbuild.cpp

@@ -1,7 +1,4 @@
 #include "FvConsoleLeftQuickbuild.h"
-#include "RebuildComponent.h"
-#include "GeneralUtils.h"
-#include "dZoneManager.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
 

dScripts/FvConsoleRightQuickbuild.cpp

@@ -1,7 +1,4 @@
 #include "FvConsoleRightQuickbuild.h"
-#include "RebuildComponent.h"
-#include "GeneralUtils.h"
-#include "dZoneManager.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
 

dScripts/FvFacilityBrick.cpp

@@ -1,10 +1,7 @@
 #include "FvFacilityBrick.h"
 #include "GameMessages.h"
-#include "GeneralUtils.h"
 #include "dZoneManager.h"
 #include "EntityManager.h"
-#include "dLogger.h"
-
 
 void FvFacilityBrick::OnStartup(Entity* self) 
 {
@@ -14,8 +11,6 @@ void FvFacilityBrick::OnStartup(Entity* self)
 
 void FvFacilityBrick::OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1, int32_t param2) 
 {
-    Game::logger->Log("FvFacilityBrick", "Notify: %s\n", name.c_str());
-
     auto* brickSpawner = dZoneManager::Instance()->GetSpawnersByName("ImaginationBrick")[0];
     auto* bugSpawner = dZoneManager::Instance()->GetSpawnersByName("MaelstromBug")[0];
     auto* canisterSpawner = dZoneManager::Instance()->GetSpawnersByName("BrickCanister")[0];

dScripts/FvFong.cpp

@@ -1,6 +1,6 @@
 #include "FvFong.h"
 #include "Darkitect.h"
-#include "MissionComponent.h"
+#include "MissionState.h"
 
 void FvFong::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState)
 {

dScripts/FvHorsemenTrigger.cpp

@@ -1,7 +1,6 @@
 #include "FvHorsemenTrigger.h"
 #include "EntityManager.h"
 #include "MissionComponent.h"
-#include "dLogger.h"
 
 void FvHorsemenTrigger::OnStartup(Entity* self) 
 {
@@ -12,8 +11,6 @@ void FvHorsemenTrigger::OnStartup(Entity* self)
 
 void FvHorsemenTrigger::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) 
 {
-    Game::logger->Log("FvHorsemenTrigger", "Proximity update\n");
-
     if (name != "horsemenTrigger" || !entering->IsPlayer())
     {
         return;
@@ -25,12 +22,10 @@ void FvHorsemenTrigger::OnProximityUpdate(Entity* self, Entity* entering, std::s
 
     if (status == "ENTER" && iter == players.end())
     {
-        Game::logger->Log("FvHorsemenTrigger", "Proximity enter\n");
         players.push_back(entering->GetObjectID());
     }
     else if (status == "LEAVE" && iter != players.end())
     {
-        Game::logger->Log("FvHorsemenTrigger", "Proximity leave\n");
         players.erase(iter);
     }
 
@@ -43,7 +38,6 @@ FvHorsemenTrigger::OnFireEventServerSide(Entity *self, Entity *sender, std::stri
 {
     auto players = self->GetVar<std::vector<LWOOBJID>>(u"players");
 
-    Game::logger->Log("FvHorsemenTrigger", "Got event %s with %i players\n", args.c_str(), players.size());
     if (args == "HorsemenDeath")
     {
         for (const auto& playerId : self->GetVar<std::vector<LWOOBJID>>(u"players"))

dScripts/FvMaelstromCavalry.cpp

@@ -1,21 +1,16 @@
 #include "FvMaelstromCavalry.h"
 #include "EntityManager.h"
-#include "dLogger.h"
 
 void FvMaelstromCavalry::OnStartup(Entity* self) 
 {
     for (const auto& group : self->GetGroups())
     {
-        Game::logger->Log("FvMaelstromCavalry", "Got group: %s\n", group.c_str());
-
         const auto& objects = EntityManager::Instance()->GetEntitiesInGroup(group);
 
         for (auto* obj : objects)
         {
             if (obj->GetLOT() != 8551) continue;
 
-            Game::logger->Log("FvMaelstromCavalry", "Trigger in group: %s\n", group.c_str());
-
             obj->OnFireEventServerSide(self, "ISpawned");
         }
     }
@@ -28,8 +23,6 @@ void FvMaelstromCavalry::OnDie(Entity* self, Entity* killer)
         return;
     }
 
-    Game::logger->Log("FvMaelstromCavalry", "Killer: %i\n", killer->GetLOT());
-
     if (killer->GetLOT() != 8665)
     {
         return;
@@ -39,8 +32,6 @@ void FvMaelstromCavalry::OnDie(Entity* self, Entity* killer)
 
     for (auto* trigger : triggers)
     {
-        Game::logger->Log("FvMaelstromCavalry", "Trigger for: %i\n", killer->GetLOT());
-
         trigger->OnFireEventServerSide(self, "HorsemenDeath");
     }
 }

dScripts/FvMaelstromCavalry.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "RenderComponent.h"
 
 class FvMaelstromCavalry : public CppScripts::Script 
 {

dScripts/FvMaelstromDragon.cpp

@@ -2,7 +2,6 @@
 #include "EntityManager.h"
 #include "SkillComponent.h"
 #include "BaseCombatAIComponent.h"
-#include "RenderComponent.h"
 #include "DestroyableComponent.h"
 
 void FvMaelstromDragon::OnStartup(Entity* self) 

dScripts/FvMaelstromDragon.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "RenderComponent.h"
 
 class FvMaelstromDragon : public CppScripts::Script 
 {

dScripts/FvRaceSmashEggImagineServer.cpp

@@ -1,11 +1,10 @@
+#include "FvRaceSmashEggImagineServer.h"
 #include "CharacterComponent.h"
 #include "DestroyableComponent.h"
 #include "EntityManager.h"
-#include "FvRaceSmashEggImagineServer.h"
 #include "PossessableComponent.h"
 #include "RacingTaskParam.h"
 #include "MissionComponent.h"
-#include "MissionTaskType.h"
 
 void FvRaceSmashEggImagineServer::OnDie(Entity *self, Entity *killer) {
     if (killer != nullptr) {