From 37de00464e1a8a665558d992059a8555738babe0 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Jun 2022 01:26:44 -0700 Subject: [PATCH] M-Z scripts Removing extraneous includes from scripts that start with the letter M-Z --- dScripts/BaseRandomServer.h | 3 +++ dScripts/CppScripts.h | 1 + dScripts/LegoDieRoll.cpp | 2 -- dScripts/MastTeleport.cpp | 1 - dScripts/MinigameTreasureChestServer.cpp | 3 +-- dScripts/MissionConsoleServer.cpp | 1 - dScripts/MissionConsoleServer.h | 6 ------ dScripts/MonCoreNookDoors.cpp | 2 -- dScripts/MonCoreSmashableDoors.cpp | 2 -- dScripts/NjEarthDragonPetServer.cpp | 1 + dScripts/NjEarthDragonPetServer.h | 1 - dScripts/NjJayMissionItems.h | 2 ++ dScripts/NjMonastryBossInstance.cpp | 5 ++--- dScripts/NjNPCMissionSpinjitzuServer.h | 1 + dScripts/NjNyaMissionitems.h | 2 ++ dScripts/NjPetSpawnerServer.cpp | 5 ----- dScripts/NjPetSpawnerServer.h | 6 ------ dScripts/NjhubLavaPlayerDeathTrigger.cpp | 1 + dScripts/NjhubLavaPlayerDeathTrigger.h | 1 - dScripts/NpcAgCourseStarter.cpp | 10 ---------- dScripts/NpcCowboyServer.cpp | 2 +- dScripts/NpcNpSpacemanBob.cpp | 5 ----- dScripts/NpcWispServer.cpp | 2 -- dScripts/NsConcertChoiceBuildManager.cpp | 1 - dScripts/NsConcertQuickBuild.cpp | 1 - dScripts/NsLegoClubDoor.cpp | 3 +-- dScripts/NsLegoClubDoor.h | 1 - dScripts/NsLupTeleport.cpp | 3 +-- dScripts/NsLupTeleport.h | 1 - dScripts/NsModularBuild.cpp | 2 -- dScripts/NsQbImaginationStatue.cpp | 3 --- dScripts/NsTokenConsoleServer.cpp | 1 - dScripts/NtAssemblyTubeServer.cpp | 5 ----- dScripts/NtCombatChallengeDummy.cpp | 1 - dScripts/NtCombatChallengeExplodingDummy.cpp | 1 - dScripts/NtCombatChallengeServer.cpp | 17 ----------------- dScripts/NtConsoleTeleportServer.cpp | 3 ++- dScripts/NtConsoleTeleportServer.h | 1 - dScripts/NtDirtCloudServer.cpp | 1 - dScripts/NtHaelServer.cpp | 1 + dScripts/NtParadoxTeleServer.cpp | 5 ----- dScripts/NtSentinelWalkwayServer.cpp | 5 ----- dScripts/NtVentureCannonServer.cpp | 1 - dScripts/NtVentureSpeedPadServer.cpp | 1 - dScripts/NtXRayServer.cpp | 2 -- dScripts/PetDigServer.cpp | 3 +-- dScripts/PrSeagullFly.cpp | 1 + dScripts/PrWhistle.cpp | 2 +- dScripts/PropertyDeathPlane.cpp | 4 ---- dScripts/QbEnemyStunner.cpp | 2 -- dScripts/RaceImagineCrateServer.cpp | 1 - dScripts/RaceImaginePowerup.cpp | 2 -- dScripts/RaceMaelstromGeiser.cpp | 8 -------- dScripts/SGCannon.cpp | 1 - dScripts/ScriptComponent.cpp | 1 - dScripts/ScriptComponent.h | 1 - dScripts/ScriptedPowerupSpawner.cpp | 1 - dScripts/SpawnLionServer.cpp | 1 + dScripts/SpawnSaberCatServer.cpp | 1 + dScripts/SpawnShrakeServer.cpp | 1 + dScripts/SpawnStegoServer.cpp | 1 + dScripts/SpecialImaginePowerupSpawner.cpp | 1 - dScripts/SsModularBuildServer.cpp | 2 -- dScripts/StoryBoxInteractServer.cpp | 1 - dScripts/Sunflower.cpp | 1 + dScripts/TokenConsoleServer.cpp | 2 -- dScripts/TreasureChestDragonServer.cpp | 1 - dScripts/TriggerAmbush.cpp | 8 -------- dScripts/WaveBossApe.cpp | 1 + dScripts/WaveBossHammerling.cpp | 1 + dScripts/WaveBossHorsemen.cpp | 1 + dScripts/WaveBossSpiderling.cpp | 1 + dScripts/WhFans.cpp | 3 +++ dScripts/WhFans.h | 4 ---- dScripts/WildAmbients.cpp | 2 -- dScripts/WishingWellServer.cpp | 2 -- dScripts/ZoneAgMedProperty.cpp | 3 +-- dScripts/ZoneAgProperty.cpp | 4 ---- dScripts/ZoneAgProperty.h | 1 - dScripts/ZoneAgSpiderQueen.cpp | 2 -- dScripts/ZoneAgSurvival.h | 1 + dScripts/ZoneFvProperty.cpp | 1 + dScripts/ZoneGfProperty.cpp | 1 + dScripts/ZoneNsMedProperty.cpp | 1 + dScripts/ZoneNsProperty.cpp | 1 + 85 files changed, 41 insertions(+), 161 deletions(-) delete mode 100644 dScripts/MissionConsoleServer.cpp delete mode 100644 dScripts/MissionConsoleServer.h delete mode 100644 dScripts/NjPetSpawnerServer.cpp delete mode 100644 dScripts/NjPetSpawnerServer.h diff --git a/dScripts/BaseRandomServer.h b/dScripts/BaseRandomServer.h index 9db5fa83..68aadf30 100644 --- a/dScripts/BaseRandomServer.h +++ b/dScripts/BaseRandomServer.h @@ -1,5 +1,8 @@ #pragma once +#include + +class Spawner; class BaseRandomServer { public: diff --git a/dScripts/CppScripts.h b/dScripts/CppScripts.h index ad724c50..bf30017c 100644 --- a/dScripts/CppScripts.h +++ b/dScripts/CppScripts.h @@ -2,6 +2,7 @@ #include "dCommonVars.h" #include "MissionState.h" #include +#include class User; class Entity; diff --git a/dScripts/LegoDieRoll.cpp b/dScripts/LegoDieRoll.cpp index 520cbf5e..386313be 100644 --- a/dScripts/LegoDieRoll.cpp +++ b/dScripts/LegoDieRoll.cpp @@ -1,6 +1,5 @@ #include "LegoDieRoll.h" #include "Entity.h" -#include "dLogger.h" #include "GameMessages.h" #include "MissionComponent.h" @@ -49,7 +48,6 @@ void LegoDieRoll::OnTimerDone(Entity* self, std::string timerName) { break; } default: - Game::logger->LogDebug("LegoDieRoll", "Invalid animation: roll-die-%i\n", dieRoll); break; } } diff --git a/dScripts/MastTeleport.cpp b/dScripts/MastTeleport.cpp index 601f7dbf..94d5f552 100644 --- a/dScripts/MastTeleport.cpp +++ b/dScripts/MastTeleport.cpp @@ -1,7 +1,6 @@ #include "MastTeleport.h" #include "EntityManager.h" #include "GameMessages.h" -#include "Game.h" #include "Preconditions.h" #ifdef _WIN32 diff --git a/dScripts/MinigameTreasureChestServer.cpp b/dScripts/MinigameTreasureChestServer.cpp index ff32b527..fc3f14c0 100644 --- a/dScripts/MinigameTreasureChestServer.cpp +++ b/dScripts/MinigameTreasureChestServer.cpp @@ -3,7 +3,6 @@ #include "TeamManager.h" #include "EntityManager.h" #include "dZoneManager.h" -#include "dServer.h" void MinigameTreasureChestServer::OnUse(Entity *self, Entity *user) { auto* sac = self->GetComponent(); @@ -56,7 +55,7 @@ uint32_t MinigameTreasureChestServer::CalculateActivityRating(Entity *self, LWOO void MinigameTreasureChestServer::OnStartup(Entity *self) { // BONS treasure chest thinks it's on FV, causing it to start a lobby - if (Game::server->GetZoneID() == 1204) { + if (dZoneManager::Instance()->GetZoneID().GetMapID() == 1204) { auto* sac = self->GetComponent(); if (sac != nullptr) { sac->SetInstanceMapID(1204); diff --git a/dScripts/MissionConsoleServer.cpp b/dScripts/MissionConsoleServer.cpp deleted file mode 100644 index 136f2cb6..00000000 --- a/dScripts/MissionConsoleServer.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "MissionConsoleServer.h" diff --git a/dScripts/MissionConsoleServer.h b/dScripts/MissionConsoleServer.h deleted file mode 100644 index c502fc00..00000000 --- a/dScripts/MissionConsoleServer.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once -#include "CppScripts.h" - -class MissionConsoleServer : public CppScripts::Script { -}; - diff --git a/dScripts/MonCoreNookDoors.cpp b/dScripts/MonCoreNookDoors.cpp index c038c1dd..c3fcf9be 100644 --- a/dScripts/MonCoreNookDoors.cpp +++ b/dScripts/MonCoreNookDoors.cpp @@ -1,6 +1,4 @@ #include "MonCoreNookDoors.h" -#include "GameMessages.h" -#include "EntityManager.h" #include "dZoneManager.h" void MonCoreNookDoors::OnStartup(Entity* self) diff --git a/dScripts/MonCoreSmashableDoors.cpp b/dScripts/MonCoreSmashableDoors.cpp index 1ea1bef9..0e7950f5 100644 --- a/dScripts/MonCoreSmashableDoors.cpp +++ b/dScripts/MonCoreSmashableDoors.cpp @@ -1,7 +1,5 @@ #include "MonCoreSmashableDoors.h" -#include "GameMessages.h" #include "EntityManager.h" -#include "dZoneManager.h" void MonCoreSmashableDoors::OnDie(Entity* self, Entity* killer) { diff --git a/dScripts/NjEarthDragonPetServer.cpp b/dScripts/NjEarthDragonPetServer.cpp index 3be5c63a..2b91f33c 100644 --- a/dScripts/NjEarthDragonPetServer.cpp +++ b/dScripts/NjEarthDragonPetServer.cpp @@ -1,4 +1,5 @@ #include "NjEarthDragonPetServer.h" +#include "Entity.h" void NjEarthDragonPetServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 16210); diff --git a/dScripts/NjEarthDragonPetServer.h b/dScripts/NjEarthDragonPetServer.h index 41c068f4..2227bbb6 100644 --- a/dScripts/NjEarthDragonPetServer.h +++ b/dScripts/NjEarthDragonPetServer.h @@ -1,5 +1,4 @@ #pragma once -//#include "NjPetSpawnerServer.h" #include "SpawnPetBaseServer.h" class NjEarthDragonPetServer : public SpawnPetBaseServer { diff --git a/dScripts/NjJayMissionItems.h b/dScripts/NjJayMissionItems.h index 7f30d7f0..19cb4f40 100644 --- a/dScripts/NjJayMissionItems.h +++ b/dScripts/NjJayMissionItems.h @@ -1,6 +1,8 @@ #pragma once #include "NjNPCMissionSpinjitzuServer.h" #include "NPCAddRemoveItem.h" +#include +#include class NjJayMissionItems : public NjNPCMissionSpinjitzuServer, NPCAddRemoveItem { void OnMissionDialogueOK(Entity *self, Entity *target, int missionID, MissionState missionState) override; diff --git a/dScripts/NjMonastryBossInstance.cpp b/dScripts/NjMonastryBossInstance.cpp index 27de7439..cd34ea2c 100644 --- a/dScripts/NjMonastryBossInstance.cpp +++ b/dScripts/NjMonastryBossInstance.cpp @@ -1,15 +1,14 @@ -#include -#include "RebuildComponent.h" #include "NjMonastryBossInstance.h" +#include "RebuildComponent.h" #include "DestroyableComponent.h" #include "EntityManager.h" -#include "GameMessages.h" #include "dZoneManager.h" #include "GameMessages.h" #include "BaseCombatAIComponent.h" #include "BuffComponent.h" #include "SkillComponent.h" #include "TeamManager.h" +#include // // // // // // // // Event handling // diff --git a/dScripts/NjNPCMissionSpinjitzuServer.h b/dScripts/NjNPCMissionSpinjitzuServer.h index 51150373..5b346ee7 100644 --- a/dScripts/NjNPCMissionSpinjitzuServer.h +++ b/dScripts/NjNPCMissionSpinjitzuServer.h @@ -1,5 +1,6 @@ #pragma once #include "CppScripts.h" +#include static std::map ElementFlags = { {u"earth", ePlayerFlags::NJ_EARTH_SPINJITZU}, diff --git a/dScripts/NjNyaMissionitems.h b/dScripts/NjNyaMissionitems.h index 91681126..5e2bbc7b 100644 --- a/dScripts/NjNyaMissionitems.h +++ b/dScripts/NjNyaMissionitems.h @@ -1,5 +1,7 @@ #pragma once #include "NPCAddRemoveItem.h" +#include +#include class NjNyaMissionitems : public NPCAddRemoveItem { std::map> GetSettings() override; diff --git a/dScripts/NjPetSpawnerServer.cpp b/dScripts/NjPetSpawnerServer.cpp deleted file mode 100644 index d09e5f01..00000000 --- a/dScripts/NjPetSpawnerServer.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// -// Created by Mick Vermeulen on 23/08/2021. -// - -#include "NjPetSpawnerServer.h" diff --git a/dScripts/NjPetSpawnerServer.h b/dScripts/NjPetSpawnerServer.h deleted file mode 100644 index 56b6c147..00000000 --- a/dScripts/NjPetSpawnerServer.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once -#include "SpawnPetBaseServer.h" - -class NjPetSpawnerServer : public SpawnPetBaseServer { - -}; diff --git a/dScripts/NjhubLavaPlayerDeathTrigger.cpp b/dScripts/NjhubLavaPlayerDeathTrigger.cpp index ff31df2c..af47f99b 100644 --- a/dScripts/NjhubLavaPlayerDeathTrigger.cpp +++ b/dScripts/NjhubLavaPlayerDeathTrigger.cpp @@ -1,4 +1,5 @@ #include "NjhubLavaPlayerDeathTrigger.h" +#include "Entity.h" void NjhubLavaPlayerDeathTrigger::OnCollisionPhantom(Entity *self, Entity *target) { diff --git a/dScripts/NjhubLavaPlayerDeathTrigger.h b/dScripts/NjhubLavaPlayerDeathTrigger.h index d7e78604..48ff85d0 100644 --- a/dScripts/NjhubLavaPlayerDeathTrigger.h +++ b/dScripts/NjhubLavaPlayerDeathTrigger.h @@ -1,7 +1,6 @@ #pragma once #include "CppScripts.h" - class NjhubLavaPlayerDeathTrigger : public CppScripts::Script { void OnCollisionPhantom(Entity *self, Entity *target) override; }; diff --git a/dScripts/NpcAgCourseStarter.cpp b/dScripts/NpcAgCourseStarter.cpp index 953cd243..188186fb 100644 --- a/dScripts/NpcAgCourseStarter.cpp +++ b/dScripts/NpcAgCourseStarter.cpp @@ -1,11 +1,8 @@ #include "NpcAgCourseStarter.h" #include "EntityManager.h" -#include "GeneralUtils.h" #include "ScriptedActivityComponent.h" #include "GameMessages.h" #include "LeaderboardManager.h" -#include "Game.h" -#include "dLogger.h" #include "MissionComponent.h" #include @@ -36,8 +33,6 @@ void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int3 } if (identifier == u"player_dialog_cancel_course" && button == 1) { - Game::logger->Log("OnMessageBoxResponse", "Removing player %llu\n", sender->GetObjectID()); - GameMessages::SendNotifyClientObject(self->GetObjectID(), u"stop_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress()); GameMessages::SendNotifyClientObject(self->GetObjectID(), u"cancel_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress()); @@ -59,8 +54,6 @@ void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int3 data->values[1] = *(float*)&startTime; - Game::logger->Log("NpcAgCourseStarter", "Start time: %llu / %f\n", startTime, data->values[1]); - EntityManager::Instance()->SerializeEntity(self); } else if (identifier == u"FootRaceCancel") { @@ -95,9 +88,6 @@ void NpcAgCourseStarter::OnFireEventServerSide(Entity *self, Entity *sender, std time_t endTime = std::time(0); time_t finish = (endTime - *(time_t *) &data->values[1]); - Game::logger->Log("NpcAgCourseStarter", "End time: %llu, start time %llu, finish: %llu\n", endTime, - *(time_t *) &data->values[1], finish); - data->values[2] = *(float *) &finish; auto *missionComponent = sender->GetComponent(); diff --git a/dScripts/NpcCowboyServer.cpp b/dScripts/NpcCowboyServer.cpp index 9223dcd4..f4986045 100644 --- a/dScripts/NpcCowboyServer.cpp +++ b/dScripts/NpcCowboyServer.cpp @@ -1,5 +1,5 @@ #include "NpcCowboyServer.h" -#include "MissionComponent.h" +#include "MissionState.h" #include "InventoryComponent.h" void NpcCowboyServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) diff --git a/dScripts/NpcNpSpacemanBob.cpp b/dScripts/NpcNpSpacemanBob.cpp index fc1765aa..91fe0f95 100644 --- a/dScripts/NpcNpSpacemanBob.cpp +++ b/dScripts/NpcNpSpacemanBob.cpp @@ -1,11 +1,6 @@ #include "NpcNpSpacemanBob.h" #include "DestroyableComponent.h" -#include "Entity.h" -#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) { diff --git a/dScripts/NpcWispServer.cpp b/dScripts/NpcWispServer.cpp index 03c8f071..0f573d65 100644 --- a/dScripts/NpcWispServer.cpp +++ b/dScripts/NpcWispServer.cpp @@ -1,10 +1,8 @@ #include "NpcWispServer.h" #include "InventoryComponent.h" - #include "EntityManager.h" #include "Entity.h" #include "GameMessages.h" -#include "Item.h" void NpcWispServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) { if (missionID != 1849 && missionID != 1883) diff --git a/dScripts/NsConcertChoiceBuildManager.cpp b/dScripts/NsConcertChoiceBuildManager.cpp index 562ff61a..8875beed 100644 --- a/dScripts/NsConcertChoiceBuildManager.cpp +++ b/dScripts/NsConcertChoiceBuildManager.cpp @@ -1,6 +1,5 @@ #include "NsConcertChoiceBuildManager.h" #include "EntityManager.h" -#include "Player.h" const std::vector NsConcertChoiceBuildManager::crates { { "laser", 11203, 5.0, "Concert_Laser_QB_" }, diff --git a/dScripts/NsConcertQuickBuild.cpp b/dScripts/NsConcertQuickBuild.cpp index eadbe3d1..ba7b4010 100644 --- a/dScripts/NsConcertQuickBuild.cpp +++ b/dScripts/NsConcertQuickBuild.cpp @@ -2,7 +2,6 @@ #include "EntityManager.h" #include "NsConcertChoiceBuildManager.h" #include "DestroyableComponent.h" -#include "RenderComponent.h" #include "GameMessages.h" #include "MovingPlatformComponent.h" #include "MissionComponent.h" diff --git a/dScripts/NsLegoClubDoor.cpp b/dScripts/NsLegoClubDoor.cpp index 1e575c54..0b773b09 100644 --- a/dScripts/NsLegoClubDoor.cpp +++ b/dScripts/NsLegoClubDoor.cpp @@ -1,8 +1,7 @@ #include "NsLegoClubDoor.h" #include "dZoneManager.h" -#include "EntityManager.h" -#include "GeneralUtils.h" #include "GameMessages.h" +#include "AMFFormat.h" void NsLegoClubDoor::OnStartup(Entity* self) { diff --git a/dScripts/NsLegoClubDoor.h b/dScripts/NsLegoClubDoor.h index 480c9250..7f17692d 100644 --- a/dScripts/NsLegoClubDoor.h +++ b/dScripts/NsLegoClubDoor.h @@ -2,7 +2,6 @@ #include "CppScripts.h" #include "ChooseYourDestinationNsToNt.h" #include "BaseConsoleTeleportServer.h" -#include "AMFFormat.h" class NsLegoClubDoor : public CppScripts::Script, ChooseYourDestinationNsToNt, BaseConsoleTeleportServer { diff --git a/dScripts/NsLupTeleport.cpp b/dScripts/NsLupTeleport.cpp index 28f598a4..4c196d01 100644 --- a/dScripts/NsLupTeleport.cpp +++ b/dScripts/NsLupTeleport.cpp @@ -1,8 +1,7 @@ #include "NsLupTeleport.h" #include "dZoneManager.h" -#include "EntityManager.h" -#include "GeneralUtils.h" #include "GameMessages.h" +#include "AMFFormat.h" void NsLupTeleport::OnStartup(Entity* self) { diff --git a/dScripts/NsLupTeleport.h b/dScripts/NsLupTeleport.h index 3ace6698..833f5f0a 100644 --- a/dScripts/NsLupTeleport.h +++ b/dScripts/NsLupTeleport.h @@ -2,7 +2,6 @@ #include "CppScripts.h" #include "ChooseYourDestinationNsToNt.h" #include "BaseConsoleTeleportServer.h" -#include "AMFFormat.h" class NsLupTeleport : public CppScripts::Script, ChooseYourDestinationNsToNt, BaseConsoleTeleportServer { diff --git a/dScripts/NsModularBuild.cpp b/dScripts/NsModularBuild.cpp index 01e48045..065d061e 100644 --- a/dScripts/NsModularBuild.cpp +++ b/dScripts/NsModularBuild.cpp @@ -1,6 +1,4 @@ #include "NsModularBuild.h" -#include "EntityManager.h" -#include "Character.h" #include "MissionComponent.h" void NsModularBuild::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector modules) { diff --git a/dScripts/NsQbImaginationStatue.cpp b/dScripts/NsQbImaginationStatue.cpp index 6b512119..4404ba5f 100644 --- a/dScripts/NsQbImaginationStatue.cpp +++ b/dScripts/NsQbImaginationStatue.cpp @@ -1,9 +1,6 @@ #include "NsQbImaginationStatue.h" #include "EntityManager.h" -#include "Loot.h" #include "GameMessages.h" -#include "ScriptedActivityComponent.h" -#include "RebuildComponent.h" void NsQbImaginationStatue::OnStartup(Entity* self) { diff --git a/dScripts/NsTokenConsoleServer.cpp b/dScripts/NsTokenConsoleServer.cpp index 0e9ac09e..976b9bc8 100644 --- a/dScripts/NsTokenConsoleServer.cpp +++ b/dScripts/NsTokenConsoleServer.cpp @@ -1,6 +1,5 @@ #include "NsTokenConsoleServer.h" #include "InventoryComponent.h" -#include "EntityManager.h" #include "GameMessages.h" #include "Character.h" #include "MissionComponent.h" diff --git a/dScripts/NtAssemblyTubeServer.cpp b/dScripts/NtAssemblyTubeServer.cpp index 7859c900..935993f4 100644 --- a/dScripts/NtAssemblyTubeServer.cpp +++ b/dScripts/NtAssemblyTubeServer.cpp @@ -1,9 +1,6 @@ #include "NtAssemblyTubeServer.h" #include "GameMessages.h" -#include "dZoneManager.h" #include "EntityManager.h" -#include "SkillComponent.h" -#include "DestroyableComponent.h" #include "MissionComponent.h" void NtAssemblyTubeServer::OnStartup(Entity* self) @@ -18,8 +15,6 @@ void NtAssemblyTubeServer::OnPlayerLoaded(Entity* self, Entity* player) void NtAssemblyTubeServer::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) { - Game::logger->Log("NtAssemblyTubeServer", "Entering\n"); - if (status != "ENTER" || !entering->IsPlayer() || name != "teleport") return; auto* player = entering; diff --git a/dScripts/NtCombatChallengeDummy.cpp b/dScripts/NtCombatChallengeDummy.cpp index 76f8576f..a391e00f 100644 --- a/dScripts/NtCombatChallengeDummy.cpp +++ b/dScripts/NtCombatChallengeDummy.cpp @@ -1,7 +1,6 @@ #include "NtCombatChallengeDummy.h" #include "EntityManager.h" - void NtCombatChallengeDummy::OnDie(Entity* self, Entity* killer) { const auto challengeObjectID = self->GetVar(u"challengeObjectID"); diff --git a/dScripts/NtCombatChallengeExplodingDummy.cpp b/dScripts/NtCombatChallengeExplodingDummy.cpp index dd61817d..24494939 100644 --- a/dScripts/NtCombatChallengeExplodingDummy.cpp +++ b/dScripts/NtCombatChallengeExplodingDummy.cpp @@ -1,5 +1,4 @@ #include "NtCombatChallengeExplodingDummy.h" -#include "NtCombatChallengeDummy.h" #include "EntityManager.h" #include "SkillComponent.h" diff --git a/dScripts/NtCombatChallengeServer.cpp b/dScripts/NtCombatChallengeServer.cpp index 78851358..4bf5dffc 100644 --- a/dScripts/NtCombatChallengeServer.cpp +++ b/dScripts/NtCombatChallengeServer.cpp @@ -1,27 +1,16 @@ #include "NtCombatChallengeServer.h" -#include "Character.h" #include "GameMessages.h" #include "EntityManager.h" #include "InventoryComponent.h" #include "MissionComponent.h" -#include "dLogger.h" void NtCombatChallengeServer::OnUse(Entity* self, Entity* user) { - auto* character = user->GetCharacter(); - - if (character == nullptr) - { - return; - } - GameMessages::SendNotifyClientObject(self->GetObjectID(), u"UI_Open", 0, 0, user->GetObjectID(), "", user->GetSystemAddress()); } void NtCombatChallengeServer::OnDie(Entity* self, Entity* killer) { - Game::logger->Log("NtCombatChallengeServer", "Smashed\n"); - if (killer != self && killer != nullptr) { SpawnTargetDummy(self); @@ -47,8 +36,6 @@ void NtCombatChallengeServer::OnHitOrHealResult(Entity* self, Entity* attacker, self->SetVar(u"totalDmg", totalDmg); self->SetNetworkVar(u"totalDmg", totalDmg); - Game::logger->Log("NtCombatChallengeServer", "Damage %i -> %i\n", damage, totalDmg); - GameMessages::SendPlayNDAudioEmitter(self, attacker->GetSystemAddress(), scoreSound); } @@ -169,12 +156,8 @@ void NtCombatChallengeServer::ResetGame(Entity* self) { for (const auto& mission : tMissions) { - Game::logger->Log("NtCombatChallengeServer", "Mission %i, %i\n", mission.mission, mission.damage); - if (totalDmg >= mission.damage) { - Game::logger->Log("NtCombatChallengeServer", "Progressing Mission %i, %i\n", mission.mission, mission.damage); - missionComponent->ForceProgressTaskType(mission.mission, 1, 1); } } diff --git a/dScripts/NtConsoleTeleportServer.cpp b/dScripts/NtConsoleTeleportServer.cpp index 91354c0b..b03ae34e 100644 --- a/dScripts/NtConsoleTeleportServer.cpp +++ b/dScripts/NtConsoleTeleportServer.cpp @@ -1,5 +1,6 @@ #include "NtConsoleTeleportServer.h" - +#include "Entity.h" +#include "AMFFormat.h" void NtConsoleTeleportServer::OnStartup(Entity* self) { diff --git a/dScripts/NtConsoleTeleportServer.h b/dScripts/NtConsoleTeleportServer.h index 0d834cd6..7bba7ee1 100644 --- a/dScripts/NtConsoleTeleportServer.h +++ b/dScripts/NtConsoleTeleportServer.h @@ -2,7 +2,6 @@ #include "CppScripts.h" #include "ChooseYourDestinationNsToNt.h" #include "BaseConsoleTeleportServer.h" -#include "AMFFormat.h" class NtConsoleTeleportServer : public CppScripts::Script, BaseConsoleTeleportServer { diff --git a/dScripts/NtDirtCloudServer.cpp b/dScripts/NtDirtCloudServer.cpp index ee011dd8..82572703 100644 --- a/dScripts/NtDirtCloudServer.cpp +++ b/dScripts/NtDirtCloudServer.cpp @@ -1,5 +1,4 @@ #include "NtDirtCloudServer.h" -#include "dZoneManager.h" #include "MissionComponent.h" std::map> NtDirtCloudServer::m_Missions = diff --git a/dScripts/NtHaelServer.cpp b/dScripts/NtHaelServer.cpp index 2e2643fe..a4c16e1f 100644 --- a/dScripts/NtHaelServer.cpp +++ b/dScripts/NtHaelServer.cpp @@ -1,4 +1,5 @@ #include "NtHaelServer.h" +#include "Entity.h" void NtHaelServer::SetVariables(Entity *self) { self->SetVar(m_SpyProximityVariable, 25.0f); diff --git a/dScripts/NtParadoxTeleServer.cpp b/dScripts/NtParadoxTeleServer.cpp index 9427ee2e..84222374 100644 --- a/dScripts/NtParadoxTeleServer.cpp +++ b/dScripts/NtParadoxTeleServer.cpp @@ -1,9 +1,6 @@ #include "NtParadoxTeleServer.h" #include "GameMessages.h" -#include "dZoneManager.h" #include "EntityManager.h" -#include "SkillComponent.h" -#include "DestroyableComponent.h" #include "MissionComponent.h" void NtParadoxTeleServer::OnStartup(Entity* self) @@ -18,8 +15,6 @@ void NtParadoxTeleServer::OnPlayerLoaded(Entity* self, Entity* player) void NtParadoxTeleServer::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) { - Game::logger->Log("NtParadoxTeleServer", "Entering\n"); - if (status != "ENTER" || !entering->IsPlayer() || name != "teleport") return; auto* player = entering; diff --git a/dScripts/NtSentinelWalkwayServer.cpp b/dScripts/NtSentinelWalkwayServer.cpp index dec0d50b..3d7c75a3 100644 --- a/dScripts/NtSentinelWalkwayServer.cpp +++ b/dScripts/NtSentinelWalkwayServer.cpp @@ -1,7 +1,6 @@ #include "NtSentinelWalkwayServer.h" #include "PhantomPhysicsComponent.h" #include "EntityManager.h" -#include "dLogger.h" #include "MissionComponent.h" void NtSentinelWalkwayServer::OnStartup(Entity* self) @@ -10,8 +9,6 @@ void NtSentinelWalkwayServer::OnStartup(Entity* self) if (phantomPhysicsComponent == nullptr) { - Game::logger->Log("NtSentinelWalkwayServer", "Failed to find PhantomPhysicsComponent\n"); - return; } @@ -22,8 +19,6 @@ void NtSentinelWalkwayServer::OnStartup(Entity* self) force = 115; } - Game::logger->Log("NtSentinelWalkwayServer", "Setting force to %i\n", force); - const auto forward = self->GetRotation().GetRightVector() * -1; phantomPhysicsComponent->SetEffectType(0); // PUSH diff --git a/dScripts/NtVentureCannonServer.cpp b/dScripts/NtVentureCannonServer.cpp index 0b72c8b7..66172733 100644 --- a/dScripts/NtVentureCannonServer.cpp +++ b/dScripts/NtVentureCannonServer.cpp @@ -2,7 +2,6 @@ #include "GameMessages.h" #include "EntityManager.h" - void NtVentureCannonServer::OnUse(Entity* self, Entity* user) { auto* player = user; diff --git a/dScripts/NtVentureSpeedPadServer.cpp b/dScripts/NtVentureSpeedPadServer.cpp index 1f44ec04..19a752d2 100644 --- a/dScripts/NtVentureSpeedPadServer.cpp +++ b/dScripts/NtVentureSpeedPadServer.cpp @@ -2,7 +2,6 @@ #include "SkillComponent.h" #include "MissionComponent.h" - void NtVentureSpeedPadServer::OnStartup(Entity* self) { self->SetProximityRadius(3, "speedboost"); diff --git a/dScripts/NtXRayServer.cpp b/dScripts/NtXRayServer.cpp index 7fae01c6..b65cf65b 100644 --- a/dScripts/NtXRayServer.cpp +++ b/dScripts/NtXRayServer.cpp @@ -1,6 +1,4 @@ #include "NtXRayServer.h" -#include "PhantomPhysicsComponent.h" -#include "EntityManager.h" #include "SkillComponent.h" void NtXRayServer::OnCollisionPhantom(Entity* self, Entity* target) diff --git a/dScripts/PetDigServer.cpp b/dScripts/PetDigServer.cpp index a78c0881..dc7e85dd 100644 --- a/dScripts/PetDigServer.cpp +++ b/dScripts/PetDigServer.cpp @@ -1,7 +1,6 @@ -#include +#include "dZoneManager.h" #include "PetDigServer.h" #include "MissionComponent.h" -#include "InventoryComponent.h" #include "EntityManager.h" #include "Character.h" #include "PetComponent.h" diff --git a/dScripts/PrSeagullFly.cpp b/dScripts/PrSeagullFly.cpp index 728b245f..a4dd5fcd 100644 --- a/dScripts/PrSeagullFly.cpp +++ b/dScripts/PrSeagullFly.cpp @@ -1,4 +1,5 @@ #include "PrSeagullFly.h" +#include "Entity.h" void PrSeagullFly::OnStartup(Entity* self) { diff --git a/dScripts/PrWhistle.cpp b/dScripts/PrWhistle.cpp index 850059d2..4d4d0708 100644 --- a/dScripts/PrWhistle.cpp +++ b/dScripts/PrWhistle.cpp @@ -1,6 +1,6 @@ #include "PrWhistle.h" #include "Character.h" -#include "CharacterComponent.h" +#include "Entity.h" void PrWhistle::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2, int32_t param3) diff --git a/dScripts/PropertyDeathPlane.cpp b/dScripts/PropertyDeathPlane.cpp index b682be67..93981dac 100644 --- a/dScripts/PropertyDeathPlane.cpp +++ b/dScripts/PropertyDeathPlane.cpp @@ -1,8 +1,6 @@ #include "PropertyDeathPlane.h" #include "Entity.h" #include "GameMessages.h" -#include "Game.h" -#include "dLogger.h" #include "EntityManager.h" void PropertyDeathPlane::OnCollisionPhantom(Entity* self, Entity* target) @@ -16,7 +14,5 @@ void PropertyDeathPlane::OnCollisionPhantom(Entity* self, Entity* target) auto* teleport = teleportGroup[0]; - Game::logger->Log("PropertyDeathPlane", "Teleporting!\n"); - GameMessages::SendTeleport(target->GetObjectID(), teleport->GetPosition(), teleport->GetRotation(), target->GetSystemAddress()); } diff --git a/dScripts/QbEnemyStunner.cpp b/dScripts/QbEnemyStunner.cpp index ba089844..e7d87a4c 100644 --- a/dScripts/QbEnemyStunner.cpp +++ b/dScripts/QbEnemyStunner.cpp @@ -1,7 +1,5 @@ #include "QbEnemyStunner.h" -#include "EntityManager.h" #include "SkillComponent.h" -#include "GameMessages.h" #include "DestroyableComponent.h" void QbEnemyStunner::OnRebuildComplete(Entity* self, Entity* target) diff --git a/dScripts/RaceImagineCrateServer.cpp b/dScripts/RaceImagineCrateServer.cpp index 48092430..3729004a 100644 --- a/dScripts/RaceImagineCrateServer.cpp +++ b/dScripts/RaceImagineCrateServer.cpp @@ -1,7 +1,6 @@ #include "CharacterComponent.h" #include "DestroyableComponent.h" #include "EntityManager.h" -#include "GameMessages.h" #include "PossessableComponent.h" #include "RaceImagineCrateServer.h" #include "RacingTaskParam.h" diff --git a/dScripts/RaceImaginePowerup.cpp b/dScripts/RaceImaginePowerup.cpp index 78438b2f..a940b88d 100644 --- a/dScripts/RaceImaginePowerup.cpp +++ b/dScripts/RaceImaginePowerup.cpp @@ -1,7 +1,5 @@ -#include "CharacterComponent.h" #include "DestroyableComponent.h" #include "EntityManager.h" -#include "PossessableComponent.h" #include "PossessorComponent.h" #include "RaceImaginePowerup.h" #include "RacingTaskParam.h" diff --git a/dScripts/RaceMaelstromGeiser.cpp b/dScripts/RaceMaelstromGeiser.cpp index 8e91c5fe..88a45bbd 100644 --- a/dScripts/RaceMaelstromGeiser.cpp +++ b/dScripts/RaceMaelstromGeiser.cpp @@ -1,14 +1,10 @@ #include "RaceMaelstromGeiser.h" -#include "DestroyableComponent.h" #include "GameMessages.h" #include "PossessableComponent.h" #include "PossessorComponent.h" #include "EntityManager.h" #include "RacingControlComponent.h" #include "dZoneManager.h" -#include "Game.h" -#include "dLogger.h" - void RaceMaelstromGeiser::OnStartup(Entity* self) { @@ -26,15 +22,11 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std: return; } - Game::logger->Log("RaceMaelstromGeiser", "Entered\n"); - if (!self->GetVar(u"AmFiring")) { return; } - Game::logger->Log("RaceMaelstromGeiser", "Smashing!\n"); - auto* possessableComponent = entering->GetComponent(); Entity* vehicle; diff --git a/dScripts/SGCannon.cpp b/dScripts/SGCannon.cpp index 83f609d0..550761da 100644 --- a/dScripts/SGCannon.cpp +++ b/dScripts/SGCannon.cpp @@ -9,7 +9,6 @@ #include "CharacterComponent.h" #include "SimplePhysicsComponent.h" #include "MovementAIComponent.h" -#include "ControllablePhysicsComponent.h" #include "../dWorldServer/ObjectIDManager.h" #include "MissionComponent.h" diff --git a/dScripts/ScriptComponent.cpp b/dScripts/ScriptComponent.cpp index 6b3304a3..3c5c2584 100644 --- a/dScripts/ScriptComponent.cpp +++ b/dScripts/ScriptComponent.cpp @@ -5,7 +5,6 @@ #include "Entity.h" #include "ScriptComponent.h" -#include "InvalidScript.h" ScriptComponent::ScriptComponent(Entity* parent, std::string scriptName, bool serialized, bool client) : Component(parent) { m_Serialized = serialized; diff --git a/dScripts/ScriptComponent.h b/dScripts/ScriptComponent.h index 3c8597ed..82d1f648 100644 --- a/dScripts/ScriptComponent.h +++ b/dScripts/ScriptComponent.h @@ -6,7 +6,6 @@ #ifndef SCRIPTCOMPONENT_H #define SCRIPTCOMPONENT_H -#include "BitStream.h" #include "CppScripts.h" #include "Component.h" #include diff --git a/dScripts/ScriptedPowerupSpawner.cpp b/dScripts/ScriptedPowerupSpawner.cpp index fe35dfed..91c25856 100644 --- a/dScripts/ScriptedPowerupSpawner.cpp +++ b/dScripts/ScriptedPowerupSpawner.cpp @@ -1,6 +1,5 @@ #include "ScriptedPowerupSpawner.h" #include "RenderComponent.h" -#include "GameMessages.h" #include "EntityManager.h" void ScriptedPowerupSpawner::OnTemplateStartup(Entity *self) { diff --git a/dScripts/SpawnLionServer.cpp b/dScripts/SpawnLionServer.cpp index 5c6b79d3..b19531a4 100644 --- a/dScripts/SpawnLionServer.cpp +++ b/dScripts/SpawnLionServer.cpp @@ -1,4 +1,5 @@ #include "SpawnLionServer.h" +#include "Entity.h" void SpawnLionServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 3520); diff --git a/dScripts/SpawnSaberCatServer.cpp b/dScripts/SpawnSaberCatServer.cpp index 1d3a5df8..e89d9df7 100644 --- a/dScripts/SpawnSaberCatServer.cpp +++ b/dScripts/SpawnSaberCatServer.cpp @@ -1,4 +1,5 @@ #include "SpawnSaberCatServer.h" +#include "Entity.h" void SpawnSaberCatServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 12432); diff --git a/dScripts/SpawnShrakeServer.cpp b/dScripts/SpawnShrakeServer.cpp index 954cbc3f..5be55ebc 100644 --- a/dScripts/SpawnShrakeServer.cpp +++ b/dScripts/SpawnShrakeServer.cpp @@ -1,4 +1,5 @@ #include "SpawnShrakeServer.h" +#include "Entity.h" void SpawnShrakeServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 12434); diff --git a/dScripts/SpawnStegoServer.cpp b/dScripts/SpawnStegoServer.cpp index ef79d889..d845ff45 100644 --- a/dScripts/SpawnStegoServer.cpp +++ b/dScripts/SpawnStegoServer.cpp @@ -1,4 +1,5 @@ #include "SpawnStegoServer.h" +#include "Entity.h" void SpawnStegoServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 12431); diff --git a/dScripts/SpecialImaginePowerupSpawner.cpp b/dScripts/SpecialImaginePowerupSpawner.cpp index f19b8d28..8417efa2 100644 --- a/dScripts/SpecialImaginePowerupSpawner.cpp +++ b/dScripts/SpecialImaginePowerupSpawner.cpp @@ -5,7 +5,6 @@ #include "DestroyableComponent.h" #include "EntityManager.h" - void SpecialImaginePowerupSpawner::OnStartup(Entity* self) { self->SetProximityRadius(1.5f, "powerupEnter"); diff --git a/dScripts/SsModularBuildServer.cpp b/dScripts/SsModularBuildServer.cpp index af828690..33f8db47 100644 --- a/dScripts/SsModularBuildServer.cpp +++ b/dScripts/SsModularBuildServer.cpp @@ -1,6 +1,4 @@ #include "SsModularBuildServer.h" -#include "EntityManager.h" -#include "Character.h" #include "MissionComponent.h" void SsModularBuildServer::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector modules) { diff --git a/dScripts/StoryBoxInteractServer.cpp b/dScripts/StoryBoxInteractServer.cpp index 12cb6815..e5899f5d 100644 --- a/dScripts/StoryBoxInteractServer.cpp +++ b/dScripts/StoryBoxInteractServer.cpp @@ -1,7 +1,6 @@ #include "StoryBoxInteractServer.h" #include "Character.h" #include "GameMessages.h" -#include "Game.h" #include "dServer.h" #include "AMFFormat.h" diff --git a/dScripts/Sunflower.cpp b/dScripts/Sunflower.cpp index ac3134d5..436ca5f4 100644 --- a/dScripts/Sunflower.cpp +++ b/dScripts/Sunflower.cpp @@ -1,4 +1,5 @@ #include "Sunflower.h" +#include "Entity.h" void Sunflower::OnStartup(Entity *self) { self->SetVar(u"numCycles", 6); diff --git a/dScripts/TokenConsoleServer.cpp b/dScripts/TokenConsoleServer.cpp index 58565869..378cc17f 100644 --- a/dScripts/TokenConsoleServer.cpp +++ b/dScripts/TokenConsoleServer.cpp @@ -1,9 +1,7 @@ #include "TokenConsoleServer.h" #include "InventoryComponent.h" -#include "Item.h" #include "GameMessages.h" #include "Character.h" -#include "dCommonVars.h" //2021-05-03 - max - added script, omitted some parts related to inheritance in lua which we don't need diff --git a/dScripts/TreasureChestDragonServer.cpp b/dScripts/TreasureChestDragonServer.cpp index d0e8eaec..80f8aa48 100644 --- a/dScripts/TreasureChestDragonServer.cpp +++ b/dScripts/TreasureChestDragonServer.cpp @@ -1,7 +1,6 @@ #include "TreasureChestDragonServer.h" #include "ScriptedActivityComponent.h" #include "TeamManager.h" -#include "Loot.h" #include "EntityManager.h" void TreasureChestDragonServer::OnStartup(Entity* self) diff --git a/dScripts/TriggerAmbush.cpp b/dScripts/TriggerAmbush.cpp index ad7be66e..f9fb8cf7 100644 --- a/dScripts/TriggerAmbush.cpp +++ b/dScripts/TriggerAmbush.cpp @@ -1,8 +1,6 @@ #include "TriggerAmbush.h" #include "dZoneManager.h" -#include "dLogger.h" -#include "EntityManager.h" void TriggerAmbush::OnStartup(Entity* self) { @@ -12,21 +10,15 @@ void TriggerAmbush::OnStartup(Entity* self) void TriggerAmbush::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) { if (name != "ambush" || status != "ENTER" || !entering->IsPlayer()) return; - - Game::logger->Log("TriggerAmbush", "Got ambush collision!\n"); if (self->GetVar(u"triggered")) return; self->SetVar(u"triggered", true); - Game::logger->Log("TriggerAmbush", "Triggering ambush!\n"); - const auto spawners = dZoneManager::Instance()->GetSpawnersByName("Ambush"); for (auto* spawner : spawners) { - Game::logger->Log("TriggerAmbush", "Triggering ambush on spawner!\n"); - spawner->Activate(); } diff --git a/dScripts/WaveBossApe.cpp b/dScripts/WaveBossApe.cpp index c7fdccf2..f4d8a132 100644 --- a/dScripts/WaveBossApe.cpp +++ b/dScripts/WaveBossApe.cpp @@ -1,5 +1,6 @@ #include "WaveBossApe.h" #include "BaseCombatAIComponent.h" +#include "Entity.h" void WaveBossApe::OnStartup(Entity *self) { BaseWavesGenericEnemy::OnStartup(self); diff --git a/dScripts/WaveBossHammerling.cpp b/dScripts/WaveBossHammerling.cpp index 6dce0ae3..4775bf42 100644 --- a/dScripts/WaveBossHammerling.cpp +++ b/dScripts/WaveBossHammerling.cpp @@ -1,5 +1,6 @@ #include "WaveBossHammerling.h" #include "BaseCombatAIComponent.h" +#include "Entity.h" void WaveBossHammerling::OnStartup(Entity *self) { BaseWavesGenericEnemy::OnStartup(self); diff --git a/dScripts/WaveBossHorsemen.cpp b/dScripts/WaveBossHorsemen.cpp index 75bffa5b..c129d654 100644 --- a/dScripts/WaveBossHorsemen.cpp +++ b/dScripts/WaveBossHorsemen.cpp @@ -1,5 +1,6 @@ #include "WaveBossHorsemen.h" #include "BaseCombatAIComponent.h" +#include "Entity.h" void WaveBossHorsemen::OnStartup(Entity *self) { BaseWavesGenericEnemy::OnStartup(self); diff --git a/dScripts/WaveBossSpiderling.cpp b/dScripts/WaveBossSpiderling.cpp index f168cb7b..5c8f8766 100644 --- a/dScripts/WaveBossSpiderling.cpp +++ b/dScripts/WaveBossSpiderling.cpp @@ -1,5 +1,6 @@ #include "WaveBossSpiderling.h" #include "BaseCombatAIComponent.h" +#include "Entity.h" void WaveBossSpiderling::OnStartup(Entity *self) { BaseWavesGenericEnemy::OnStartup(self); diff --git a/dScripts/WhFans.cpp b/dScripts/WhFans.cpp index 3a594a4c..f71383cf 100644 --- a/dScripts/WhFans.cpp +++ b/dScripts/WhFans.cpp @@ -1,6 +1,9 @@ #include "WhFans.h" #include "RenderComponent.h" +#include "GameMessages.h" +#include "EntityManager.h" +#include "PhantomPhysicsComponent.h" void WhFans::OnStartup(Entity* self) { self->SetVar(u"alive", true); diff --git a/dScripts/WhFans.h b/dScripts/WhFans.h index 91aaa9d8..d41eed5b 100644 --- a/dScripts/WhFans.h +++ b/dScripts/WhFans.h @@ -1,9 +1,5 @@ #pragma once #include "CppScripts.h" -#include "GameMessages.h" -#include "EntityManager.h" -#include "PhantomPhysicsComponent.h" - class WhFans : public CppScripts::Script { public: diff --git a/dScripts/WildAmbients.cpp b/dScripts/WildAmbients.cpp index 8ad0f04a..f6414ee8 100644 --- a/dScripts/WildAmbients.cpp +++ b/dScripts/WildAmbients.cpp @@ -1,6 +1,4 @@ #include "WildAmbients.h" -#include "EntityManager.h" -#include "Character.h" #include "GameMessages.h" void WildAmbients::OnUse(Entity* self, Entity* user) diff --git a/dScripts/WishingWellServer.cpp b/dScripts/WishingWellServer.cpp index 36bca973..09e953ac 100644 --- a/dScripts/WishingWellServer.cpp +++ b/dScripts/WishingWellServer.cpp @@ -1,8 +1,6 @@ #include "WishingWellServer.h" -#include "Loot.h" #include "ScriptedActivityComponent.h" #include "GameMessages.h" -#include "Game.h" void WishingWellServer::OnStartup(Entity* self) { diff --git a/dScripts/ZoneAgMedProperty.cpp b/dScripts/ZoneAgMedProperty.cpp index d96cf061..da8214b1 100644 --- a/dScripts/ZoneAgMedProperty.cpp +++ b/dScripts/ZoneAgMedProperty.cpp @@ -1,8 +1,7 @@ #include "ZoneAgMedProperty.h" -#include "dLogger.h" +#include "Entity.h" void ZoneAgMedProperty::SetGameVariables(Entity *self) { - Game::logger->Log("Properties", "Setting variables in instance\n"); self->SetVar(ClaimMarkerGroup, "ClaimMarker"); self->SetVar(GeneratorGroup, "Generator"); diff --git a/dScripts/ZoneAgProperty.cpp b/dScripts/ZoneAgProperty.cpp index a28cded0..44650a35 100644 --- a/dScripts/ZoneAgProperty.cpp +++ b/dScripts/ZoneAgProperty.cpp @@ -1,13 +1,10 @@ #include "ZoneAgProperty.h" #include "EntityManager.h" -#include "BasePropertyServer.h" #include "Character.h" #include "Entity.h" #include "GameMessages.h" #include "dZoneManager.h" -#include "LDFFormat.h" #include "RenderComponent.h" -#include "dLogger.h" #include "MissionComponent.h" void ZoneAgProperty::SetGameVariables(Entity *self) { @@ -342,7 +339,6 @@ void ZoneAgProperty::OnZonePropertyModelPickedUp(Entity* self, Entity* player) { } void ZoneAgProperty::OnZonePropertyModelRemoved(Entity* self, Entity* player) { - Game::logger->Log("OnZonePropertyModelRemoved", "Removed flag updated!\n"); auto* character = player->GetCharacter(); character->SetPlayerFlag(111, true); } diff --git a/dScripts/ZoneAgProperty.h b/dScripts/ZoneAgProperty.h index 3d88215b..4044be57 100644 --- a/dScripts/ZoneAgProperty.h +++ b/dScripts/ZoneAgProperty.h @@ -1,5 +1,4 @@ #pragma once -#include "CppScripts.h" #include "BasePropertyServer.h" class ZoneAgProperty : public BasePropertyServer { diff --git a/dScripts/ZoneAgSpiderQueen.cpp b/dScripts/ZoneAgSpiderQueen.cpp index 57f93698..27c11aa7 100644 --- a/dScripts/ZoneAgSpiderQueen.cpp +++ b/dScripts/ZoneAgSpiderQueen.cpp @@ -1,10 +1,8 @@ #include "ZoneAgSpiderQueen.h" #include "GameMessages.h" #include "EntityManager.h" -#include "Character.h" #include "ZoneAgProperty.h" #include "DestroyableComponent.h" -#include "dZoneManager.h" void ZoneAgSpiderQueen::SetGameVariables(Entity *self) { ZoneAgProperty::SetGameVariables(self); diff --git a/dScripts/ZoneAgSurvival.h b/dScripts/ZoneAgSurvival.h index 3f84c6d0..c5d803ae 100644 --- a/dScripts/ZoneAgSurvival.h +++ b/dScripts/ZoneAgSurvival.h @@ -1,6 +1,7 @@ #pragma once #include "CppScripts.h" #include "BaseSurvivalServer.h" +#include class ZoneAgSurvival : public BaseSurvivalServer { Constants GetConstants() override; diff --git a/dScripts/ZoneFvProperty.cpp b/dScripts/ZoneFvProperty.cpp index bc573667..64aaad9e 100644 --- a/dScripts/ZoneFvProperty.cpp +++ b/dScripts/ZoneFvProperty.cpp @@ -1,4 +1,5 @@ #include "ZoneFvProperty.h" +#include "Entity.h" void ZoneFvProperty::SetGameVariables(Entity *self) { self->SetVar(ClaimMarkerGroup, "Platform"); diff --git a/dScripts/ZoneGfProperty.cpp b/dScripts/ZoneGfProperty.cpp index 630e915a..925320c3 100644 --- a/dScripts/ZoneGfProperty.cpp +++ b/dScripts/ZoneGfProperty.cpp @@ -1,4 +1,5 @@ #include "ZoneGfProperty.h" +#include "Entity.h" void ZoneGfProperty::SetGameVariables(Entity *self) { self->SetVar(ClaimMarkerGroup, "BehavQB"); diff --git a/dScripts/ZoneNsMedProperty.cpp b/dScripts/ZoneNsMedProperty.cpp index 92675815..feaadf31 100644 --- a/dScripts/ZoneNsMedProperty.cpp +++ b/dScripts/ZoneNsMedProperty.cpp @@ -1,4 +1,5 @@ #include "ZoneNsMedProperty.h" +#include "Entity.h" void ZoneNsMedProperty::SetGameVariables(Entity *self) { self->SetVar(ClaimMarkerGroup, "ClaimMarker"); diff --git a/dScripts/ZoneNsProperty.cpp b/dScripts/ZoneNsProperty.cpp index eec62aa5..72eb1ead 100644 --- a/dScripts/ZoneNsProperty.cpp +++ b/dScripts/ZoneNsProperty.cpp @@ -1,4 +1,5 @@ #include "ZoneNsProperty.h" +#include "Entity.h" void ZoneNsProperty::SetGameVariables(Entity *self) { self->SetVar(ClaimMarkerGroup, "Rhino");