Merge origin/main into experimental: behaviors, raw terrain scene lookups, property model fixes, player count

Main's model behaviors (every rotation, DoDamage, OnTimer, OnStartup, MoveBackToStart, moves along the model's
local axes), raw terrain reading with scene lookups and scene tools, property model and brick by brick fixes and the
chat server's player count fix, merged onto this branch's structures:

- game messages stay structs; the angular velocity messages join them and the handler sets a message's target
- strips own their speed again and the block names, moves and rotations stay in the shared action table
  (PropertyBehaviorActions, which the dashboard's behavior player reads; it now lists rotations too)
- the zone keeps reading its file through ZoneFile and takes the boundaries from it, then loads the raw terrain as main
  does; the old dNavigation terrain reader is gone
- the show all response stays a struct and logs a player count mismatch as main does
- the property management component tells models who sent a chat message

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 10:57:45 -06:00
56 changed files with 2418 additions and 438 deletions

View File

@@ -702,7 +702,7 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
// Client does the same check, so we're doing it too
auto* const modelComponent = m_Parent->GetComponent<ModelComponent>();
if (modelComponent) {
modelComponent->OnHit();
modelComponent->OnHit(source);
// Don't actually deal the damage so the model doesn't die
return;
}

View File

@@ -476,6 +476,8 @@ public:
void UpdateGroup(const GroupUpdate& groupUpdate);
const std::map<eInventoryType, std::vector<Group>>& GetGroups() const { return m_Groups; }
const std::map<eInventoryType, std::vector<Group>>& GetGroups() const { return m_Groups; }
std::unordered_map<LWOOBJID, DatabasePet>& GetPetsMut() { return m_Pets; };
void FixInvisibleItems();

View File

@@ -1,9 +1,13 @@
#include "ModelComponent.h"
#include "CombatMessages.h"
#include <cmath>
#include "Entity.h"
#include "Game.h"
#include "Logger.h"
#include "dMath.h"
#include "BehaviorStates.h"
#include "PropertyBehaviorActions.h"
@@ -14,6 +18,7 @@
#include "SimplePhysicsComponent.h"
#include "eMissionTaskType.h"
#include "eObjectBits.h"
#include "DestroyableComponent.h"
#include "Database.h"
#include "DluAssert.h"
@@ -55,8 +60,13 @@ bool ModelComponent::OnResetModelToDefaults(GameMessages::ResetModelToDefaults&
if (reset.bResetPos) m_Parent->SetPosition(m_OriginalPosition);
if (reset.bResetRot) m_Parent->SetRotation(m_OriginalRotation);
m_Parent->SetVelocity(NiPoint3Constant::ZERO);
// Save and increment the interrupt count so other behaviors on this model move to their next action instead of getting stuck
const auto moveInterruptCount = m_Move.interruptCount + 1;
m_Move = MoveState{};
m_Move.interruptCount = moveInterruptCount;
SyncLinearVelocity();
ResetRotationState(m_Parent->GetRotation());
m_Speed = PropertyBehaviorActions::DEFAULT_SPEED;
m_NumListeningInteract = 0;
m_NumActiveAttack = 0;
@@ -85,11 +95,21 @@ bool ModelComponent::OnRequestUse(GameMessages::RequestUseEvent& event) {
void ModelComponent::Run(float deltaTime) {
if (m_IsPaused) return;
m_DamageCooldown -= deltaTime;
// Arrived once this frame's movement reached or passed the target
if (m_Move.target && (*m_Move.target - m_Parent->GetPosition()).DotProduct(m_Move.targetDirection) <= 0.0f) {
m_Parent->SetPosition(*m_Move.target);
m_Move.target.reset();
}
for (auto& behavior : m_Behaviors) {
behavior.Update(deltaTime, *this);
}
// Done after all behaviors so the heading reflects any rotation applied this frame
SyncLinearVelocity();
if (!m_RestartAtEndOfFrame) return;
GameMessages::ResetModelToDefaults reset{};
@@ -302,41 +322,102 @@ void ModelComponent::RemoveUnSmash() {
m_NumActiveUnSmash--;
}
bool ModelComponent::TrySetVelocity(const NiPoint3& velocity) const {
auto currentVelocity = m_Parent->GetVelocity();
bool ModelComponent::TryStartMove(const int axis, const float direction, const float speed) {
if (axis < 0 || axis > 2 || direction == 0.0f || speed <= 0.0f) return false;
if (m_Move.velocity[axis] != 0.0f) return false;
// If we're currently moving on an axis, prevent the move so only 1 behavior can have control over an axis
if (velocity != NiPoint3Constant::ZERO) {
const auto [x, y, z] = velocity * m_Speed;
if (x != 0.0f) {
if (currentVelocity.x != 0.0f) return false;
currentVelocity.x = x;
} else if (y != 0.0f) {
if (currentVelocity.y != 0.0f) return false;
currentVelocity.y = y;
} else if (z != 0.0f) {
if (currentVelocity.z != 0.0f) return false;
currentVelocity.z = z;
}
} else {
currentVelocity = velocity;
}
m_Parent->SetVelocity(currentVelocity);
m_Move.target.reset();
m_Move.velocity[axis] = std::copysign(speed, direction);
return true;
}
void ModelComponent::SetVelocity(const NiPoint3& velocity) const {
m_Parent->SetVelocity(velocity);
void ModelComponent::StopMove(const int axis) {
if (axis < 0 || axis > 2) return;
m_Move.velocity[axis] = 0.0f;
}
void ModelComponent::OnChatMessageReceived(const std::string& sMessage) {
for (auto& behavior : m_Behaviors) behavior.OnChatMessageReceived(sMessage);
void ModelComponent::StartMoveTo(const NiPoint3& target, const float speed) {
m_Move.velocity = NiPoint3Constant::ZERO;
m_Move.interruptCount++;
m_Move.target = target;
m_Move.targetSpeed = speed;
}
void ModelComponent::OnHit() {
void ModelComponent::SyncLinearVelocity() {
const auto& rotation = m_Parent->GetRotation();
m_Move.basis = { QuatUtils::Right(rotation), QuatUtils::Up(rotation), QuatUtils::Forward(rotation) };
NiPoint3 velocity = NiPoint3Constant::ZERO;
for (int axis = 0; axis < 3; axis++) velocity += m_Move.basis[axis] * m_Move.velocity[axis];
if (m_Move.target) {
const auto toTarget = *m_Move.target - m_Parent->GetPosition();
const float distance = toTarget.Length();
m_Move.targetDirection = distance > 0.0f ? toTarget / distance : NiPoint3Constant::ZERO;
velocity += m_Move.targetDirection * m_Move.targetSpeed;
}
// Leave velocity alone unless a move owns it, e.g. pets are driven elsewhere
const bool isMoving = velocity != NiPoint3Constant::ZERO;
if (!isMoving && !m_Move.wasMoving) return;
m_Move.wasMoving = isMoving;
// Setting velocity always marks it dirty for serialization
if (velocity != m_Parent->GetVelocity()) m_Parent->SetVelocity(velocity);
}
bool ModelComponent::TryStartRotation(const int axis, const float direction, const float speed) {
if (axis < 0 || axis > 2 || direction == 0.0f || speed <= 0.0f) return false;
if (m_Rotation.velocity[axis] != 0.0f) return false;
// Rebase only when nothing is rotating so simultaneous rotations stay relative to the same base
if (m_Rotation.velocity == NiPoint3Constant::ZERO) ResetRotationState(m_Parent->GetRotation());
m_Rotation.degrees[axis] = std::fmod(m_Rotation.degrees[axis], 360.0f);
m_Rotation.actionStart[axis] = m_Rotation.degrees[axis];
m_Rotation.velocity[axis] = std::copysign(BASE_ANGULAR_SPEED * speed, direction);
SyncAngularVelocity();
return true;
}
void ModelComponent::SetRotationProgress(const int axis, const float degrees) {
if (axis < 0 || axis > 2) return;
m_Rotation.degrees[axis] = m_Rotation.actionStart[axis] + degrees;
// Whole turns wrap to exactly 0 so e.g. 720 degrees yields exactly the base rotation
const NiPoint3 radians(
Math::DegToRad(std::fmod(m_Rotation.degrees.x, 360.0f)),
Math::DegToRad(std::fmod(m_Rotation.degrees.y, 360.0f)),
Math::DegToRad(std::fmod(m_Rotation.degrees.z, 360.0f))
);
m_Parent->SetRotation(QuatUtils::FromEuler(radians) * m_Rotation.base);
}
void ModelComponent::StopRotation(const int axis) {
if (axis < 0 || axis > 2) return;
m_Rotation.velocity[axis] = 0.0f;
SyncAngularVelocity();
}
void ModelComponent::SyncAngularVelocity() const {
GameMessages::SetAngularVelocity setAngVel{};
setAngVel.target = m_Parent->GetObjectID();
setAngVel.angVelocity = m_Rotation.velocity * Math::DegToRad(1.0f);
setAngVel.Send();
}
void ModelComponent::ResetRotationState(const NiQuaternion& newBase) {
m_Rotation = RotationState{ .base = newBase };
SyncAngularVelocity();
}
void ModelComponent::OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) {
for (auto& behavior : m_Behaviors) behavior.OnChatMessageReceived(sMessage, sender);
}
void ModelComponent::OnHit(const LWOOBJID attacker) {
for (auto& behavior : m_Behaviors) {
behavior.OnHit();
behavior.OnHit(attacker);
}
}
@@ -405,3 +486,14 @@ void ModelComponent::Allocator(Entity& entity, ObjectLoadState& state) {
}
}
}
void ModelComponent::DoDamage(const LWOOBJID target) {
// dont do damage if we've done damage recently
if (m_DamageCooldown > 0.0f) return;
m_DamageCooldown = 1.0f;
auto* const initiator = Game::entityManager->GetEntity(target);
if (initiator) {
auto* const destComp = initiator->GetComponent<DestroyableComponent>();
if (destComp) destComp->Damage(1, GetParent()->GetObjectID());
}
}

View File

@@ -1,7 +1,9 @@
#pragma once
#include <array>
#include <cmath>
#include <map>
#include <optional>
#include "dCommonVars.h"
#include "RakNetTypes.h"
@@ -12,7 +14,6 @@
#include "Action.h"
#include "PropertyBehavior.h"
#include "PropertyBehaviorActions.h"
#include "StripUiPosition.h"
#include "ObjectMessages.h"
@@ -148,20 +149,41 @@ public:
void Resume();
// Attempts to set the velocity of an axis for movement.
// If the axis currently has a velocity of zero, returns true.
// If the axis is currently controlled by a behavior, returns false.
bool TrySetVelocity(const NiPoint3& velocity) const;
// Attempts to claim a local axis (0 = right, 1 = up, 2 = forward) for movement in direction (+1 or -1) at speed units per second.
// Returns false if the axis is already controlled by a behavior. Cancels any active StartMoveTo.
bool TryStartMove(const int axis, const float direction, const float speed);
// Force sets the velocity to a value.
void SetVelocity(const NiPoint3& velocity) const;
// Releases the local axis so another behavior can move along it.
void StopMove(const int axis);
void OnChatMessageReceived(const std::string& sMessage);
// World space direction of the local axis used for the most recently applied velocity.
const NiPoint3& GetMoveAxis(const int axis) const { return m_Move.basis[axis]; }
void OnHit();
// Interrupts all active moves and moves in a straight line to target at speed units per second.
void StartMoveTo(const NiPoint3& target, const float speed);
// Sets the speed of the model
void SetSpeed(const float newSpeed) { m_Speed = newSpeed; }
// Whether a StartMoveTo move has yet to arrive or be overridden.
bool IsMovingToTarget() const noexcept { return m_Move.target.has_value(); }
// Changes whenever active moves are interrupted, so strips can tell their move was cancelled.
uint32_t GetMoveInterruptCount() const noexcept { return m_Move.interruptCount; }
// Attempts to claim a world axis (0 = x, 1 = y, 2 = z) for rotation in direction (+1 or -1) at the given behavior speed.
// Returns false if the axis is already controlled by a behavior.
bool TryStartRotation(const int axis, const float direction, const float speed);
// Sets how many signed degrees the active rotation on axis has progressed and updates the entity.
void SetRotationProgress(const int axis, const float degrees);
// Releases the axis so another behavior can rotate it.
void StopRotation(const int axis);
// Degrees per second of the active rotation on axis.
float GetAngularSpeed(const int axis) const noexcept { return std::abs(m_Rotation.velocity[axis]); }
void OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender);
void OnHit(const LWOOBJID attacker);
// Whether or not to restart at the end of the frame
void RestartAtEndOfFrame() { m_RestartAtEndOfFrame = true; }
@@ -173,7 +195,56 @@ public:
// Decrements the number of strips listening for an attack.
// If this is the last strip removing an attack, it will reset the factions to the default of -1.
void RemoveAttack();
void DoDamage(const LWOOBJID target);
private:
// Degrees per second per unit of behavior speed
static constexpr float BASE_ANGULAR_SPEED = 15.0f;
struct RotationState {
// The rotation that degrees is applied on top of
NiQuaternion base = QuatUtils::IDENTITY;
// Accumulated signed degrees per world axis since base was set
NiPoint3 degrees{};
// degrees at the moment the current rotation on each axis started
NiPoint3 actionStart{};
// Signed degrees per second per world axis. Non-zero means a behavior owns that axis.
NiPoint3 velocity{};
};
struct MoveState {
// Signed units per second along local right, up and forward. Non-zero means a behavior owns that axis.
NiPoint3 velocity{};
// Right, up and forward in world space as of the last velocity update
std::array<NiPoint3, 3> basis{ NiPoint3Constant::UNIT_X, NiPoint3Constant::UNIT_Y, NiPoint3Constant::UNIT_Z };
// Whether the last velocity update came from an active move
bool wasMoving{ false };
// World position of an active StartMoveTo move
std::optional<NiPoint3> target;
// Units per second of the move to target
float targetSpeed{};
// Direction to target as of the last velocity update, zero once there
NiPoint3 targetDirection{};
// Incremented each time StartMoveTo interrupts the active moves
uint32_t interruptCount{};
};
// Sends the client-side angular velocity for the currently active rotation axes.
void SyncAngularVelocity() const;
// Recomputes the linear velocity from the active move axes and the current rotation.
void SyncLinearVelocity();
// Clears all rotation state and makes rotation relative to newBase.
void ResetRotationState(const NiQuaternion& newBase);
// Loads a behavior from the database.
void LoadBehavior(const LWOOBJID behaviorID, const size_t index, const bool isIndexed);
@@ -217,9 +288,12 @@ private:
*/
LWOOBJID m_userModelID;
// The speed at which this model moves
float m_Speed{ PropertyBehaviorActions::DEFAULT_SPEED };
// Whether or not to restart at the end of the frame.
bool m_RestartAtEndOfFrame{ false };
RotationState m_Rotation;
MoveState m_Move;
float m_DamageCooldown { 0.0f };
};

View File

@@ -18,6 +18,8 @@
#include "PhantomPhysicsComponent.h"
SimplePhysicsComponent::SimplePhysicsComponent(Entity* parent, const int32_t componentID) : PhysicsComponent(parent, componentID) {
RegisterMsg(&SimplePhysicsComponent::OnGetAngularVelocity);
RegisterMsg(&SimplePhysicsComponent::OnSetAngularVelocity);
RegisterMsg(&SimplePhysicsComponent::OnGetObjectReportInfo);
m_Position = m_Parent->GetDefaultPosition();

View File

@@ -24,6 +24,11 @@ enum class eClimbableType : int32_t {
CLIMBABLE_TYPE_WALL_STICK
};
namespace GameMessages {
struct SetAngularVelocity;
struct GetAngularVelocity;
}
/**
* Component that serializes locations of entities to the client
@@ -73,6 +78,9 @@ public:
*/
void SetAngularVelocity(const NiPoint3& value) { m_AngularVelocity = value; m_DirtyVelocity = true; }
bool OnSetAngularVelocity(GameMessages::SetAngularVelocity& setAngVel);
bool OnGetAngularVelocity(GameMessages::GetAngularVelocity& getAngVel);
/**
* Returns the physics motion state
* @return the physics motion state

View File

@@ -999,14 +999,14 @@ const std::map<LWOOBJID, LWOOBJID>& PropertyManagementComponent::GetModels() con
return models;
}
void PropertyManagementComponent::OnChatMessageReceived(const std::string& sMessage) const {
void PropertyManagementComponent::OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) const {
for (const auto& modelID : models | std::views::keys) {
auto* const model = Game::entityManager->GetEntity(modelID);
if (!model) continue;
auto* const modelComponent = model->GetComponent<ModelComponent>();
if (!modelComponent) continue;
modelComponent->OnChatMessageReceived(sMessage);
modelComponent->OnChatMessageReceived(sMessage, sender);
}
}

View File

@@ -202,7 +202,7 @@ public:
uint32_t GetReputation() const noexcept { return reputation; }
void OnChatMessageReceived(const std::string& sMessage) const;
void OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) const;
/**
* Live updates (docs/LiveUpdate.md): a new instance of this property is about to load it from the database. Takes

View File

@@ -30,10 +30,12 @@ target_include_directories(dGameMessages PUBLIC "."
${DLU_COMPONENT_INCLUDE_DIRS} # direct MissionComponent.h
"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct SlashCommandHandler.h
"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # direct ControlBehaviors.h
"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors/ControlBehaviorMessages" # direct ControlBehaviors.h
"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
"${PROJECT_SOURCE_DIR}/dZoneManager" # via GameMessages.cpp, GameMessageHandler.cpp
"${PROJECT_SOURCE_DIR}/dGame/d"
)
target_precompile_headers(dGameMessages REUSE_FROM dGameBase)

View File

@@ -260,6 +260,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
}
}
msg->target = objectID;
if (!msg->Deserialize(inStream)) {
LOG("Dropping malformed GM %4i, %s from (%llu) targeting (%llu)", messageID, StringifiedEnum::ToString(messageID).data(), usr->GetLoggedInChar(), objectID);
return;

View File

@@ -196,6 +196,21 @@ namespace GameMessages {
bool bIgnoreChecks{ false };
};
struct GetAngularVelocity : public GameMsg {
GetAngularVelocity() : GameMsg(MessageType::Game::GET_ANGULAR_VELOCITY) {}
NiPoint3 angVelocity{};
};
struct SetAngularVelocity : public GameMsg {
SetAngularVelocity() : GameMsg(MessageType::Game::SET_ANGULAR_VELOCITY) {}
NiPoint3 angVelocity{};
bool bIgnoreDirtyFlags{};
bool bForceFlagDirty{};
};
struct GetMissionState : public GameMsg {
GetMissionState() : GameMsg(MessageType::Game::GET_MISSION_STATE) {}

View File

@@ -212,14 +212,14 @@ void PropertyBehavior::Update(float deltaTime, ModelComponent& modelComponent) {
}
}
void PropertyBehavior::OnChatMessageReceived(const std::string& sMessage) {
void PropertyBehavior::OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) {
auto& activeState = GetActiveState();
activeState.OnChatMessageReceived(sMessage);
activeState.OnChatMessageReceived(sMessage, sender);
}
void PropertyBehavior::OnHit() {
void PropertyBehavior::OnHit(const LWOOBJID attacker) {
auto& activeState = GetActiveState();
activeState.OnHit();
activeState.OnHit(attacker);
}
State& PropertyBehavior::GetActiveState() {

View File

@@ -46,8 +46,8 @@ public:
void Deserialize(const tinyxml2::XMLElement& behavior);
void Update(float deltaTime, ModelComponent& modelComponent);
void OnChatMessageReceived(const std::string& sMessage);
void OnHit();
void OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender);
void OnHit(const LWOOBJID attacker);
private:
State& GetActiveState();

View File

@@ -168,10 +168,10 @@ void State::Update(float deltaTime, ModelComponent& modelComponent, UpdateResult
for (auto& strip : m_Strips) strip.Update(deltaTime, modelComponent, updateResult);
}
void State::OnChatMessageReceived(const std::string& sMessage) {
for (auto& strip : m_Strips) strip.OnChatMessageReceived(sMessage);
void State::OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) {
for (auto& strip : m_Strips) strip.OnChatMessageReceived(sMessage, sender);
}
void State::OnHit() {
for (auto& strip : m_Strips) strip.OnHit();
void State::OnHit(const LWOOBJID attacker) {
for (auto& strip : m_Strips) strip.OnHit(attacker);
}

View File

@@ -24,8 +24,8 @@ public:
void Update(float deltaTime, ModelComponent& modelComponent, UpdateResult& updateResult);
void OnChatMessageReceived(const std::string& sMessage);
void OnHit();
void OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender);
void OnHit(const LWOOBJID attacker);
private:
// The strips contained within this state.

View File

@@ -1,4 +1,6 @@
#include "Strip.h"
#include <algorithm>
#include "CombatMessages.h"
#include "Amf3.h"
@@ -10,6 +12,7 @@
#include "PropertyManagementComponent.h"
#include "PlayerManager.h"
#include "SimplePhysicsComponent.h"
#include "DestroyableComponent.h"
#include "dChatFilter.h"
@@ -102,6 +105,7 @@ void Strip::HandleMsg(GameMessages::RequestUse& msg) {
if (nextAction.GetType() == PropertyBehaviorActions::ON_INTERACT) {
IncrementAction();
m_WaitingForAction = false;
m_StripInitiatorID = msg.target;
}
}
@@ -110,27 +114,34 @@ void Strip::HandleMsg(GameMessages::ResetModelToDefaults& msg) {
m_WaitingForAction = false;
m_PausedTime = 0.0f;
m_NextActionIndex = 0;
m_InActionMove = NiPoint3Constant::ZERO;
m_InActionTranslation = NiPoint3Constant::ZERO;
m_PreviousFramePosition = NiPoint3Constant::ZERO;
m_InActionRotation = NiPoint3Constant::ZERO;
m_RotationProgress = 0.0f;
m_Speed = DEFAULT_SPEED;
m_PausedFromOnTimer = false;
m_MovingToStart = false;
}
void Strip::OnChatMessageReceived(const std::string& sMessage) {
void Strip::OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender) {
if (m_PausedTime > 0.0f || !HasMinimumActions()) return;
const auto& nextAction = GetNextAction();
if (nextAction.GetType() == PropertyBehaviorActions::ON_CHAT && nextAction.GetValueParameterString() == sMessage) {
IncrementAction();
m_WaitingForAction = false;
m_StripInitiatorID = sender;
}
}
void Strip::OnHit() {
void Strip::OnHit(const LWOOBJID attacker) {
if (m_PausedTime > 0.0f || !HasMinimumActions()) return;
const auto& nextAction = GetNextAction();
if (nextAction.GetType() == PropertyBehaviorActions::ON_ATTACK) {
IncrementAction();
m_WaitingForAction = false;
m_StripInitiatorID = attacker;
}
}
@@ -178,19 +189,37 @@ void Strip::ProcNormalAction(float deltaTime, ModelComponent& modelComponent, Up
namespace Actions = PropertyBehaviorActions;
/* BEGIN Move */
if (const auto* move = Actions::Find(Actions::MOVES, nextActionType)) {
const auto& unit = move->axis == 'x' ? NiPoint3Constant::UNIT_X : move->axis == 'y' ? NiPoint3Constant::UNIT_Y : NiPoint3Constant::UNIT_Z;
// Default velocity is 3 units per second.
if (modelComponent.TrySetVelocity(unit * move->sign)) {
// Local right (x), up (y) and forward (z) axes
const int axis = move->axis == 'x' ? 0 : move->axis == 'y' ? 1 : 2;
if (modelComponent.TryStartMove(axis, move->sign, m_Speed)) {
m_PreviousFramePosition = entity.GetPosition();
auto& distance = move->axis == 'x' ? m_InActionMove.x : move->axis == 'y' ? m_InActionMove.y : m_InActionMove.z;
m_MoveInterruptCount = modelComponent.GetMoveInterruptCount();
auto& distance = move->axis == 'x' ? m_InActionTranslation.x : move->axis == 'y' ? m_InActionTranslation.y : m_InActionTranslation.z;
distance = move->sign < 0 ? -number : number;
}
}
/* END Move */
/* BEGIN Rotate */
else if (const auto* rotation = Actions::Find(Actions::ROTATIONS, nextActionType)) {
// Local tilt (x), spin (y) and roll (z) axes
const int axis = rotation->axis == 'x' ? 0 : rotation->axis == 'y' ? 1 : 2;
if (number != 0.0 && modelComponent.TryStartRotation(axis, rotation->sign, m_Speed)) {
m_MoveInterruptCount = modelComponent.GetMoveInterruptCount();
auto& degrees = rotation->axis == 'x' ? m_InActionRotation.x : rotation->axis == 'y' ? m_InActionRotation.y : m_InActionRotation.z;
degrees = rotation->sign * number;
m_RotationProgress = 0.0f;
}
}
/* END Rotate */
/* BEGIN Navigation */
else if (nextActionType == Actions::SET_SPEED) {
modelComponent.SetSpeed(number);
// Floored so a move or rotation can never stall forever
m_Speed = std::max(static_cast<float>(number), MIN_SPEED);
} else if (nextActionType == Actions::MOVE_BACK_TO_START) {
modelComponent.StartMoveTo(modelComponent.GetOriginalPosition(), m_Speed);
m_MovingToStart = true;
}
/* END Navigation */
@@ -226,9 +255,9 @@ void Strip::ProcNormalAction(float deltaTime, ModelComponent& modelComponent, Up
chatMessage.message = GeneralUtils::ASCIIToUTF16(valueStr);
chatMessage.Broadcast();
}
PropertyManagementComponent::Instance()->OnChatMessageReceived(valueStr.data());
PropertyManagementComponent::Instance()->OnChatMessageReceived(valueStr.data(), m_StripInitiatorID);
} else if (nextActionType == Actions::PRIVATE_MESSAGE) {
PropertyManagementComponent::Instance()->OnChatMessageReceived(valueStr.data());
PropertyManagementComponent::Instance()->OnChatMessageReceived(valueStr.data(), m_StripInitiatorID);
} else if (nextActionType == Actions::PLAY_SOUND) {
GameMessages::PlayBehaviorSound sound;
sound.target = modelComponent.GetParent()->GetObjectID();
@@ -241,6 +270,8 @@ void Strip::ProcNormalAction(float deltaTime, ModelComponent& modelComponent, Up
/* BEGIN Gameplay */
else if (const auto* spawn = Actions::Find(Actions::SPAWNS, nextActionType)) {
Spawn(spawn->lot, entity);
} else if (nextActionType == Actions::DO_DAMAGE) {
modelComponent.DoDamage(m_StripInitiatorID);
} else if (const auto* drop = Actions::Find(Actions::DROPS, nextActionType)) {
for (; numberAsInt > 0; numberAsInt--) SpawnDrop(drop->lot, entity);
}
@@ -277,49 +308,66 @@ void Strip::RemoveStates(ModelComponent& modelComponent) const {
}
bool Strip::CheckMovement(float deltaTime, ModelComponent& modelComponent) {
if (m_MovingToStart) {
if (modelComponent.IsMovingToTarget()) return false;
m_MovingToStart = false;
}
// A MoveBackToStart cancelled our move, so skip to the next action
if (m_MoveInterruptCount != modelComponent.GetMoveInterruptCount()) m_InActionTranslation = NiPoint3Constant::ZERO;
auto& entity = *modelComponent.GetParent();
const auto& currentPos = entity.GetPosition();
const auto diff = currentPos - m_PreviousFramePosition;
const auto [moveX, moveY, moveZ] = m_InActionMove;
m_PreviousFramePosition = currentPos;
// Only want to subtract from the move if one is being performed.
// Starts at true because we may not be doing a move at all.
// If one is being done, then one of the move_ variables will be non-zero
bool moveFinished = true;
NiPoint3 finalPositionAdjustment = NiPoint3Constant::ZERO;
if (moveX != 0.0f) {
m_InActionMove.x -= diff.x;
// If the sign bit is different between the two numbers, then we have finished our move.
moveFinished = std::signbit(m_InActionMove.x) != std::signbit(moveX);
finalPositionAdjustment.x = m_InActionMove.x;
} else if (moveY != 0.0f) {
m_InActionMove.y -= diff.y;
// If the sign bit is different between the two numbers, then we have finished our move.
moveFinished = std::signbit(m_InActionMove.y) != std::signbit(moveY);
finalPositionAdjustment.y = m_InActionMove.y;
} else if (moveZ != 0.0f) {
m_InActionMove.z -= diff.z;
// If the sign bit is different between the two numbers, then we have finished our move.
moveFinished = std::signbit(m_InActionMove.z) != std::signbit(moveZ);
finalPositionAdjustment.z = m_InActionMove.z;
}
for (int axis = 0; axis < 3; axis++) {
const float target = m_InActionTranslation[axis];
if (target == 0.0f) continue;
// Once done, set the in action move & velocity to zero
if (moveFinished && m_InActionMove != NiPoint3Constant::ZERO) {
auto entityVelocity = entity.GetVelocity();
// Zero out only the velocity that was acted on
if (moveX != 0.0f) entityVelocity.x = 0.0f;
else if (moveY != 0.0f) entityVelocity.y = 0.0f;
else if (moveZ != 0.0f) entityVelocity.z = 0.0f;
modelComponent.SetVelocity(entityVelocity);
// The local axes are orthonormal so this isolates our axis from any other active moves
const auto& axisVector = modelComponent.GetMoveAxis(axis);
m_InActionTranslation[axis] -= diff.DotProduct(axisVector);
// If the sign bit is different between the two numbers, then we have finished our move.
if (std::signbit(m_InActionTranslation[axis]) == std::signbit(target)) return false;
// Do the final adjustment so we will have moved exactly the requested units
entity.SetPosition(entity.GetPosition() + finalPositionAdjustment);
m_InActionMove = NiPoint3Constant::ZERO;
entity.SetPosition(entity.GetPosition() + axisVector * m_InActionTranslation[axis]);
modelComponent.StopMove(axis);
m_InActionTranslation = NiPoint3Constant::ZERO;
}
return moveFinished;
return true;
}
bool Strip::CheckRotation(float deltaTime, ModelComponent& modelComponent) {
if (m_MoveInterruptCount != modelComponent.GetMoveInterruptCount()) {
for (int axis = 0; axis < 3; axis++) {
if (m_InActionRotation[axis] != 0.0f) modelComponent.StopRotation(axis);
}
m_InActionRotation = NiPoint3Constant::ZERO;
m_RotationProgress = 0.0f;
}
for (int axis = 0; axis < 3; axis++) {
const float target = m_InActionRotation[axis];
if (target == 0.0f) continue;
// Snapping to the target keeps the final angle exact regardless of speed or frame time
const float step = modelComponent.GetAngularSpeed(axis) * deltaTime;
if (std::abs(target - m_RotationProgress) <= step) m_RotationProgress = target;
else m_RotationProgress += std::copysign(step, target);
modelComponent.SetRotationProgress(axis, m_RotationProgress);
if (m_RotationProgress != target) return false;
modelComponent.StopRotation(axis);
m_InActionRotation = NiPoint3Constant::ZERO;
m_RotationProgress = 0.0f;
}
return true;
}
void Strip::Update(float deltaTime, ModelComponent& modelComponent, UpdateResult& updateResult) {
@@ -327,8 +375,9 @@ void Strip::Update(float deltaTime, ModelComponent& modelComponent, UpdateResult
// Strips are also designed to have 2 actions or more to run.
if (!HasMinimumActions()) return;
// Return if this strip has an active movement action
// Return if this strip has an active movement or rotation action
if (!CheckMovement(deltaTime, modelComponent)) return;
if (!CheckRotation(deltaTime, modelComponent)) return;
// Don't run this strip if we're paused.
m_PausedTime -= deltaTime;
@@ -346,16 +395,35 @@ void Strip::Update(float deltaTime, ModelComponent& modelComponent, UpdateResult
// Check for trigger blocks and if not a trigger block proc this blocks action
if (m_NextActionIndex == 0) {
m_StripInitiatorID = LWOOBJID_EMPTY;
LOG("Behavior strip started %s", nextAction.GetType().data());
m_Speed = DEFAULT_SPEED;
if (nextAction.GetType() == PropertyBehaviorActions::ON_INTERACT) {
modelComponent.AddInteract();
m_WaitingForAction = true;
} else if (nextAction.GetType() == PropertyBehaviorActions::ON_CHAT) {
// logic here if needed
m_WaitingForAction = true;
} else if (nextAction.GetType() == PropertyBehaviorActions::ON_ATTACK) {
modelComponent.AddAttack();
m_WaitingForAction = true;
} else if (nextAction.GetType() == PropertyBehaviorActions::ON_STARTUP) {
IncrementAction();
} else if (nextAction.GetType() == PropertyBehaviorActions::ON_TIMER) {
if (!m_PausedFromOnTimer) {
m_PausedTime = nextAction.GetValueParameterDouble();
m_PausedFromOnTimer = true;
} else {
IncrementAction();
m_PausedFromOnTimer = false;
}
} else {
// in case we run into an unimplemented action or one that isnt a start node
// mark as waiting for action so we dont waste time re-starting the same logic and serializing
// every frame
m_WaitingForAction = true;
}
Game::entityManager->SerializeEntity(entity);
m_WaitingForAction = true;
} else { // should be a normal block
ProcNormalAction(deltaTime, modelComponent, updateResult);
}

View File

@@ -34,6 +34,10 @@ public:
// Checks the movement logic for whether or not to proceed
// Returns true if the movement can continue, false if it needs to wait more.
bool CheckMovement(float deltaTime, ModelComponent& modelComponent);
// Checks the rotation logic for whether or not to proceed
// Returns true if the rotation can continue, false if it needs to wait more.
bool CheckRotation(float deltaTime, ModelComponent& modelComponent);
void Update(float deltaTime, ModelComponent& modelComponent, UpdateResult& updateResult);
void SpawnDrop(LOT dropLOT, Entity& entity);
void ProcNormalAction(float deltaTime, ModelComponent& modelComponent, UpdateResult& updateResult);
@@ -42,8 +46,8 @@ public:
// 2 actions are required for strips to work
bool HasMinimumActions() const { return m_Actions.size() >= 2; }
void OnChatMessageReceived(const std::string& sMessage);
void OnHit();
void OnChatMessageReceived(const std::string& sMessage, const LWOOBJID sender);
void OnHit(const LWOOBJID attacker);
private:
// Indicates this Strip is waiting for an action to be taken upon it to progress to its actions
bool m_WaitingForAction{ false };
@@ -51,6 +55,7 @@ private:
// The amount of time this strip is paused for. Any interactions with this strip should be bounced if this is greater than 0.
// Actions that do not use time do not use this (ex. positions).
float m_PausedTime{ 0.0f };
bool m_PausedFromOnTimer{ false };
// The index of the next action to be played. This should always be within range of [0, m_Actions.size()).
size_t m_NextActionIndex{ 0 };
@@ -61,14 +66,32 @@ private:
// The location of this strip on the UGBehaviorEditor UI
StripUiPosition m_Position;
// The current actions remaining distance to the target
// The current actions remaining translation to the target along the model's local right (x), up (y) and forward (z) axes.
// Only 1 of these vertexs' will be active at once for any given strip.
NiPoint3 m_InActionMove{};
NiPoint3 m_InActionTranslation{};
// The position of the parent model on the previous frame
NiPoint3 m_PreviousFramePosition{};
NiPoint3 m_SavedVelocity{};
// The signed target degrees of the current rotation action. Only 1 axis is active at once for any given strip.
NiPoint3 m_InActionRotation{};
// The signed degrees the current rotation action has progressed so far
float m_RotationProgress{ 0.0f };
// Whether this strip is waiting on a MoveBackToStart to arrive
bool m_MovingToStart{ false };
// The model's move interrupt count when this strip's current move or rotation started
uint32_t m_MoveInterruptCount{};
static constexpr float DEFAULT_SPEED = 3.0f;
static constexpr float MIN_SPEED = 0.1f;
// Speed applied to moves and rotations started by this strip
float m_Speed{ DEFAULT_SPEED };
LWOOBJID m_StripInitiatorID{ LWOOBJID_EMPTY };
};
#endif //!__STRIP__H__

View File

@@ -1062,6 +1062,25 @@ void SlashCommandHandler::Startup() {
};
RegisterCommand(ExecuteCommand);
Command GetSceneCommand{
.help = "Get the current scene ID and name at your position",
.info = "Displays the scene ID and name at the player's current position. Scenes do not care about height.",
.aliases = { "getscene", "scene" },
.handle = DEVGMCommands::GetScene,
.requiredLevel = eGameMasterLevel::DEVELOPER
};
RegisterCommand(GetSceneCommand);
Command GetAdjacentScenesCommand{
.help = "Get all scenes adjacent to your current scene",
.info = "Displays all scenes that are directly connected to the player's current scene via scene transitions.",
.aliases = { "getadjacentscenes", "adjacentscenes" },
.handle = DEVGMCommands::GetAdjacentScenes,
.requiredLevel = eGameMasterLevel::DEVELOPER
};
RegisterCommand(GetAdjacentScenesCommand);
// Register Greater Than Zero Commands
Command KickCommand{

View File

@@ -18,6 +18,7 @@
#include "dServer.h"
#include "dpShapeSphere.h"
#include "dZoneManager.h"
#include <sstream>
#include "EntityInfo.h"
#include "Metrics.h"
#include "PlayerManager.h"
@@ -2005,4 +2006,81 @@ namespace DEVGMCommands {
ChatPackets::SendSystemMessage(sysAddr, GeneralUtils::UTF8ToUTF16("Making " + std::to_string(queued) + " model(s) again" +
(options.empty() ? "" : " with " + options) + ". Everyone on the property is reloaded when they're made."));
}
void GetScene(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
const auto position = entity->GetPosition();
// Get the scene ID from the zone manager
const auto sceneID = Game::zoneManager->GetSceneIDFromPosition(position);
if (sceneID == LWOSCENEID_INVALID) {
ChatPackets::SendSystemMessage(sysAddr, u"No scene found at current position.");
return;
}
// Get the scene reference from the zone to get the name
const auto* zone = Game::zoneManager->GetZone();
if (!zone) {
ChatPackets::SendSystemMessage(sysAddr, u"No zone loaded.");
return;
}
// Build the feedback message
std::ostringstream feedback;
feedback << "Scene ID: " << sceneID.GetSceneID();
feedback << " (Layer: " << sceneID.GetLayerID() << ")";
// Get the scene name
const auto* sceneRef = zone->GetScene(sceneID);
if (sceneRef && !sceneRef->name.empty()) {
feedback << " - Name: " << sceneRef->name;
}
ChatPackets::SendSystemMessage(sysAddr, GeneralUtils::ASCIIToUTF16(feedback.str()));
}
void GetAdjacentScenes(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
const auto position = entity->GetPosition();
// Get the scene ID from the zone manager
const auto sceneID = Game::zoneManager->GetSceneIDFromPosition(position);
if (sceneID == LWOSCENEID_INVALID) {
ChatPackets::SendSystemMessage(sysAddr, u"No scene found at current position.");
return;
}
// Get the zone reference
const auto* zone = Game::zoneManager->GetZone();
if (!zone) {
ChatPackets::SendSystemMessage(sysAddr, u"No zone loaded.");
return;
}
// Get current scene info
const auto* currentScene = zone->GetScene(sceneID);
std::string currentSceneName = currentScene && !currentScene->name.empty() ? currentScene->name : "Unknown";
// Get adjacent scenes
const auto adjacentSceneIDs = Game::zoneManager->GetAdjacentScenes(sceneID);
std::ostringstream feedback;
feedback << "Current Scene: " << sceneID.GetSceneID() << " (" << currentSceneName << ")";
if (adjacentSceneIDs.empty()) {
feedback << " - No adjacent scenes found.";
} else {
feedback << "\nAdjacent Scenes (" << adjacentSceneIDs.size() << "):";
for (const auto& adjSceneID : adjacentSceneIDs) {
feedback << "\n - Scene ID: " << adjSceneID.GetSceneID() << " (Layer: " << adjSceneID.GetLayerID() << ")";
// Get the scene name if available
const auto* sceneRef = zone->GetScene(adjSceneID);
if (sceneRef && !sceneRef->name.empty()) {
feedback << " - " << sceneRef->name;
}
}
}
ChatPackets::SendSystemMessage(sysAddr, GeneralUtils::ASCIIToUTF16(feedback.str()));
}
};

View File

@@ -78,6 +78,8 @@ namespace DEVGMCommands {
void Barfight(Entity* entity, const SystemAddress& sysAddr, const std::string args);
void Despawn(Entity* entity, const SystemAddress& sysAddr, const std::string args);
void Execute(Entity* entity, const SystemAddress& sysAddr, const std::string args);
void GetScene(Entity* entity, const SystemAddress& sysAddr, const std::string args);
void GetAdjacentScenes(Entity* entity, const SystemAddress& sysAddr, const std::string args);
}
#endif //!DEVGMCOMMANDS_H