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

feat(loot): smashables use the level's smashable_loot_matrix

Browse Source 
A level object's smashable_loot_matrix replaces the DestructibleComponent
LootMatrixIndex when smashable_loot_matrix_set is true or absent and the
matrix is not -1, as the client resolves it
(LWODestroyableComponent::LoadConfigData 0x00c44cb0). DLU only read the
key in BaseInteractDropLootServer, so tagged smashables dropped their
template's loot. Resolution in DestroyableComponent::GetLevelLootMatrix,
with tests. No wire change.

In game: smash level smashables that carry smashable_loot_matrix_set=1
(11 level objects in the 1.10.64 levels) and ones with a matrix but no _set key; they drop the
level's loot instead of the template's. Ordinary smashables
(smashable_loot_matrix_set=0) drop what they did before.

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

30
tests/dGameTests/dComponentsTests/DestroyableLevelConfigTests.cpp
View File

@@ -44,3 +44,33 @@ TEST_F(DestroyableLevelConfigTests, OverrideFactionFalseIgnoresSetFaction) {
entity->SetVar<bool>(u"override_faction", false);
EXPECT_FALSE(DestroyableComponent::GetLevelFactions(*entity));
}
TEST_F(DestroyableLevelConfigTests, NoLootMatrixKeysKeepTheTemplateLootMatrix) {
EXPECT_FALSE(DestroyableComponent::GetLevelLootMatrix(*entity));
entity->SetVar<bool>(u"smashable_loot_matrix_set", true);
EXPECT_FALSE(DestroyableComponent::GetLevelLootMatrix(*entity));
}
TEST_F(DestroyableLevelConfigTests, LootMatrixWithoutTheSetKeyIsUsed) {
entity->SetVar<int32_t>(u"smashable_loot_matrix", 748);
EXPECT_EQ(DestroyableComponent::GetLevelLootMatrix(*entity), 748);
}
TEST_F(DestroyableLevelConfigTests, LootMatrixWithTheSetKeyTrueIsUsed) {
entity->SetVar<int32_t>(u"smashable_loot_matrix", 352);
entity->SetVar<bool>(u"smashable_loot_matrix_set", true);
EXPECT_EQ(DestroyableComponent::GetLevelLootMatrix(*entity), 352);
}
TEST_F(DestroyableLevelConfigTests, LootMatrixWithTheSetKeyFalseIsIgnored) {
entity->SetVar<int32_t>(u"smashable_loot_matrix", 227);
entity->SetVar<bool>(u"smashable_loot_matrix_set", false);
EXPECT_FALSE(DestroyableComponent::GetLevelLootMatrix(*entity));
}
TEST_F(DestroyableLevelConfigTests, LootMatrixMinusOneIsIgnored) {
entity->SetVar<int32_t>(u"smashable_loot_matrix", -1);
EXPECT_FALSE(DestroyableComponent::GetLevelLootMatrix(*entity));
entity->SetVar<bool>(u"smashable_loot_matrix_set", true);
EXPECT_FALSE(DestroyableComponent::GetLevelLootMatrix(*entity));
}