Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-04 03:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: property game messages as structs

Browse Source 
Converts the property messages to NetGameMsgs in PropertyMessages.{h,cpp}.
Sent: OpenPropertyVendor, OpenPropertyManagement, DownloadPropertyData
(replaces PropertyDataMessage, now with the client's PropertyData field
names), PropertyRentalResponse, PropertyEntranceBegin,
PropertySelectQuery (replaces PropertySelectQueryProperty with the
client's PropertyInfo), GetModelsOnProperty, PlaceModelResponse and
HandleUGCEquipPre/PostDeleteBasedOnEditMode. Received, registered in
GameMessageHandler's map: SetPropertyAccess,
UpdatePropertyOrModelForFilterCheck, QueryPropertyData,
PropertyEditorBegin/End, PropertyContentsFromClient,
ZonePropertyModelEquipped/Rotated, PlacePropertyModel,
UpdateModelFromClient, DeleteModelFromClient, ControlBehaviors,
PropertyEntranceSync, EnterProperty1, UpdatePropertyPerformanceCost,
ReportOffensiveModel/Property and GetHotPropertyData. The news screen's
NewsSendHotPropertiesInfoToClient moves here with the top properties
lookup; the dashboard's player reports now take the decoded text.

Handlers keep their logic and hand the work to PropertyManagementComponent,
PropertyVendorComponent, PropertyEntranceComponent and
MultiZoneEntranceComponent as before. Messages whose payload DLU ignored
(PropertyEditorBegin, PropertyContentsFromClient, ZonePropertyModel*)
now read it with the client's layout. The never-called
SendZonePropertyModelEquipped (which wrote no default flags) is gone.

No wire change and no change in recipients. Verified byte for byte
against a frozen verbatim copy of the old functions, PropertyDataMessage
and PropertySelectQueryProperty over an input grid (to one client and
broadcast), received messages compared with the old handlers' read
sequences with every truncated payload rejected, hand computed golden
bytes, round trips and a mutation check. Layouts confirmed against the
1.10.64 client in Ghidra. Known wire bug kept as is: PlaceModelResponse
writes response where the client reads a rotation quaternion
(PlaceModelResponse::Deserialize 0x00dc0170).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 19:12:17 -05:00
parent 795c937bbb
commit 1e4df609b0
21 changed files with 2580 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
dGame/dComponents/PropertyEntranceComponent.cpp
View File

@@ -6,7 +6,7 @@
#include "Database.h"
#include "GameMessages.h"
#include "PropertyManagementComponent.h"
#include "PropertySelectQueryProperty.h"
#include "PropertyMessages.h"
#include "RocketLaunchpadControlComponent.h"
#include "CharacterComponent.h"
#include "UserManager.h"
@@ -34,7 +34,9 @@ void PropertyEntranceComponent::OnUse(Entity* entity) {
auto* rocket = entity->GetComponent<CharacterComponent>()->RocketEquip(entity);
if (!rocket) return;
GameMessages::SendPropertyEntranceBegin(m_Parent->GetObjectID(), entity->GetSystemAddress());
GameMessages::PropertyEntranceBegin msg;
msg.target = m_Parent->GetObjectID();
msg.Send(entity->GetSystemAddress());
AMFArrayValue args;
@@ -62,7 +64,7 @@ void PropertyEntranceComponent::OnEnterProperty(Entity* entity, uint32_t index,
if (index >= query.size()) return;
cloneId = query[index].CloneId;
cloneId = query[index].cloneId;
}
auto* launcher = m_Parent->GetComponent<RocketLaunchpadControlComponent>();
@@ -90,34 +92,34 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity, bool incl
// If the player has a property this query will have a single result.
auto& playerEntry = entries.emplace_back();
if (playerProperty.has_value()) {
playerEntry.OwnerName = character->GetName();
playerEntry.IsBestFriend = true;
playerEntry.IsFriend = true;
playerEntry.IsAlt = true;
playerEntry.IsOwned = true;
playerEntry.CloneId = playerProperty->cloneId;
playerEntry.Name = playerProperty->name;
playerEntry.Description = playerProperty->description;
playerEntry.AccessType = playerProperty->privacyOption;
playerEntry.IsModeratorApproved = playerProperty->modApproved;
playerEntry.DateLastPublished = playerProperty->lastUpdatedTime;
playerEntry.Reputation = playerProperty->reputation;
playerEntry.PerformanceCost = playerProperty->performanceCost;
playerEntry.ownerName = GeneralUtils::UTF8ToUTF16(character->GetName());
playerEntry.isBff = true;
playerEntry.isFriend = true;
playerEntry.isAlt = true;
playerEntry.isOwned = true;
playerEntry.cloneId = playerProperty->cloneId;
playerEntry.name = GeneralUtils::UTF8ToUTF16(playerProperty->name);
playerEntry.description = GeneralUtils::UTF8ToUTF16(playerProperty->description);
playerEntry.accessType = playerProperty->privacyOption;
playerEntry.isModApproved = playerProperty->modApproved;
playerEntry.dateLastPublished = playerProperty->lastUpdatedTime;
playerEntry.reputation = playerProperty->reputation;
playerEntry.performanceCost = playerProperty->performanceCost;
auto& entry = playerEntry;
} else {
playerEntry.OwnerName = character->GetName();
playerEntry.IsBestFriend = true;
playerEntry.IsFriend = true;
playerEntry.IsAlt = false;
playerEntry.IsOwned = false;
playerEntry.CloneId = character->GetPropertyCloneID();
playerEntry.Name = "";
playerEntry.Description = "";
playerEntry.AccessType = 0;
playerEntry.IsModeratorApproved = false;
playerEntry.DateLastPublished = 0;
playerEntry.Reputation = 0;
playerEntry.PerformanceCost = 0.0f;
playerEntry.ownerName = GeneralUtils::UTF8ToUTF16(character->GetName());
playerEntry.isBff = true;
playerEntry.isFriend = true;
playerEntry.isAlt = false;
playerEntry.isOwned = false;
playerEntry.cloneId = character->GetPropertyCloneID();
playerEntry.name = u"";
playerEntry.description = u"";
playerEntry.accessType = 0;
playerEntry.isModApproved = false;
playerEntry.dateLastPublished = 0;
playerEntry.reputation = 0;
playerEntry.performanceCost = 0.0f;
}
IProperty::PropertyLookup propertyLookup;
@@ -140,39 +142,47 @@ void PropertyEntranceComponent::OnPropertyEntranceSync(Entity* entity, bool incl
}
auto& entry = entries.emplace_back();
entry.IsOwned = entry.CloneId == otherCharacter->cloneId;
entry.OwnerName = otherCharacter->name;
entry.CloneId = propertyEntry.cloneId;
entry.Name = propertyEntry.name;
entry.Description = propertyEntry.description;
entry.AccessType = propertyEntry.privacyOption;
entry.IsModeratorApproved = propertyEntry.modApproved;
entry.DateLastPublished = propertyEntry.lastUpdatedTime;
entry.Reputation = propertyEntry.reputation;
entry.PerformanceCost = propertyEntry.performanceCost;
entry.IsBestFriend = false;
entry.IsFriend = false;
entry.isOwned = entry.cloneId == otherCharacter->cloneId;
entry.ownerName = GeneralUtils::UTF8ToUTF16(otherCharacter->name);
entry.cloneId = propertyEntry.cloneId;
entry.name = GeneralUtils::UTF8ToUTF16(propertyEntry.name);
entry.description = GeneralUtils::UTF8ToUTF16(propertyEntry.description);
entry.accessType = propertyEntry.privacyOption;
entry.isModApproved = propertyEntry.modApproved;
entry.dateLastPublished = propertyEntry.lastUpdatedTime;
entry.reputation = propertyEntry.reputation;
entry.performanceCost = propertyEntry.performanceCost;
entry.isBff = false;
entry.isFriend = false;
// Query to get friend and best friend fields
const auto friendCheck = Database::Get()->GetBestFriendStatus(character->GetID(), owner);
// If we got a result than the two players are friends.
if (friendCheck.has_value()) {
entry.IsFriend = true;
entry.IsBestFriend = friendCheck->bestFriendStatus == 3;
entry.isFriend = true;
entry.isBff = friendCheck->bestFriendStatus == 3;
}
if (!entry.IsModeratorApproved && entity->GetGMLevel() >= eGameMasterLevel::LEAD_MODERATOR) {
entry.Name = "[AWAITING APPROVAL]";
entry.Description = "[AWAITING APPROVAL]";
entry.IsModeratorApproved = true;
if (!entry.isModApproved && entity->GetGMLevel() >= eGameMasterLevel::LEAD_MODERATOR) {
entry.name = u"[AWAITING APPROVAL]";
entry.description = u"[AWAITING APPROVAL]";
entry.isModApproved = true;
}
// Query to determine whether this property is an alt character of the entity.
for (const auto charid : Database::Get()->GetAccountCharacterIds(user->GetAccountID())) {
entry.IsAlt = charid == owner;
if (entry.IsAlt) break;
entry.isAlt = charid == owner;
if (entry.isAlt) break;
}
}
// Query here is to figure out whether or not to display the button to go to the next page or not.
GameMessages::SendPropertySelectQuery(m_Parent->GetObjectID(), startIndex, lookupResult.totalEntriesMatchingQuery - (startIndex + numResults) > 0, character->GetPropertyCloneID(), false, true, entries, sysAddr);
GameMessages::PropertySelectQuery query;
query.target = m_Parent->GetObjectID();
query.navOffset = startIndex;
query.thereAreMore = lookupResult.totalEntriesMatchingQuery - (startIndex + numResults) > 0;
query.cloneId = character->GetPropertyCloneID();
query.hasFeaturedProperty = false;
query.wasFriends = true;
query.properties = entries;
query.Send(sysAddr);
}