Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ldf logic

Browse Source
This commit is contained in:
David Markowitz 2024-05-21 04:06:55 -07:00
parent 82507e642a
commit bfeb10c972
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dGame/dComponents/PropertyManagementComponent.cpp
View File

@ -154,7 +154,7 @@ void PropertyManagementComponent::SetPrivacyOption(PropertyPrivacyOption value)
Database::Get()->UpdatePropertyModerationInfo(info); Database::Get()->UpdatePropertyModerationInfo(info);
} }
void PropertyManagementComponent::UpdatePropertyDetails(const UpdatePropertyWithFilterCheck& update) { void PropertyManagementComponent::UpdatePropertyDetails(UpdatePropertyWithFilterCheck& update) {
if (owner == LWOOBJID_EMPTY) return; if (owner == LWOOBJID_EMPTY) return;
if (update.isProperty) { if (update.isProperty) {
@ -174,8 +174,19 @@ void PropertyManagementComponent::UpdatePropertyDetails(const UpdatePropertyWith
auto* entity = Game::entityManager->GetEntity(update.worldId); auto* entity = Game::entityManager->GetEntity(update.worldId);
if (!entity) return; if (!entity) return;
if (update.name.empty()) {
update.name = "Objects_" + std::to_string(entity->GetLOT()) + "_name";
entity->EraseVar(u"userModelName");
} else {
entity->SetVar<std::string>(u"userModelName", update.name); entity->SetVar<std::string>(u"userModelName", update.name);
}
if (update.description.empty()) {
entity->EraseVar(u"userModelDesc");
} else {
entity->SetVar<std::string>(u"userModelDesc", update.description); entity->SetVar<std::string>(u"userModelDesc", update.description);
}
auto* owner = GetOwner(); auto* owner = GetOwner();
if (!owner) return; if (!owner) return;
@ -373,11 +384,14 @@ void PropertyManagementComponent::UpdateModelPosition(const LWOOBJID id, const N
auto* spawner = Game::zoneManager->GetSpawner(spawnerId); auto* spawner = Game::zoneManager->GetSpawner(spawnerId);
// If empty, insert the default config data since it doesn't exist yet
if (info.nodes[0]->config.empty()) {
info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0)); info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"userModelID", info.spawnerID)); info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"userModelID", info.spawnerID));
info.nodes[0]->config.push_back(new LDFData<int>(u"modelType", 2)); info.nodes[0]->config.push_back(new LDFData<int>(u"modelType", 2));
info.nodes[0]->config.push_back(new LDFData<bool>(u"propertyObjectID", true)); info.nodes[0]->config.push_back(new LDFData<bool>(u"propertyObjectID", true));
info.nodes[0]->config.push_back(new LDFData<int>(u"componentWhitelist", 1)); info.nodes[0]->config.push_back(new LDFData<int>(u"componentWhitelist", 1));
}
auto* model = spawner->Spawn(); auto* model = spawner->Spawn();
@ -457,7 +471,7 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
std::vector<LDFBaseData*> settings; std::vector<LDFBaseData*> settings;
//fill our settings with BBB gurbage //fill our settings with BBB gurbage
LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", model->GetVar<LWOOBJID>(u"blueprintid")); LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintID", model->GetVar<LWOOBJID>(u"blueprintID"));
LDFBaseData* userModelDesc = new LDFData<std::u16string>(u"userModelDesc", u"A cool model you made!"); LDFBaseData* userModelDesc = new LDFData<std::u16string>(u"userModelDesc", u"A cool model you made!");
LDFBaseData* userModelHasBhvr = new LDFData<bool>(u"userModelHasBhvr", false); LDFBaseData* userModelHasBhvr = new LDFData<bool>(u"userModelHasBhvr", false);
LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", model->GetVar<LWOOBJID>(u"userModelID")); LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", model->GetVar<LWOOBJID>(u"userModelID"));
@ -601,19 +615,16 @@ void PropertyManagementComponent::Load() {
GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER); GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER);
GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT); GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
settings.push_back(new LDFData<LWOOBJID>(u"blueprintid", blueprintID)); settings.push_back(new LDFData<LWOOBJID>(u"blueprintID", blueprintID));
settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
settings.push_back(new LDFData<int>(u"modelType", 2));
settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
settings.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
} else { } else {
settings.push_back(new LDFData<int>(u"modelType", 2));
settings.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
settings.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0)); settings.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
} }
settings.push_back(new LDFData<int>(u"modelType", 2));
settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
settings.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
node->config = settings; node->config = settings;
const auto spawnerId = Game::zoneManager->MakeSpawner(info); const auto spawnerId = Game::zoneManager->MakeSpawner(info);

2
dGame/dComponents/PropertyManagementComponent.h
View File

@ -102,7 +102,7 @@ public:
* @param name the name to set for the property * @param name the name to set for the property
* @param description the description to set for the property * @param description the description to set for the property
*/ */
void UpdatePropertyDetails(const UpdatePropertyWithFilterCheck& update); void UpdatePropertyDetails(UpdatePropertyWithFilterCheck& update);
/** /**
* Makes this property owned by the passed player ID, storing it in the database * Makes this property owned by the passed player ID, storing it in the database

3
dGame/dGameMessages/GameMessages.cpp
View File

@ -2235,7 +2235,6 @@ void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream&
} }
filterCheck.name = GeneralUtils::UTF16ToWTF8(name); filterCheck.name = GeneralUtils::UTF16ToWTF8(name);
LOG("names %s desc %s", filterCheck.name.c_str(), filterCheck.description.c_str()); LOG("names %s desc %s", filterCheck.name.c_str(), filterCheck.description.c_str());
if (filterCheck.name.empty() || filterCheck.description.empty()) return;
PropertyManagementComponent::Instance()->UpdatePropertyDetails(filterCheck); PropertyManagementComponent::Instance()->UpdatePropertyDetails(filterCheck);
} }
@ -2666,7 +2665,7 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream& inStream, Entity* ent
info.spawnerID = entity->GetObjectID(); info.spawnerID = entity->GetObjectID();
info.spawnerNodeID = 0; info.spawnerNodeID = 0;
info.settings.push_back(new LDFData<LWOOBJID>(u"blueprintid", blueprintID)); info.settings.push_back(new LDFData<LWOOBJID>(u"blueprintID", blueprintID));
info.settings.push_back(new LDFData<int>(u"componentWhitelist", 1)); info.settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
info.settings.push_back(new LDFData<int>(u"modelType", 2)); info.settings.push_back(new LDFData<int>(u"modelType", 2));
info.settings.push_back(new LDFData<bool>(u"propertyObjectID", true)); info.settings.push_back(new LDFData<bool>(u"propertyObjectID", true));