Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-11 01:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split out LUTriggers into it's own component (#986)

Browse Source 
* Split out LUTriggers into it's own component

* some cleanup

* fix debug log

* use emplace and tryParse

* slight refactor to make the work on startup
rather than at runtime
Also TODO's for getting targets via all the possible methods

* address feedback
This commit is contained in:
Aaron Kimbrell
2023-02-10 02:29:53 -06:00
committed by GitHub
parent d17f51183e
commit 91c0c1fcfb
13 changed files with 437 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
dGame/Entity.cpp
View File

@@ -23,6 +23,7 @@
#include "EntityCallbackTimer.h"
#include "Loot.h"
#include "eMissionTaskType.h"
#include "eTriggerEventType.h"
//Component includes:
#include "Component.h"
@@ -68,6 +69,7 @@
#include "ShootingGalleryComponent.h"
#include "RailActivatorComponent.h"
#include "LUPExhibitComponent.h"
#include "TriggerComponent.h"
Entity::Entity(const LWOOBJID& objectID, EntityInfo info, Entity* parentEntity) {
m_ObjectID = objectID;
@@ -76,7 +78,6 @@ Entity::Entity(const LWOOBJID& objectID, EntityInfo info, Entity* parentEntity)
m_Character = nullptr;
m_GMLevel = 0;
m_CollectibleID = 0;
m_Trigger = nullptr; //new LUTriggers::Trigger();
m_NetworkID = 0;
m_Groups = {};
m_OwnerOverride = LWOOBJID_EMPTY;
@@ -132,30 +133,9 @@ void Entity::Initialize() {
* Setup trigger
*/
const auto triggerName = GetVarAsString(u"trigger_id");
const auto triggerInfo = GetVarAsString(u"trigger_id");
if (!triggerName.empty()) {
std::stringstream ss(triggerName);
std::vector<std::string> tokens;
std::string token;
while (std::getline(ss, token, ':')) {
tokens.push_back(token);
}
uint32_t sceneID = std::stoi(tokens[0]);
uint32_t triggerID = std::stoi(tokens[1]);
if (m_Trigger != nullptr) {
delete m_Trigger;
m_Trigger = nullptr;
}
m_Trigger = dZoneManager::Instance()->GetZone()->GetTrigger(sceneID, triggerID);
if (m_Trigger == nullptr) {
m_Trigger = new LUTriggers::Trigger();
}
}
if (!triggerInfo.empty()) m_Components.emplace(COMPONENT_TYPE_TRIGGER, new TriggerComponent(this, triggerInfo));
/**
* Setup groups
@@ -769,7 +749,7 @@ void Entity::Initialize() {
no_ghosting:
TriggerEvent("OnCreate");
TriggerEvent(eTriggerEventType::CREATE);
if (m_Character) {
auto* controllablePhysicsComponent = GetComponent<ControllablePhysicsComponent>();
@@ -946,12 +926,16 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream* outBitStream, eReplicaPacke
outBitStream->Write0(); //No ldf data
}
if (m_Trigger != nullptr && m_Trigger->events.size() > 0) {
outBitStream->Write1();
} else {
TriggerComponent* triggerComponent;
if (TryGetComponent(COMPONENT_TYPE_TRIGGER, triggerComponent)) {
// has trigger component, check to see if we have events to handle
auto* trigger = triggerComponent->GetTrigger();
outBitStream->Write<bool>(trigger && trigger->events.size() > 0);
} else { // no trigger componenet, so definitely no triggers
outBitStream->Write0();
}
if (m_ParentEntity != nullptr || m_SpawnerID != 0) {
outBitStream->Write1();
if (m_ParentEntity != nullptr) outBitStream->Write(GeneralUtils::SetBit(m_ParentEntity->GetObjectID(), OBJECT_BIT_CLIENT));
@@ -1310,7 +1294,7 @@ void Entity::OnCollisionPhantom(const LWOOBJID otherEntity) {
switchComp->EntityEnter(other);
}
TriggerEvent("OnEnter", other);
TriggerEvent(eTriggerEventType::ENTER, other);
// POI system
const auto& poi = GetVar<std::u16string>(u"POI");
@@ -1344,7 +1328,7 @@ void Entity::OnCollisionLeavePhantom(const LWOOBJID otherEntity) {
auto* other = EntityManager::Instance()->GetEntity(otherEntity);
if (!other) return;
TriggerEvent("OnLeave", other);
TriggerEvent(eTriggerEventType::EXIT, other);
SwitchComponent* switchComp = GetComponent<SwitchComponent>();
if (switchComp) {
@@ -1392,7 +1376,7 @@ void Entity::OnEmoteReceived(const int32_t emote, Entity* target) {
}
void Entity::OnUse(Entity* originator) {
TriggerEvent("OnInteract");
TriggerEvent(eTriggerEventType::INTERACT);
for (CppScripts::Script* script : CppScripts::GetEntityScripts(this)) {
script->OnUse(this, originator);
@@ -1736,94 +1720,9 @@ bool Entity::IsPlayer() const {
return m_TemplateID == 1 && GetSystemAddress() != UNASSIGNED_SYSTEM_ADDRESS;
}
void Entity::TriggerEvent(std::string eventID, Entity* optionalTarget) {
if (m_Trigger != nullptr && m_Trigger->enabled) {
for (LUTriggers::Event* triggerEvent : m_Trigger->events) {
if (triggerEvent->eventID == eventID) {
for (LUTriggers::Command* cmd : triggerEvent->commands) {
HandleTriggerCommand(cmd->id, cmd->target, cmd->targetName, cmd->args, optionalTarget);
}
}
}
}
}
// This should probably get it's own triggers class at some point...
void Entity::HandleTriggerCommand(std::string id, std::string target, std::string targetName, std::string args, Entity* optionalTarget) {
std::vector<std::string> argArray;
// Parse args
std::stringstream ssData(args);
std::string token;
char deliminator = ',';
while (std::getline(ssData, token, deliminator)) {
std::string lowerToken;
for (char character : token) {
lowerToken.push_back(std::tolower(character)); // make lowercase to ensure it works
}
argArray.push_back(lowerToken);
}
std::vector<Entity*> targetEntities;
if (target == "self") targetEntities.push_back(this);
if (target == "objGroup") targetEntities = EntityManager::Instance()->GetEntitiesInGroup(targetName);
if (optionalTarget) targetEntities.push_back(optionalTarget);
if (targetEntities.size() == 0) return;
for (Entity* targetEntity : targetEntities) {
if (!targetEntity) continue;
if (id == "SetPhysicsVolumeEffect") {
PhantomPhysicsComponent* phanPhys = GetComponent<PhantomPhysicsComponent>();
if (!phanPhys) return;
phanPhys->SetPhysicsEffectActive(true);
uint32_t effectType = 0;
if (argArray[0] == "push") effectType = 0;
else if (argArray[0] == "attract") effectType = 1;
else if (argArray[0] == "repulse") effectType = 2;
else if (argArray[0] == "gravity") effectType = 3;
else if (argArray[0] == "friction") effectType = 4;
phanPhys->SetEffectType(effectType);
phanPhys->SetDirectionalMultiplier(std::stof(argArray[1]));
if (argArray.size() > 4) {
NiPoint3 direction = NiPoint3::ZERO;
GeneralUtils::TryParse<float>(argArray[2], direction.x);
GeneralUtils::TryParse<float>(argArray[3], direction.y);
GeneralUtils::TryParse<float>(argArray[4], direction.z);
phanPhys->SetDirection(direction);
}
if (argArray.size() > 5) {
phanPhys->SetMin(std::stoi(argArray[6]));
phanPhys->SetMax(std::stoi(argArray[7]));
}
if (target == "self") {
EntityManager::Instance()->ConstructEntity(this);
}
} else if (id == "updateMission") {
CDMissionTasksTable* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks");
std::vector<CDMissionTasks> missionTasks = missionTasksTable->Query([=](CDMissionTasks entry) {
std::string lowerTargetGroup;
for (char character : entry.targetGroup) {
lowerTargetGroup.push_back(std::tolower(character)); // make lowercase to ensure it works
}
return (lowerTargetGroup == argArray[4]);
});
for (const CDMissionTasks& task : missionTasks) {
MissionComponent* missionComponent = targetEntity->GetComponent<MissionComponent>();
if (!missionComponent) continue;
missionComponent->ForceProgress(task.id, task.uid, std::stoi(argArray[2]));
}
} else if (id == "fireEvent") {
for (CppScripts::Script* script : CppScripts::GetEntityScripts(targetEntity)) {
script->OnFireEventServerSide(targetEntity, this, args, 0, 0, 0);
}
}
}
void Entity::TriggerEvent(eTriggerEventType event, Entity* optionalTarget) {
auto* triggerComponent = GetComponent<TriggerComponent>();
if (triggerComponent) triggerComponent->TriggerEvent(event, optionalTarget);
}
Entity* Entity::GetOwner() const {