diff --git a/dCommon/Amf3.h b/dCommon/Amf3.h index 689e7607..dce06973 100644 --- a/dCommon/Amf3.h +++ b/dCommon/Amf3.h @@ -4,7 +4,6 @@ #include "dCommonVars.h" #include "Logger.h" #include "Game.h" - #include #include #include @@ -368,7 +367,7 @@ public: } template - AmfType& PushDebug(const std::string_view name) { + AmfType& PushDebug(const std::string_view name, const std::string& objectType = "", const uint32_t warningLevel = 0) { size_t i = 0; for (; i < m_Dense.size(); i++) { const auto& cast = dynamic_cast(m_Dense[i].get()); @@ -377,6 +376,14 @@ public: const auto& nameValue = cast->Get("name"); if (!nameValue || nameValue->GetValue() != name) continue; + if (!objectType.empty()) { + cast->Insert("type", objectType); + } + + if (warningLevel != 0) { + cast->Insert("warningLevel", warningLevel); + } + // found a duplicate, return this instead auto valueCast = dynamic_cast(cast->Get("value")); if (valueCast) return *valueCast; @@ -384,6 +391,13 @@ public: auto* value = PushArray(); value->Insert("name", name.data()); + if (!objectType.empty()) { + value->Insert("type", objectType); + } + + if (warningLevel != 0) { + value->Insert("warningLevel", warningLevel); + } return value->Insert("value", std::make_unique()); } diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp index 069d984a..ab1589d5 100644 --- a/dGame/Entity.cpp +++ b/dGame/Entity.cpp @@ -1019,6 +1019,7 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream& outBitStream, eReplicaPacke const bool hasParent = m_ParentEntity != nullptr || m_SpawnerID != 0; outBitStream.Write(hasParent); if (hasParent) { + // 触るな！ if (m_ParentEntity != nullptr) outBitStream.Write(GeneralUtils::SetBit(m_ParentEntity->GetObjectID(), static_cast(eObjectBits::CLIENT))); else if (m_Spawner != nullptr && m_Spawner->m_Info.isNetwork) outBitStream.Write(m_SpawnerID); else outBitStream.Write(GeneralUtils::SetBit(m_SpawnerID, static_cast(eObjectBits::CLIENT))); @@ -2235,11 +2236,16 @@ bool Entity::MsgRequestServerObjectInfo(GameMessages::RequestServerObjectInfo& r const auto& objTableInfo = table->GetByID(GetLOT()); - objectInfo.PushDebug("Name") = objTableInfo.name; - objectInfo.PushDebug("Template ID(LOT)") = GetLOT(); - objectInfo.PushDebug("Object ID") = std::to_string(GetObjectID()); - objectInfo.PushDebug("Spawner's Object ID") = std::to_string(GetSpawnerID()); - objectInfo.PushDebug("Owner override") = std::to_string(m_OwnerOverride); + objectInfo.PushDebug("Name", "name") = objTableInfo.name; + objectInfo.PushDebug("Template ID(LOT)", "LOT") = GetLOT(); + objectInfo.PushDebug("Object ID", "LWOOBJID") = std::to_string(GetObjectID()); + objectInfo.PushDebug("Spawner's Object ID", "LWOOBJID") = std::to_string(GetSpawnerID()); + objectInfo.PushDebug("Owner override", "LWOOBJID") = std::to_string(m_OwnerOverride); + auto& children = objectInfo.PushDebug("Child Objects"); + int i = 1; + for (const auto* child : m_ChildEntities) { + if (child) children.PushDebug("Child " + std::to_string(i++), "LWOOBJID") = std::to_string(child->GetObjectID()); + } auto& componentDetails = objectInfo.PushDebug("Component Information"); for (const auto [id, component] : m_Components) { diff --git a/dGame/dComponents/BaseCombatAIComponent.cpp b/dGame/dComponents/BaseCombatAIComponent.cpp index e7cc0722..1bfc4039 100644 --- a/dGame/dComponents/BaseCombatAIComponent.cpp +++ b/dGame/dComponents/BaseCombatAIComponent.cpp @@ -864,7 +864,7 @@ bool BaseCombatAIComponent::MsgGetObjectReportInfo(GameMessages::GetObjectReport auto& cmptType = reportInfo.info->PushDebug("Base Combat AI"); cmptType.PushDebug("Component ID") = GetComponentID(); auto& targetInfo = cmptType.PushDebug("Current Target Info"); - targetInfo.PushDebug("Current Target ID") = std::to_string(m_Target); + targetInfo.PushDebug("Current Target ID", "LWOOBJID") = std::to_string(m_Target); // if (m_Target != LWOOBJID_EMPTY) { // LWOGameMessages::ObjGetName nameMsg(m_CurrentTarget); // SEND_GAMEOBJ_MSG(nameMsg); @@ -905,10 +905,7 @@ bool BaseCombatAIComponent::MsgGetObjectReportInfo(GameMessages::GetObjectReport //} //cmptType.PushDebug("Current Combat Role") = curState; - auto& tetherPoint = cmptType.PushDebug("Tether Point"); - tetherPoint.PushDebug("X") = m_StartPosition.x; - tetherPoint.PushDebug("Y") = m_StartPosition.y; - tetherPoint.PushDebug("Z") = m_StartPosition.z; + cmptType.PushDebug("Tether Point").PushDebug(m_StartPosition); cmptType.PushDebug("Hard Tether Radius") = m_HardTetherRadius; cmptType.PushDebug("Soft Tether Radius") = m_SoftTetherRadius; cmptType.PushDebug("Aggro Radius") = m_AggroRadius; diff --git a/dGame/dComponents/ControllablePhysicsComponent.cpp b/dGame/dComponents/ControllablePhysicsComponent.cpp index 2b26368f..86be8622 100644 --- a/dGame/dComponents/ControllablePhysicsComponent.cpp +++ b/dGame/dComponents/ControllablePhysicsComponent.cpp @@ -361,17 +361,11 @@ void ControllablePhysicsComponent::SetStunImmunity( bool ControllablePhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo& reportInfo) { PhysicsComponent::OnGetObjectReportInfo(reportInfo); - auto& info = reportInfo.subCategory->PushDebug("Controllable Info"); + auto& info = reportInfo.subCategory->PushDebug("Controllable Physics"); - auto& vel = info.PushDebug("Velocity"); - vel.PushDebug("x") = m_Velocity.x; - vel.PushDebug("y") = m_Velocity.y; - vel.PushDebug("z") = m_Velocity.z; + info.PushDebug("Velocity").PushDebug(m_Velocity); - auto& angularVelocity = info.PushDebug("Angular Velocity"); - angularVelocity.PushDebug("x") = m_AngularVelocity.x; - angularVelocity.PushDebug("y") = m_AngularVelocity.y; - angularVelocity.PushDebug("z") = m_AngularVelocity.z; + info.PushDebug("Angular Velocity").PushDebug(m_AngularVelocity); info.PushDebug("Is On Ground") = m_IsOnGround; info.PushDebug("Is On Rail") = m_IsOnRail; @@ -403,12 +397,13 @@ bool ControllablePhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObject info.PushDebug("Is In Bubble") = m_IsInBubble; info.PushDebug("Bubble Type") = StringifiedEnum::ToString(m_BubbleType).data(); info.PushDebug("Special Anims") = m_SpecialAnims; - info.PushDebug("Immune To Stun Attack Count") = m_ImmuneToStunAttackCount; - info.PushDebug("Immune To Stun Equip Count") = m_ImmuneToStunEquipCount; - info.PushDebug("Immune To Stun Interact Count") = m_ImmuneToStunInteractCount; - info.PushDebug("Immune To Stun Jump Count") = m_ImmuneToStunJumpCount; - info.PushDebug("Immune To Stun Move Count") = m_ImmuneToStunMoveCount; - info.PushDebug("Immune To Stun Turn Count") = m_ImmuneToStunTurnCount; - info.PushDebug("Immune To Stun UseItem Count") = m_ImmuneToStunUseItemCount; + auto& immunity = info.PushDebug("Immunity Effects"); + immunity.PushDebug("Immune to Stun Move") = m_ImmuneToStunMoveCount != 0; + immunity.PushDebug("Immune to Stun Turn") = m_ImmuneToStunTurnCount != 0; + immunity.PushDebug("Immune to Stun Attack") = m_ImmuneToStunAttackCount != 0; + immunity.PushDebug("Immune to Stun Use Item") = m_ImmuneToStunUseItemCount != 0; + immunity.PushDebug("Immune to Stun Equip") = m_ImmuneToStunEquipCount != 0; + immunity.PushDebug("Immune to Stun Interact") = m_ImmuneToStunInteractCount != 0; + immunity.PushDebug("Immune to Stun Jump") = m_ImmuneToStunJumpCount != 0; return true; } diff --git a/dGame/dComponents/ControllablePhysicsComponent.h b/dGame/dComponents/ControllablePhysicsComponent.h index 76de5b51..d3230ca2 100644 --- a/dGame/dComponents/ControllablePhysicsComponent.h +++ b/dGame/dComponents/ControllablePhysicsComponent.h @@ -328,7 +328,7 @@ private: /** * The effect that plays while using the jetpack */ - int32_t m_JetpackEffectID; + int32_t m_JetpackEffectID{}; /** * The current speed multiplier, allowing an entity to run faster diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp index 90591367..877fe4fa 100644 --- a/dGame/dComponents/DestroyableComponent.cpp +++ b/dGame/dComponents/DestroyableComponent.cpp @@ -1146,7 +1146,7 @@ bool DestroyableComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportIn destroyableInfo.PushDebug("Explode Factor") = m_ExplodeFactor; destroyableInfo.PushDebug("Has Threats") = m_HasThreats; - destroyableInfo.PushDebug("Killer ID") = std::to_string(m_KillerID); + destroyableInfo.PushDebug("Killer ID", "LWOOBJID") = std::to_string(m_KillerID); // "Scripts"; idk what to do about scripts yet auto& immuneCounts = destroyableInfo.PushDebug("Immune Counts"); diff --git a/dGame/dComponents/GhostComponent.cpp b/dGame/dComponents/GhostComponent.cpp index c27cd31a..e55031d4 100644 --- a/dGame/dComponents/GhostComponent.cpp +++ b/dGame/dComponents/GhostComponent.cpp @@ -108,7 +108,7 @@ bool GhostComponent::OnGetGMInvis(GameMessages::GetGMInvis& gmInvisMsg) { bool GhostComponent::MsgGetObjectReportInfo(GameMessages::GetObjectReportInfo& reportMsg) { auto& cmptType = reportMsg.info->PushDebug("Ghost"); cmptType.PushDebug("Component ID") = GetComponentID(); - cmptType.PushDebug("Is GM Invis") = false; + cmptType.PushDebug("Is GM Invis") = m_IsGMInvisible; return true; } diff --git a/dGame/dComponents/HavokVehiclePhysicsComponent.cpp b/dGame/dComponents/HavokVehiclePhysicsComponent.cpp index 52819657..299c2c5a 100644 --- a/dGame/dComponents/HavokVehiclePhysicsComponent.cpp +++ b/dGame/dComponents/HavokVehiclePhysicsComponent.cpp @@ -110,15 +110,9 @@ bool HavokVehiclePhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObject auto& info = reportInfo.subCategory->PushDebug("Havok Vehicle Physics Info"); - auto& velocity = info.PushDebug("Velocity"); - velocity.PushDebug("x") = m_Velocity.x; - velocity.PushDebug("y") = m_Velocity.y; - velocity.PushDebug("z") = m_Velocity.z; + auto& velocity = info.PushDebug("Velocity").PushDebug(m_Velocity); - auto& angularVelocity = info.PushDebug("Angular Velocity"); - angularVelocity.PushDebug("x") = m_AngularVelocity.x; - angularVelocity.PushDebug("y") = m_AngularVelocity.y; - angularVelocity.PushDebug("z") = m_AngularVelocity.z; + auto& angularVelocity = info.PushDebug("Angular Velocity").PushDebug(m_AngularVelocity); info.PushDebug("Is On Ground") = m_IsOnGround; info.PushDebug("Is On Rail") = m_IsOnRail; diff --git a/dGame/dComponents/InventoryComponent.cpp b/dGame/dComponents/InventoryComponent.cpp index 5199029a..07662516 100644 --- a/dGame/dComponents/InventoryComponent.cpp +++ b/dGame/dComponents/InventoryComponent.cpp @@ -1860,9 +1860,9 @@ bool InventoryComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo std::stringstream ss; ss << "%[Objects_" << item->GetLot() << "_name] Slot " << item->GetSlot(); auto& slot = curInv.PushDebug(ss.str()); - slot.PushDebug("Object ID") = std::to_string(item->GetId()); - slot.PushDebug("LOT") = item->GetLot(); - if (item->GetSubKey() != LWOOBJID_EMPTY) slot.PushDebug("Subkey") = std::to_string(item->GetSubKey()); + slot.PushDebug("Object ID", "LWOOBJID") = std::to_string(item->GetId()); + slot.PushDebug("LOT", "LOT") = item->GetLot(); + if (item->GetSubKey() != LWOOBJID_EMPTY) slot.PushDebug("Subkey", "LWOOBJID") = std::to_string(item->GetSubKey()); slot.PushDebug("Count") = item->GetCount(); slot.PushDebug("Slot") = item->GetSlot(); slot.PushDebug("Bind on pickup") = item->GetInfo().isBOP; @@ -1881,7 +1881,8 @@ bool InventoryComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo ss << "%[Objects_" << info.lot << "_name]"; auto& equipSlot = equipped.PushDebug(ss.str()); equipSlot.PushDebug("Location") = location; - equipSlot.PushDebug("Object ID") = std::to_string(info.id); + equipSlot.PushDebug("Object ID", "LWOOBJID") = std::to_string(info.id); + equipSlot.PushDebug("LOT", "LOT") = info.lot; equipSlot.PushDebug("Slot") = info.slot; equipSlot.PushDebug("Count") = info.count; auto& extra = equipSlot.PushDebug("Extra Info"); diff --git a/dGame/dComponents/MissionComponent.cpp b/dGame/dComponents/MissionComponent.cpp index 08c4ce8d..7ba24a4a 100644 --- a/dGame/dComponents/MissionComponent.cpp +++ b/dGame/dComponents/MissionComponent.cpp @@ -652,7 +652,7 @@ void PushMissions(const std::map& missions, AMFArrayValue& V } bool MissionComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo& reportInfo) { - auto& missionInfo = reportInfo.info->PushDebug("Mission (Laggy)"); + auto& missionInfo = reportInfo.info->PushDebug("Mission (Laggy)", "", 1); missionInfo.PushDebug("Component ID") = GetComponentID(); // Sort the missions so they are easier to parse and present to the end user std::map achievements; diff --git a/dGame/dComponents/ModelComponent.cpp b/dGame/dComponents/ModelComponent.cpp index 48585237..248cbbac 100644 --- a/dGame/dComponents/ModelComponent.cpp +++ b/dGame/dComponents/ModelComponent.cpp @@ -355,8 +355,8 @@ bool ModelComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo& re cmptInfo.PushDebug("Name") = "Objects_" + std::to_string(m_Parent->GetLOT()) + "_name"; cmptInfo.PushDebug("Has Unique Name") = false; - cmptInfo.PushDebug("UGID (from item)") = std::to_string(m_userModelID); - cmptInfo.PushDebug("UGID") = std::to_string(m_userModelID); + cmptInfo.PushDebug("UGID (from item)", "LWOOBJID") = std::to_string(m_userModelID); + cmptInfo.PushDebug("UGID", "LWOOBJID") = std::to_string(m_userModelID); cmptInfo.PushDebug("Description") = ""; cmptInfo.PushDebug("Behavior Count") = m_Behaviors.size(); diff --git a/dGame/dComponents/MovementAIComponent.cpp b/dGame/dComponents/MovementAIComponent.cpp index 8a10df25..917e96c0 100644 --- a/dGame/dComponents/MovementAIComponent.cpp +++ b/dGame/dComponents/MovementAIComponent.cpp @@ -535,20 +535,14 @@ bool MovementAIComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInf movementInfo.PushDebug("Pulling To Point") = m_PullingToPoint; movementInfo.PushDebug("At Final Waypoint") = m_AtFinalWaypoint; - auto& pullPointInfo = movementInfo.PushDebug("Pull Point"); - pullPointInfo.PushDebug("X") = m_PullPoint.x; - pullPointInfo.PushDebug("Y") = m_PullPoint.y; - pullPointInfo.PushDebug("Z") = m_PullPoint.z; + auto& pullPointInfo = movementInfo.PushDebug("Pull Point").PushDebug(m_PullPoint); // movementInfo.PushDebug("Delay") = m_Delay; auto& waypoints = movementInfo.PushDebug("Interpolated Waypoints"); int i = 0; for (const auto& point : m_InterpolatedWaypoints) { - auto& waypoint = waypoints.PushDebug("Waypoint " + std::to_string(++i)); - waypoint.PushDebug("X") = point.x; - waypoint.PushDebug("Y") = point.y; - waypoint.PushDebug("Z") = point.z; + waypoints.PushDebug("Waypoint " + std::to_string(++i)).PushDebug(point); } i = 0; @@ -556,10 +550,7 @@ bool MovementAIComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInf auto pathCopy = m_CurrentPath; // Copy to avoid modifying the original stack while (!pathCopy.empty()) { const auto& waypoint = pathCopy.top(); - auto& pathWaypoint = currentPath.PushDebug("Waypoint " + std::to_string(++i)); - pathWaypoint.PushDebug("X") = waypoint.position.x; - pathWaypoint.PushDebug("Y") = waypoint.position.y; - pathWaypoint.PushDebug("Z") = waypoint.position.z; + currentPath.PushDebug("Waypoint " + std::to_string(++i)).PushDebug(waypoint.position); pathCopy.pop(); } diff --git a/dGame/dComponents/PhantomPhysicsComponent.cpp b/dGame/dComponents/PhantomPhysicsComponent.cpp index a65df484..9a90dbe3 100644 --- a/dGame/dComponents/PhantomPhysicsComponent.cpp +++ b/dGame/dComponents/PhantomPhysicsComponent.cpp @@ -238,10 +238,7 @@ bool PhantomPhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObjectRepor info.PushDebug("Effect Type") = static_cast(m_EffectType); info.PushDebug("Directional Multiplier") = m_DirectionalMultiplier; info.PushDebug("Is Directional") = m_IsDirectional; - auto& direction = info.PushDebug("Direction"); - direction.PushDebug("x") = m_Direction.x; - direction.PushDebug("y") = m_Direction.y; - direction.PushDebug("z") = m_Direction.z; + auto& direction = info.PushDebug("Direction").PushDebug(m_Direction); if (m_MinMax) { auto& minMaxInfo = info.PushDebug("Min Max Info"); @@ -252,15 +249,8 @@ bool PhantomPhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObjectRepor if (m_IsRespawnVolume) { auto& respawnInfo = info.PushDebug("Respawn Info"); respawnInfo.PushDebug("Is Respawn Volume") = m_IsRespawnVolume; - auto& respawnPos = respawnInfo.PushDebug("Respawn Position"); - respawnPos.PushDebug("x") = m_RespawnPos.x; - respawnPos.PushDebug("y") = m_RespawnPos.y; - respawnPos.PushDebug("z") = m_RespawnPos.z; - auto& respawnRot = respawnInfo.PushDebug("Respawn Rotation"); - respawnRot.PushDebug("w") = m_RespawnRot.w; - respawnRot.PushDebug("x") = m_RespawnRot.x; - respawnRot.PushDebug("y") = m_RespawnRot.y; - respawnRot.PushDebug("z") = m_RespawnRot.z; + respawnInfo.PushDebug("Respawn Position").PushDebug(m_RespawnPos); + respawnInfo.PushDebug("Respawn Rotation").PushDebug(m_RespawnRot); } return true; diff --git a/dGame/dComponents/PhysicsComponent.cpp b/dGame/dComponents/PhysicsComponent.cpp index 16722c54..0d3a302b 100644 --- a/dGame/dComponents/PhysicsComponent.cpp +++ b/dGame/dComponents/PhysicsComponent.cpp @@ -249,18 +249,11 @@ bool PhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo& auto& info = reportInfo.info->PushDebug("Physics"); reportInfo.subCategory = &info; - auto& pos = info.PushDebug("Position"); - pos.PushDebug("x") = m_Position.x; - pos.PushDebug("y") = m_Position.y; - pos.PushDebug("z") = m_Position.z; + auto& pos = info.PushDebug("Position").PushDebug(m_Position); - auto& rot = info.PushDebug("Rotation"); - rot.PushDebug("w") = m_Rotation.w; - rot.PushDebug("x") = m_Rotation.x; - rot.PushDebug("y") = m_Rotation.y; - rot.PushDebug("z") = m_Rotation.z; + auto& rot = info.PushDebug("Rotation").PushDebug(m_Rotation); - info.PushDebug("CollisionGroup") = m_CollisionGroup; + info.PushDebug("Collision Group") = m_CollisionGroup; return true; } diff --git a/dGame/dComponents/ProximityMonitorComponent.cpp b/dGame/dComponents/ProximityMonitorComponent.cpp index 14e440d5..ca48a429 100644 --- a/dGame/dComponents/ProximityMonitorComponent.cpp +++ b/dGame/dComponents/ProximityMonitorComponent.cpp @@ -80,8 +80,9 @@ bool ProximityMonitorComponent::OnGetObjectReportInfo(GameMessages::GetObjectRep proxAmf.PushDebug("Position").PushDebug(entity->GetPosition()); proxAmf.PushDebug("Rotation").PushDebug(entity->GetRotation()); auto& collidingAmf = proxAmf.PushDebug("Colliding Objects"); + int i = 1; for (const auto& colliding : entity->GetCurrentlyCollidingObjects()) { - collidingAmf.PushDebug(std::to_string(colliding)); + collidingAmf.PushDebug(std::to_string(i++), "LWOOBJID") = std::to_string(colliding); } } diff --git a/dGame/dComponents/QuickBuildComponent.cpp b/dGame/dComponents/QuickBuildComponent.cpp index 52b2ddee..e9a1512f 100644 --- a/dGame/dComponents/QuickBuildComponent.cpp +++ b/dGame/dComponents/QuickBuildComponent.cpp @@ -576,25 +576,25 @@ bool QuickBuildComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInf auto& quickbuild = reportInfo.info->PushDebug("Quick Build"); quickbuild.PushDebug("State") = StringifiedEnum::ToString(m_State).data(); quickbuild.PushDebug("Timer") = m_Timer; - quickbuild.PushDebug("TimerIncomplete") = m_TimerIncomplete; - quickbuild.PushDebug("ActivatorPosition").PushDebug(m_ActivatorPosition); - quickbuild.PushDebug("ActivatorId") = std::to_string(m_ActivatorId); - quickbuild.PushDebug("ShowResetEffect") = m_ShowResetEffect; + quickbuild.PushDebug("Timer Incomplete") = m_TimerIncomplete; + quickbuild.PushDebug("Activator Position").PushDebug(m_ActivatorPosition); + quickbuild.PushDebug("Activator ID", "LWOOBJID") = std::to_string(m_ActivatorId); + quickbuild.PushDebug("Show Reset Effect") = m_ShowResetEffect; quickbuild.PushDebug("Taken") = m_Taken; - quickbuild.PushDebug("ResetTime") = m_ResetTime; - quickbuild.PushDebug("CompleteTime") = m_CompleteTime; - quickbuild.PushDebug("TakeImagination") = m_TakeImagination; + quickbuild.PushDebug("Reset Time") = m_ResetTime; + quickbuild.PushDebug("Complete Time") = m_CompleteTime; + quickbuild.PushDebug("Take Imagination") = m_TakeImagination; quickbuild.PushDebug("Interruptible") = m_Interruptible; - quickbuild.PushDebug("SelfActivator") = m_SelfActivator; - auto& modules = quickbuild.PushDebug("CustomModules"); + quickbuild.PushDebug("Self Activator") = m_SelfActivator; + auto& modules = quickbuild.PushDebug("Custom Modules"); for (const auto cmodule : m_CustomModules) modules.PushDebug("Module") = cmodule; - quickbuild.PushDebug("ActivityId") = m_ActivityId; - quickbuild.PushDebug("PostImaginationCost") = m_PostImaginationCost; - quickbuild.PushDebug("TimeBeforeSmash") = m_TimeBeforeSmash; - quickbuild.PushDebug("TimeBeforeDrain") = m_TimeBeforeDrain; - quickbuild.PushDebug("DrainedImagination") = m_DrainedImagination; - quickbuild.PushDebug("RepositionPlayer") = m_RepositionPlayer; - quickbuild.PushDebug("SoftTimer") = m_SoftTimer; - quickbuild.PushDebug("Builder") = std::to_string(m_Builder); + quickbuild.PushDebug("Activity Id") = m_ActivityId; + quickbuild.PushDebug("Post Imagination Cost") = m_PostImaginationCost; + quickbuild.PushDebug("Time Before Smash") = m_TimeBeforeSmash; + quickbuild.PushDebug("Time Before Drain") = m_TimeBeforeDrain; + quickbuild.PushDebug("Drained Imagination") = m_DrainedImagination; + quickbuild.PushDebug("Reposition Player") = m_RepositionPlayer; + quickbuild.PushDebug("Soft Timer") = m_SoftTimer; + quickbuild.PushDebug("Builder", "LWOOBJID") = std::to_string(m_Builder); return true; } diff --git a/dGame/dComponents/SimplePhysicsComponent.cpp b/dGame/dComponents/SimplePhysicsComponent.cpp index dcb87021..cb888459 100644 --- a/dGame/dComponents/SimplePhysicsComponent.cpp +++ b/dGame/dComponents/SimplePhysicsComponent.cpp @@ -79,14 +79,8 @@ void SimplePhysicsComponent::SetPhysicsMotionState(uint32_t value) { bool SimplePhysicsComponent::OnGetObjectReportInfo(GameMessages::GetObjectReportInfo& reportInfo) { PhysicsComponent::OnGetObjectReportInfo(reportInfo); auto& info = reportInfo.subCategory->PushDebug("Simple Physics Info"); - auto& velocity = info.PushDebug("Velocity"); - velocity.PushDebug("x") = m_Velocity.x; - velocity.PushDebug("y") = m_Velocity.y; - velocity.PushDebug("z") = m_Velocity.z; - auto& angularVelocity = info.PushDebug("Angular Velocity"); - angularVelocity.PushDebug("x") = m_AngularVelocity.x; - angularVelocity.PushDebug("y") = m_AngularVelocity.y; - angularVelocity.PushDebug("z") = m_AngularVelocity.z; + info.PushDebug("Velocity").PushDebug(m_Velocity); + info.PushDebug("Angular Velocity").PushDebug(m_AngularVelocity); info.PushDebug("Physics Motion State") = m_PhysicsMotionState; info.PushDebug("Climbable Type") = StringifiedEnum::ToString(m_ClimbableType).data(); return true;