From 7a7bdba3e16ed56c2c529e5474c04a8c339de19f Mon Sep 17 00:00:00 2001 From: wincent Date: Tue, 14 Nov 2023 13:53:43 +0100 Subject: [PATCH] Removed test script --- .../DLU/DukeDialogueGlowingBrick.cpp | 72 ------------------- .../02_server/DLU/DukeDialogueGlowingBrick.h | 11 --- dScripts/CppScripts.cpp | 3 - 3 files changed, 86 deletions(-) delete mode 100644 dScripts/02_server/DLU/DukeDialogueGlowingBrick.cpp delete mode 100644 dScripts/02_server/DLU/DukeDialogueGlowingBrick.h diff --git a/dScripts/02_server/DLU/DukeDialogueGlowingBrick.cpp b/dScripts/02_server/DLU/DukeDialogueGlowingBrick.cpp deleted file mode 100644 index dc005868..00000000 --- a/dScripts/02_server/DLU/DukeDialogueGlowingBrick.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "DukeDialogueGlowingBrick.h" - -#include "eMissionState.h" - -#include "Recorder.h" -#include "MissionComponent.h" -#include "InventoryComponent.h" - -void DukeDialogueGlowingBrick::OnStartup(Entity* self) { - Game::logger->Log("DukeDialogueGlowingBrick", "OnStartup"); -} - -void DukeDialogueGlowingBrick::OnTimerDone(Entity* self, std::string timerName) { -} - -void DukeDialogueGlowingBrick::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) { - if (missionID != 201453) { - return; - } - - if (missionState != eMissionState::AVAILABLE) { - return; - } - - auto* recorder = Cinema::Recording::Recorder::LoadFromFile("DukeGlowing.xml"); - - if (recorder == nullptr) { - return; - } - - auto* actor = recorder->ActFor(self, target); - - if (actor == nullptr) { - return; - } - - const auto targetID = target->GetObjectID(); - const auto actorID = actor->GetObjectID(); - - self->AddCallbackTimer(3.0f, [targetID] () { - auto* target = Game::entityManager->GetEntity(targetID); - - if (target == nullptr) { - return; - } - - auto* missionComponent = target->GetComponent(); - - if (missionComponent == nullptr) { - return; - } - - missionComponent->CompleteMission(201453); - }); - - self->AddCallbackTimer(recorder->GetDuration() + 10.0f, [recorder, self, actorID, targetID] () { - auto* target = Game::entityManager->GetEntity(targetID); - auto* actor = Game::entityManager->GetEntity(actorID); - - if (target == nullptr || actor == nullptr) { - return; - } - - recorder->StopActingFor(actor, self, targetID); - - delete recorder; - }); -} - -void DukeDialogueGlowingBrick::OnRespondToMission(Entity* self, int missionID, Entity* player, int reward) { - -} diff --git a/dScripts/02_server/DLU/DukeDialogueGlowingBrick.h b/dScripts/02_server/DLU/DukeDialogueGlowingBrick.h deleted file mode 100644 index 668b5807..00000000 --- a/dScripts/02_server/DLU/DukeDialogueGlowingBrick.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -#include "CppScripts.h" - -class DukeDialogueGlowingBrick : public CppScripts::Script -{ -public: - void OnStartup(Entity* self) override; - void OnTimerDone(Entity* self, std::string timerName) override; - void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override; - void OnRespondToMission(Entity* self, int missionID, Entity* player, int reward) override; -}; diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index 46b19322..24fe7b5b 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -212,7 +212,6 @@ // DLU Scripts #include "DLUVanityNPC.h" -#include "DukeDialogueGlowingBrick.h" // AM Scripts #include "AmConsoleTeleportServer.h" @@ -820,8 +819,6 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr //DLU: else if (scriptName == "scripts\\02_server\\DLU\\DLUVanityNPC.lua") script = new DLUVanityNPC(); - else if (scriptName == "scripts\\02_server\\DLU\\DukeGlowing.lua") - script = new DukeDialogueGlowingBrick(); // Survival minigame else if (scriptName == "scripts\\02_server\\Enemy\\Survival\\L_AG_SURVIVAL_STROMBIE.lua")