C Scripts and remove unneeded includes from base cppscripts header

Remove the MissionComponent and Loot includes from all base scripts and place their needed includes in the respective scripts.

dGame/dComponents/PropertyManagementComponent.cpp

@@ -2,6 +2,7 @@
 
 #include <sstream>
 
+#include "MissionComponent.h"
 #include "EntityManager.h"
 #include "PropertyDataMessage.h"
 #include "UserManager.h"

dGame/dComponents/RebuildComponent.cpp

@@ -6,6 +6,8 @@
 #include "Game.h"
 #include "dLogger.h"
 #include "CharacterComponent.h"
+#include "MissionComponent.h"
+#include "MissionTaskType.h"
 
 #include "dServer.h"
 #include "PacketUtils.h"

dGame/dMission/MissionState.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#ifndef __MISSIONSTATE__H__
+#define __MISSIONSTATE__H__
+
 /**
  * Represents the possible states a mission can be in
  */
@@ -49,3 +52,5 @@ enum class MissionState : int {
      */
     MISSION_STATE_COMPLETE_READY_TO_COMPLETE = 12
 };
+
+#endif  //!__MISSIONSTATE__H__

dScripts/ActSharkPlayerDeathTrigger.cpp

@@ -1,4 +1,6 @@
 #include "ActSharkPlayerDeathTrigger.h"
+#include "MissionComponent.h"
+#include "MissionTaskType.h"
 #include "Entity.h"
 
 void ActSharkPlayerDeathTrigger::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1,

dScripts/AgPropGuard.cpp

@@ -3,6 +3,7 @@
 #include "Character.h"
 #include "EntityManager.h"
 #include "InventoryComponent.h"
+#include "MissionComponent.h"
 #include "Item.h"
 
 void AgPropGuard::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState)

dScripts/BasePropertyServer.cpp

@@ -7,6 +7,7 @@
 #include "Entity.h"
 #include "RenderComponent.h"
 #include "PropertyManagementComponent.h"
