From b0e7a31380708d9273a106c1312fd9c53ab15cad Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:50:31 -0700 Subject: [PATCH] F scripts 2 Finish up removing extraneous includes from scripts that start with the letter F --- dScripts/CppScripts.h | 2 +- dScripts/FountainOfImagination.cpp | 2 ++ dScripts/FvCandle.cpp | 1 + dScripts/FvCandle.h | 1 - dScripts/FvConsoleLeftQuickbuild.cpp | 3 --- dScripts/FvConsoleRightQuickbuild.cpp | 3 --- dScripts/FvFacilityBrick.cpp | 5 ----- dScripts/FvFong.cpp | 2 +- dScripts/FvHorsemenTrigger.cpp | 6 ------ dScripts/FvMaelstromCavalry.cpp | 9 --------- dScripts/FvMaelstromCavalry.h | 1 - dScripts/FvMaelstromDragon.cpp | 1 - dScripts/FvMaelstromDragon.h | 1 - dScripts/FvRaceSmashEggImagineServer.cpp | 3 +-- 14 files changed, 6 insertions(+), 34 deletions(-) diff --git a/dScripts/CppScripts.h b/dScripts/CppScripts.h index 65f42b2f..ad724c50 100644 --- a/dScripts/CppScripts.h +++ b/dScripts/CppScripts.h @@ -1,7 +1,7 @@ #pragma once #include "dCommonVars.h" -#include #include "MissionState.h" +#include class User; class Entity; diff --git a/dScripts/FountainOfImagination.cpp b/dScripts/FountainOfImagination.cpp index 2d752db4..43351e18 100644 --- a/dScripts/FountainOfImagination.cpp +++ b/dScripts/FountainOfImagination.cpp @@ -1,4 +1,6 @@ #include "FountainOfImagination.h" +#include "dCommonVars.h" +#include "Entity.h" void FountainOfImagination::OnStartup(Entity *self) { self->SetVar(u"numCycles", 6); diff --git a/dScripts/FvCandle.cpp b/dScripts/FvCandle.cpp index 2081faf3..63f90f0b 100644 --- a/dScripts/FvCandle.cpp +++ b/dScripts/FvCandle.cpp @@ -1,5 +1,6 @@ #include "FvCandle.h" #include "MissionComponent.h" +#include "RenderComponent.h" std::vector FvCandle::m_Missions = {850, 1431, 1529, 1566, 1603}; diff --git a/dScripts/FvCandle.h b/dScripts/FvCandle.h index 1df63675..362d2a05 100644 --- a/dScripts/FvCandle.h +++ b/dScripts/FvCandle.h @@ -1,6 +1,5 @@ #pragma once #include "CppScripts.h" -#include "RenderComponent.h" class FvCandle : public CppScripts::Script { diff --git a/dScripts/FvConsoleLeftQuickbuild.cpp b/dScripts/FvConsoleLeftQuickbuild.cpp index 4b0a4f6c..ef281f15 100644 --- a/dScripts/FvConsoleLeftQuickbuild.cpp +++ b/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" diff --git a/dScripts/FvConsoleRightQuickbuild.cpp b/dScripts/FvConsoleRightQuickbuild.cpp index d72658b0..0bf9849a 100644 --- a/dScripts/FvConsoleRightQuickbuild.cpp +++ b/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" diff --git a/dScripts/FvFacilityBrick.cpp b/dScripts/FvFacilityBrick.cpp index 981a6472..fce9e630 100644 --- a/dScripts/FvFacilityBrick.cpp +++ b/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]; diff --git a/dScripts/FvFong.cpp b/dScripts/FvFong.cpp index 890bf0ff..9a3de0b2 100644 --- a/dScripts/FvFong.cpp +++ b/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) { diff --git a/dScripts/FvHorsemenTrigger.cpp b/dScripts/FvHorsemenTrigger.cpp index f04f132b..541c11e0 100644 --- a/dScripts/FvHorsemenTrigger.cpp +++ b/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>(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>(u"players")) diff --git a/dScripts/FvMaelstromCavalry.cpp b/dScripts/FvMaelstromCavalry.cpp index 25a303dd..b4a32991 100644 --- a/dScripts/FvMaelstromCavalry.cpp +++ b/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"); } } diff --git a/dScripts/FvMaelstromCavalry.h b/dScripts/FvMaelstromCavalry.h index cfa9ff4b..0fc3e840 100644 --- a/dScripts/FvMaelstromCavalry.h +++ b/dScripts/FvMaelstromCavalry.h @@ -1,6 +1,5 @@ #pragma once #include "CppScripts.h" -#include "RenderComponent.h" class FvMaelstromCavalry : public CppScripts::Script { diff --git a/dScripts/FvMaelstromDragon.cpp b/dScripts/FvMaelstromDragon.cpp index e67ce815..afdfa4ae 100644 --- a/dScripts/FvMaelstromDragon.cpp +++ b/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) diff --git a/dScripts/FvMaelstromDragon.h b/dScripts/FvMaelstromDragon.h index 993306d3..52af80c4 100644 --- a/dScripts/FvMaelstromDragon.h +++ b/dScripts/FvMaelstromDragon.h @@ -1,6 +1,5 @@ #pragma once #include "CppScripts.h" -#include "RenderComponent.h" class FvMaelstromDragon : public CppScripts::Script { diff --git a/dScripts/FvRaceSmashEggImagineServer.cpp b/dScripts/FvRaceSmashEggImagineServer.cpp index e198a830..696504e2 100644 --- a/dScripts/FvRaceSmashEggImagineServer.cpp +++ b/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) {