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

fix(factions): override_faction 0 keeps the template's factions

Browse Source 
The client (LWODestroyableComponent::LoadConfigData 0x00c44cb0) uses a
level object's set_faction only when override_faction is absent or true;
with override_faction=0 LoadDataFromTemplate (0x00c9f900) puts the
DestructibleComponent factionList back. 2948 level objects have
override_faction=0, and DLU applied their set_faction anyway. The
resolution is now DestroyableComponent::GetLevelFactions, with tests.
No wire change.

In game: enemies and smashables placed in levels with a set_faction but
override_faction=0 (most smashables, many enemies) are targeted and
aggro as before for the common case; check a few enemies in AG/GF/FV
still fight you and friendly objects are not attacked, and that
smashables still smash and give credit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-28 23:34:22 -05:00
parent 107437e72f
commit 721925add0
5 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dGame/Entity.cpp
View File

@@ -487,21 +487,11 @@ void Entity::Initialize() {
}
}
// Level files can replace the factions with set_faction. The client splits the value on
// both ';' and ' ' and replaces its faction list with the result
// (LWODestroyableComponent::LoadConfigData), and many values have a trailing space ("13:6 ").
const auto setFaction = GetVarAsString(u"set_faction");
std::vector<int32_t> factionsToSet;
for (const auto& semicolonSplit : GeneralUtils::SplitString(setFaction, ';')) {
for (const auto& faction : GeneralUtils::SplitString(semicolonSplit, ' ')) {
const auto factionToAdd = GeneralUtils::TryParse<int32_t>(faction);
if (factionToAdd) factionsToSet.push_back(factionToAdd.value());
}
}
if (!factionsToSet.empty()) {
comp->SetFaction(factionsToSet.front(), true);
for (const auto faction : factionsToSet | std::views::drop(1)) comp->AddFaction(faction, true);
// Level files can replace the factions with set_faction, unless override_faction is 0
const auto levelFactions = DestroyableComponent::GetLevelFactions(*this);
if (levelFactions && !levelFactions->empty()) {
comp->SetFaction(levelFactions->front(), true);
for (const auto faction : *levelFactions | std::views::drop(1)) comp->AddFaction(faction, true);
}
}

16
dGame/dComponents/DestroyableComponent.cpp
View File

@@ -790,6 +790,22 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType
m_Parent->Kill(owner, killType);
}
std::optional<std::vector<int32_t>> DestroyableComponent::GetLevelFactions(const Entity& entity) {
if (!entity.HasVar(u"set_faction")) return std::nullopt;
// override_faction defaults to true when set_faction is there; false keeps the template's factions
if (entity.HasVar(u"override_faction") && !entity.GetVar<bool>(u"override_faction")) return std::nullopt;
// Many values have a trailing space ("6 ")
std::vector<int32_t> factions;
for (const auto& semicolonSplit : GeneralUtils::SplitString(entity.GetVarAsString(u"set_faction"), ';')) {
for (const auto& faction : GeneralUtils::SplitString(semicolonSplit, ' ')) {
const auto factionToAdd = GeneralUtils::TryParse<int32_t>(faction);
if (factionToAdd) factions.push_back(factionToAdd.value());
}
}
return factions;
}
void DestroyableComponent::SetFaction(int32_t factionID, bool ignoreChecks) {
m_FactionIDs.clear();
m_EnemyFactionIDs.clear();

9
dGame/dComponents/DestroyableComponent.h
View File

@@ -2,6 +2,7 @@
#define DESTROYABLECOMPONENT_H
#include "RakNetTypes.h"
#include <optional>
#include <vector>
#include "tinyxml2.h"
#include "Entity.h"
@@ -368,6 +369,14 @@ public:
void SetCurrencyIndex(int32_t currencyIndex) { m_CurrencyIndex = currencyIndex; }
/**
* The factions a level object's set_faction gives it in place of the template's, resolved as the client does
* (LWODestroyableComponent::LoadConfigData 0x00c44cb0, LoadDataFromTemplate 0x00c9f900): set_faction is used
* unless override_faction is present and false. The value is split on ';' and ' '.
* @return the factions, or nullopt when the template's factions stay
*/
static std::optional<std::vector<int32_t>> GetLevelFactions(const Entity& entity);
/**
* Returns the ID of the entity that killed this entity, if any
* @return the ID of the entity that killed this entity, if any

1
tests/dGameTests/dComponentsTests/CMakeLists.txt
View File

@@ -1,6 +1,7 @@
set(DCOMPONENTS_TESTS
"DeletionRestrictionTests.cpp"
"InventorySaveTests.cpp"
"DestroyableLevelConfigTests.cpp"
"VendorBuybackTests.cpp"
"RacingWrongWayTests.cpp"
"DestroyableComponentTests.cpp"

46
tests/dGameTests/dComponentsTests/DestroyableLevelConfigTests.cpp Normal file
View File

@@ -0,0 +1,46 @@
#include "GameDependencies.h"
#include "DestroyableComponent.h"
#include "Entity.h"
#include <gtest/gtest.h>
// How a level object's config changes its DestroyableComponent, as the client's
// LWODestroyableComponent::LoadConfigData (0x00c44cb0) and LoadDataFromTemplate (0x00c9f900) resolve it.
class DestroyableLevelConfigTests : public GameDependenciesTest {
protected:
std::unique_ptr<Entity> entity;
void SetUp() override {
SetUpDependencies();
entity = std::make_unique<Entity>(1, info);
}
void TearDown() override {
entity.reset();
TearDownDependencies();
}
};
TEST_F(DestroyableLevelConfigTests, NoSetFactionKeepsTheTemplateFactions) {
EXPECT_FALSE(DestroyableComponent::GetLevelFactions(*entity));
entity->SetVar<bool>(u"override_faction", true);
EXPECT_FALSE(DestroyableComponent::GetLevelFactions(*entity));
}
TEST_F(DestroyableLevelConfigTests, SetFactionWithoutOverrideFactionIsUsed) {
entity->SetVar<std::string>(u"set_faction", "6 ");
EXPECT_EQ(DestroyableComponent::GetLevelFactions(*entity), std::vector<int32_t>{ 6 });
}
TEST_F(DestroyableLevelConfigTests, SetFactionWithOverrideFactionTrueIsUsed) {
entity->SetVar<std::string>(u"set_faction", "4; 6");
entity->SetVar<bool>(u"override_faction", true);
EXPECT_EQ(DestroyableComponent::GetLevelFactions(*entity), (std::vector<int32_t>{ 4, 6 }));
}
TEST_F(DestroyableLevelConfigTests, OverrideFactionFalseIgnoresSetFaction) {
entity->SetVar<std::string>(u"set_faction", "-1");
entity->SetVar<bool>(u"override_faction", false);
EXPECT_FALSE(DestroyableComponent::GetLevelFactions(*entity));
}