Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-05 18:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactor vanity (#1477)

Browse Source 
* feat: refactor vanity
cleanup code to be generalized for objects
remove unused party feature
add fallback to data to text
Allow for better organizing data in multiple files
remove special case flag values in favor of config data
general cleanup and fixes

* newline at eof's
This commit is contained in:
Aaron Kimbrell
2024-02-25 16:59:10 -06:00
committed by GitHub
parent cf706d4974
commit 192c8cf974
12 changed files with 414 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dScripts/02_server/DLU/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
set(DSCRIPTS_SOURCES_02_SERVER_DLU
"DLUVanityNPC.cpp"
"DLUVanityTeleportingObject.cpp"
PARENT_SCOPE)

26
dScripts/02_server/DLU/DLUVanityNPC.cpp → dScripts/02_server/DLU/DLUVanityTeleportingObject.cpp
View File

@@ -1,22 +1,22 @@
#include "DLUVanityNPC.h"
#include "DLUVanityTeleportingObject.h"
#include "GameMessages.h"
#include "dServer.h"
#include "VanityUtilities.h"
#include "RenderComponent.h"
void DLUVanityNPC::OnStartup(Entity* self) {
m_NPC = VanityUtilities::GetNPC("averysumner - Destroyer of Worlds");
void DLUVanityTeleportingObject::OnStartup(Entity* self) {
if (!self->HasVar(u"npcName") || !self->HasVar(u"teleport")) return;
m_Object = VanityUtilities::GetObject(self->GetVarAsString(u"npcName"));
if (m_NPC == nullptr) {
return;
}
if (!m_Object) return;
if (self->HasVar(u"teleportInterval")) m_TeleportInterval = self->GetVar<float>(u"teleportInterval");
if (self->GetVar<bool>(u"teleport")) {
self->AddTimer("setupTeleport", 15.0f);
self->AddTimer("setupTeleport", m_TeleportInterval);
}
}
void DLUVanityNPC::OnTimerDone(Entity* self, std::string timerName) {
void DLUVanityTeleportingObject::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "setupTeleport") {
RenderComponent::PlayAnimation(self, u"interact");
GameMessages::SendPlayFXEffect(self->GetObjectID(), 6478, u"teleportBeam", "teleportBeam");
@@ -28,20 +28,22 @@ void DLUVanityNPC::OnTimerDone(Entity* self, std::string timerName) {
GameMessages::SendStopFXEffect(self, true, "teleportBeam");
GameMessages::SendStopFXEffect(self, true, "teleportRings");
} else if (timerName == "teleport") {
std::vector<VanityNPCLocation>& locations = m_NPC->m_Locations[Game::server->GetZoneID()];
std::vector<VanityObjectLocation>& locations = m_Object->m_Locations[Game::server->GetZoneID()];
selectLocation:
VanityNPCLocation& newLocation = locations[GeneralUtils::GenerateRandomNumber<size_t>(0, locations.size() - 1)];
VanityObjectLocation& newLocation = locations[GeneralUtils::GenerateRandomNumber<size_t>(0, locations.size() - 1)];
// try to get not the same position, but if we get the same one twice, it's fine
if (self->GetPosition() == newLocation.m_Position) {
goto selectLocation; // cry about it
VanityObjectLocation& newLocation = locations[GeneralUtils::GenerateRandomNumber<size_t>(0, locations.size() - 1)];
}
self->SetPosition(newLocation.m_Position);
self->SetRotation(newLocation.m_Rotation);
self->SetScale(newLocation.m_Scale);
GameMessages::SendPlayFXEffect(self->GetObjectID(), 6478, u"teleportBeam", "teleportBeam");
GameMessages::SendPlayFXEffect(self->GetObjectID(), 6478, u"teleportRings", "teleportRings");
self->AddTimer("stopFX", 2.0f);
self->AddTimer("setupTeleport", 15.0f);
self->AddTimer("setupTeleport", m_TeleportInterval);
}
}

7
dScripts/02_server/DLU/DLUVanityNPC.h → dScripts/02_server/DLU/DLUVanityTeleportingObject.h
View File

@@ -1,13 +1,14 @@
#pragma once
#include "CppScripts.h"
class VanityNPC;
class DLUVanityNPC : public CppScripts::Script
class VanityObject;
class DLUVanityTeleportingObject : public CppScripts::Script
{
public:
void OnStartup(Entity* self) override;
void OnTimerDone(Entity* self, std::string timerName) override;
private:
VanityNPC* m_NPC;
VanityObject* m_Object;
float m_TeleportInterval = 15.0f;
};