From 8dd376ae1ec3f642a52ce1e541b6b465c750315e Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Fri, 17 Dec 2021 00:31:19 -0800 Subject: [PATCH 1/3] Crux Prime named enemy fix Fixed an issue where named enemies on crux prime would no longer spawn by un-commenting a line that was commented out. --- dScripts/BaseRandomServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dScripts/BaseRandomServer.cpp b/dScripts/BaseRandomServer.cpp index cf408d26..21df754e 100644 --- a/dScripts/BaseRandomServer.cpp +++ b/dScripts/BaseRandomServer.cpp @@ -91,7 +91,7 @@ void BaseRandomServer::SetSpawnerNetwork(Entity* self, const std::string& spawne if (spawnerName == "Named_Enemies") { - //spawner->Reset(); + spawner->Reset(); } spawner->Activate(); From 88af3c7681a8256a1c4437e68593941565d5bd68 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Fri, 17 Dec 2021 18:07:52 -0800 Subject: [PATCH 2/3] Change of reset use Instead of doing a hard reset on the spawner, we simply do a SoftReset. I also removed some dead code that was doing nothing. --- dScripts/BaseRandomServer.cpp | 12 +----------- dScripts/BaseRandomServer.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dScripts/BaseRandomServer.cpp b/dScripts/BaseRandomServer.cpp index 21df754e..8fbd0dd6 100644 --- a/dScripts/BaseRandomServer.cpp +++ b/dScripts/BaseRandomServer.cpp @@ -91,7 +91,7 @@ void BaseRandomServer::SetSpawnerNetwork(Entity* self, const std::string& spawne if (spawnerName == "Named_Enemies") { - spawner->Reset(); + spawner->SoftReset(); } spawner->Activate(); @@ -171,16 +171,6 @@ void BaseRandomServer::NamedEnemyDeath(Entity* self, Spawner* spawner) self->AddTimer("SpawnNewEnemy", spawnDelay); } -void BaseRandomServer::SpawnersUp(Entity* self) -{ - -} - -void BaseRandomServer::SpawnersDown(Entity* self) -{ - -} - void BaseRandomServer::BaseOnTimerDone(Entity* self, const std::string& timerName) { NamedTimerDone(self, timerName); diff --git a/dScripts/BaseRandomServer.h b/dScripts/BaseRandomServer.h index e67df365..fc9abe3e 100644 --- a/dScripts/BaseRandomServer.h +++ b/dScripts/BaseRandomServer.h @@ -25,8 +25,6 @@ public: void SpawnSection(Entity* self, const std::string& sectionName, float iMultiplier); void SetSpawnerNetwork(Entity* self, const std::string& spawnerName, int32_t spawnNum, LOT spawnLOT); BaseRandomServer::Zone* GetRandomLoad(Entity* self, const std::string& sectionName); - void SpawnersUp(Entity* self); - void SpawnersDown(Entity* self); void BaseOnTimerDone(Entity* self, const std::string& timerName); void NotifySpawnerOfDeath(Entity* self, Spawner* spawner); From 35e8a374df163a7e0fdb6d7f76ed9cf47e699a17 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Sat, 18 Dec 2021 00:22:49 -0800 Subject: [PATCH 3/3] Required script functions added Re-added the required script functions. --- dScripts/BaseRandomServer.cpp | 10 ++++++++++ dScripts/BaseRandomServer.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dScripts/BaseRandomServer.cpp b/dScripts/BaseRandomServer.cpp index 8fbd0dd6..182544be 100644 --- a/dScripts/BaseRandomServer.cpp +++ b/dScripts/BaseRandomServer.cpp @@ -171,6 +171,16 @@ void BaseRandomServer::NamedEnemyDeath(Entity* self, Spawner* spawner) self->AddTimer("SpawnNewEnemy", spawnDelay); } +void BaseRandomServer::SpawnersUp(Entity* self) +{ + +} + +void BaseRandomServer::SpawnersDown(Entity* self) +{ + +} + void BaseRandomServer::BaseOnTimerDone(Entity* self, const std::string& timerName) { NamedTimerDone(self, timerName); diff --git a/dScripts/BaseRandomServer.h b/dScripts/BaseRandomServer.h index fc9abe3e..d04414f1 100644 --- a/dScripts/BaseRandomServer.h +++ b/dScripts/BaseRandomServer.h @@ -25,8 +25,10 @@ public: void SpawnSection(Entity* self, const std::string& sectionName, float iMultiplier); void SetSpawnerNetwork(Entity* self, const std::string& spawnerName, int32_t spawnNum, LOT spawnLOT); BaseRandomServer::Zone* GetRandomLoad(Entity* self, const std::string& sectionName); + void SpawnersUp(Entity* self); + void SpawnersDown(Entity* self); void BaseOnTimerDone(Entity* self, const std::string& timerName); - + void NotifySpawnerOfDeath(Entity* self, Spawner* spawner); void NamedEnemyDeath(Entity* self, Spawner* spawner);