+#include "MissionComponent.h"
 
 void BasePropertyServer::SetGameVariables(Entity *self) {
     self->SetVar<std::string>(ClaimMarkerGroup, "");

dScripts/BaseSurvivalServer.cpp

@@ -4,6 +4,8 @@
 #include "EntityManager.h"
 #include "dZoneManager.h"
 #include "Player.h"
+#include "MissionTaskType.h"
+#include "MissionComponent.h"
 #include "Character.h"
 
 void BaseSurvivalServer::SetGameVariables(Entity *self) {

dScripts/BaseWavesServer.cpp

@@ -4,6 +4,8 @@
 #include "EntityManager.h"
 #include "dZoneManager.h"
 #include "Player.h"
+#include "MissionTaskType.h"
+#include "MissionComponent.h"
 #include "Character.h"
 
 // Done

dScripts/BootyDigServer.cpp

@@ -1,6 +1,8 @@
 #include "BootyDigServer.h"
 #include "EntityManager.h"
 #include "RenderComponent.h"
+#include "MissionComponent.h"
+#include "MissionTaskType.h"
 
 void BootyDigServer::OnStartup(Entity *self) {
     auto* zoneControlObject = EntityManager::Instance()->GetZoneControlEntity();

dScripts/CatapultBaseServer.cpp

@@ -1,8 +1,6 @@
 #include "CatapultBaseServer.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
-#include "dZoneManager.h"
-
 
 void CatapultBaseServer::OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1, int32_t param2) 
 {

dScripts/CatapultBaseServer.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "Spawner.h"
-#include "dZoneManager.h"
-#include "dCommonVars.h"
 
 class CatapultBaseServer : public CppScripts::Script {
 public:

dScripts/CatapultBouncerServer.cpp

@@ -1,7 +1,6 @@
 #include "CatapultBouncerServer.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
-#include "dZoneManager.h"
 
 void CatapultBouncerServer::OnRebuildComplete(Entity* self, Entity* target) 
 {

dScripts/CatapultBouncerServer.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "Spawner.h"
-#include "dZoneManager.h"
-#include "dCommonVars.h"
 
 class CatapultBouncerServer : public CppScripts::Script {
 public:

dScripts/CavePrisonCage.cpp

@@ -1,9 +1,9 @@
 #include "CavePrisonCage.h"
 #include "EntityManager.h"
 #include "RebuildComponent.h"
-#include "MovingPlatformComponent.h"
 #include "GameMessages.h"
 #include "Character.h"
+#include "dZoneManager.h"
 
 void CavePrisonCage::OnStartup(Entity *self) 
 {

dScripts/CavePrisonCage.h

@@ -1,8 +1,5 @@
 #pragma once
 #include "CppScripts.h"
-#include "Spawner.h"
-#include "dZoneManager.h"
-#include "dCommonVars.h"
 
 class CavePrisonCage : public CppScripts::Script {
 public:

dScripts/ChooseYourDestinationNsToNt.cpp

@@ -1,8 +1,6 @@
 #include "ChooseYourDestinationNsToNt.h"
 #include "Character.h"
 #include "GameMessages.h"
-#include "dZoneManager.h"
-#include "EntityManager.h"
 
 bool ChooseYourDestinationNsToNt::CheckChoice(Entity* self, Entity* player) 
 {

dScripts/ChooseYourDestinationNsToNt.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "CppScripts.h"
 
 class ChooseYourDestinationNsToNt
 {

dScripts/ClRing.cpp

@@ -1,6 +1,4 @@
 #include "ClRing.h"
-#include "EntityManager.h"
-#include "Character.h"
 
 void ClRing::OnCollisionPhantom(Entity* self, Entity* target) 
 {

dScripts/CppScripts.cpp

@@ -4,10 +4,8 @@
 
 #include "CppScripts.h"
 #include "GameMessages.h"
-#include "dpWorld.h"
 #include "Entity.h"
 #include "ScriptComponent.h"
-#include "EntityManager.h"
 #include "Game.h"
 #include "dLogger.h"
 #include "InvalidScript.h"

dScripts/CppScripts.h

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

dScripts/ExplodingAsset.cpp

@@ -2,6 +2,8 @@
 
 #include "DestroyableComponent.h"
 #include "GameMessages.h"
+#include "MissionComponent.h"
+#include "MissionTaskType.h"
 #include "SkillComponent.h"
 
 //TODO: this has to be updated so that you only get killed if you're in a certain radius.

dScripts/FvBounceOverWall.cpp

@@ -1,4 +1,5 @@
 #include "FvBounceOverWall.h"
+#include "MissionComponent.h"
 
 void FvBounceOverWall::OnCollisionPhantom(Entity* self, Entity* target) {
     auto missionComponent = target->GetComponent<MissionComponent>();

dScripts/FvFreeGfNinjas.cpp

@@ -1,5 +1,6 @@
 #include "FvFreeGfNinjas.h"
 #include "Character.h"
+#include "MissionComponent.h"
 
 void FvFreeGfNinjas::OnMissionDialogueOK(Entity *self, Entity *target, int missionID, MissionState missionState) {
     if (missionID == 705 && missionState == MissionState::MISSION_STATE_AVAILABLE) {

dScripts/FvPassThroughWall.cpp

@@ -1,5 +1,6 @@
 #include "FvPassThroughWall.h"
 #include "InventoryComponent.h"
+#include "MissionComponent.h"
 
 void FvPassThroughWall::OnCollisionPhantom(Entity* self, Entity* target) {
     auto missionComponent = target->GetComponent<MissionComponent>();

dScripts/FvRaceSmashEggImagineServer.cpp

@@ -4,6 +4,8 @@
 #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) {

dScripts/GfTikiTorch.cpp

@@ -1,7 +1,8 @@
 #include "GfTikiTorch.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
-
+#include "MissionComponent.h"
+#include "MissionTaskType.h"
 #include "RenderComponent.h"
 
 void GfTikiTorch::OnStartup(Entity* self) {

dScripts/ImaginationBackpackHealServer.cpp

@@ -1,5 +1,6 @@
 #include "ImaginationBackpackHealServer.h"
 #include "GameMessages.h"
+#include "MissionComponent.h"
 
 void ImaginationBackpackHealServer::OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) {
     if (message == "CastImaginationBackpack") {

dScripts/LegoDieRoll.cpp

@@ -2,6 +2,7 @@
 #include "Entity.h"
 #include "dLogger.h"
 #include "GameMessages.h"
+#include "MissionComponent.h"
 
 void LegoDieRoll::OnStartup(Entity* self) {
     self->AddTimer("DoneRolling", 10.0f);

dScripts/NpcAgCourseStarter.cpp

@@ -6,6 +6,7 @@
 #include "LeaderboardManager.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "MissionComponent.h"
 #include <ctime>
 
 void NpcAgCourseStarter::OnStartup(Entity* self) {

dScripts/NpcNjAssistantServer.cpp

@@ -1,6 +1,7 @@
 #include "NpcNjAssistantServer.h"
 #include "GameMessages.h"
 #include "InventoryComponent.h"
+#include "MissionComponent.h"
 #include "Item.h"
 
 void NpcNjAssistantServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {

dScripts/NpcNpSpacemanBob.cpp

@@ -4,6 +4,7 @@
 #include "GameMessages.h"
 #include "MissionState.h"
 #include "Game.h"
+#include "MissionComponent.h"
 #include "dLogger.h"
 
 void NpcNpSpacemanBob::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState)

dScripts/NsConcertInstrument.cpp

@@ -5,6 +5,7 @@
 #include "EntityManager.h"
 #include "RebuildComponent.h"
 #include "SoundTriggerComponent.h"
+#include "MissionComponent.h"
 
 // Constants are at the bottom
 

dScripts/NsConcertQuickBuild.cpp

@@ -5,6 +5,7 @@
 #include "RenderComponent.h"
 #include "GameMessages.h"
 #include "MovingPlatformComponent.h"
+#include "MissionComponent.h"
 
 const float NsConcertQuickBuild::resetTime = 40.0f;
 const float NsConcertQuickBuild::resetBlinkTime = 6.0f;

dScripts/NsJohnnyMissionServer.cpp

@@ -1,4 +1,5 @@
 #include "NsJohnnyMissionServer.h"
+#include "MissionComponent.h"
 
 void NsJohnnyMissionServer::OnMissionDialogueOK(Entity *self, Entity *target, int missionID, MissionState missionState) {
     if (missionID == 773 && missionState <= MissionState::MISSION_STATE_ACTIVE) {

dScripts/NsModularBuild.cpp

@@ -1,6 +1,7 @@
 #include "NsModularBuild.h"
 #include "EntityManager.h"
 #include "Character.h"
+#include "MissionComponent.h"
 
 void NsModularBuild::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector<LOT> modules) {
 	if (bCompleted) {

dScripts/NtAssemblyTubeServer.cpp

@@ -4,6 +4,7 @@
 #include "EntityManager.h"
 #include "SkillComponent.h"
 #include "DestroyableComponent.h"
+#include "MissionComponent.h"
 
 void NtAssemblyTubeServer::OnStartup(Entity* self) 
 {

dScripts/NtDukeServer.cpp

@@ -1,5 +1,6 @@
 #include "NtDukeServer.h"
 #include "InventoryComponent.h"
+#include "MissionComponent.h"
 
 void NtDukeServer::SetVariables(Entity *self) {
     self->SetVar<float_t>(m_SpyProximityVariable, 35.0f);

dScripts/NtFactionSpyServer.cpp

@@ -3,6 +3,7 @@
 #include "ProximityMonitorComponent.h"
 #include "InventoryComponent.h"
 #include "GameMessages.h"
+#include "MissionComponent.h"
 
 void NtFactionSpyServer::OnStartup(Entity *self) {
     SetVariables(self);

dScripts/NtParadoxTeleServer.cpp

@@ -4,6 +4,7 @@
 #include "EntityManager.h"
 #include "SkillComponent.h"
 #include "DestroyableComponent.h"
+#include "MissionComponent.h"
 
 void NtParadoxTeleServer::OnStartup(Entity* self) 
 {

dScripts/NtSentinelWalkwayServer.cpp

@@ -2,6 +2,7 @@
 #include "PhantomPhysicsComponent.h"
 #include "EntityManager.h"
 #include "dLogger.h"
+#include "MissionComponent.h"
 
 void NtSentinelWalkwayServer::OnStartup(Entity* self) 
 {

dScripts/PetDigBuild.cpp

@@ -1,5 +1,6 @@
 #include "PetDigBuild.h"
 #include "EntityManager.h"
+#include "MissionComponent.h"
 
 void PetDigBuild::OnRebuildComplete(Entity* self, Entity* target) {
     auto flagNumber = self->GetVar<std::u16string>(u"flagNum");

dScripts/PropertyDevice.cpp

@@ -1,6 +1,7 @@
 #include "PropertyDevice.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
+#include "MissionComponent.h"
 
 void PropertyDevice::OnStartup(Entity *self) {
     auto* zoneControl = EntityManager::Instance()->GetZoneControlEntity();

dScripts/RaceImagineCrateServer.cpp

@@ -5,6 +5,7 @@
 #include "PossessableComponent.h"
 #include "RaceImagineCrateServer.h"
 #include "RacingTaskParam.h"
+#include "MissionComponent.h"
 #include "SkillComponent.h"
 
 void RaceImagineCrateServer::OnDie(Entity* self, Entity* killer)

dScripts/RaceImaginePowerup.cpp

@@ -5,7 +5,7 @@
 #include "PossessorComponent.h"
 #include "RaceImaginePowerup.h"
 #include "RacingTaskParam.h"
-
+#include "MissionComponent.h"
 
 void RaceImaginePowerup::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1,
                                                int32_t param2, int32_t param3)

dScripts/RaceSmashServer.cpp

@@ -3,6 +3,7 @@
 #include "PossessableComponent.h"
 #include "RaceSmashServer.h"
 #include "RacingTaskParam.h"
+#include "MissionComponent.h"
 
 void RaceSmashServer::OnDie(Entity *self, Entity *killer) {
     // Crate is smashed by the car

dScripts/SGCannon.cpp

@@ -11,6 +11,7 @@
 #include "MovementAIComponent.h"
 #include "ControllablePhysicsComponent.h"
 #include "../dWorldServer/ObjectIDManager.h"
+#include "MissionComponent.h"
 
 void SGCannon::OnStartup(Entity *self) {
     Game::logger->Log("SGCannon", "OnStartup\n");

dScripts/SpawnGryphonServer.cpp

@@ -1,6 +1,7 @@
 #include "SpawnGryphonServer.h"
 #include "InventoryComponent.h"
 #include "GameMessages.h"
+#include "MissionComponent.h"
 
 void SpawnGryphonServer::SetVariables(Entity *self) {
     self->SetVar<LOT>(u"petLOT", 12433);

dScripts/SsModularBuildServer.cpp

@@ -1,6 +1,7 @@
 #include "SsModularBuildServer.h"
 #include "EntityManager.h"
 #include "Character.h"
+#include "MissionComponent.h"
 
 void SsModularBuildServer::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector<LOT> modules) {
 	int missionNum = 1732;

dScripts/VeBricksampleServer.cpp

@@ -1,6 +1,7 @@
 #include "VeBricksampleServer.h"
 #include "InventoryComponent.h"
 #include "EntityManager.h"
+#include "MissionComponent.h"
 #include "GameMessages.h"
 
 void VeBricksampleServer::OnUse(Entity *self, Entity *user) {

dScripts/ZoneAgProperty.cpp

@@ -8,6 +8,7 @@
 #include "LDFFormat.h"
 #include "RenderComponent.h"
 #include "dLogger.h"
+#include "MissionComponent.h"
 
 void ZoneAgProperty::SetGameVariables(Entity *self) {
     self->SetVar<std::string>(GuardGroup, "Guard");