Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-20 03:32:48 +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

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