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

feat(stats): coins, bricks and smashes counted by the server as live did

Browse Source 
The passport totals for coins, bricks and enemies came from the client's
ModifyPlayerZoneStatistic, which live's client sent for its per-zone counts;
live's server counted the totals itself and told the client
(UpdatePlayerStatistic). Now:

- CurrencyCollected (the amount gained) right after every SetCurrency that
  raised the coins (pickups, missions, achievements, selling, activities);
  none for losses. Captures: 15,815 pickups + mission/achievement/vendor/
  activity gains, all with the stat; no loss had one.
- BricksCollected (the count) after every add to the bricks inventory the
  client is told about (captures: 999 of 1,010, pickups and relocations).
- The kill counts go to the killer right after Die, before the loot:
  EnemiesSmashed when the DestructibleComponent's isnpc is set, else
  SmashablesSmashed for a smashable (captures: 2,766 NPC kills and 538
  smashables; faction or AI don't decide it, e.g. the Banana Cluster has AI
  and counted as a smashable). Neither while racing. Before, every kill was
  a SmashablesSmashed.
- ModifyPlayerZoneStatistic from the client only updates the zone counts,
  so nothing is counted twice.

Check in game: pick up coins, sell an item, finish a mission, pick up
bricks, smash a stromling and a crate; each passport number goes up by the
right amount at once and stays the same after relogging (no double counts).
The per-zone statistics still go up.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 02:17:48 -05:00
parent 752f079100
commit 1f29e9604a
9 changed files with 107 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tests/dGameTests/PlayerStatisticTests.cpp
View File

@@ -5,6 +5,8 @@
#include "CharacterComponent.h"
#include "Entity.h"
#include "PlayerMessages.h"
#include "DestroyableComponent.h"
#include "CDClientDatabase.h"
#include "dGameMessagesTests/GameMessageTestUtils.h"
// Live sent UpdatePlayerStatistic (1481) server -> client for the statistics the server counted (docs/CaptureUnknowns.md).
@@ -109,3 +111,66 @@ TEST_F(PlayerStatisticTest, MetersTraveledGoOutInBatches) {
ASSERT_EQ(statistics.size(), 1);
EXPECT_EQ(statistics[0].updateValue, 0);
}
TEST_F(PlayerStatisticTest, BricksAddedAreCollected) {
auto statistics = Statistics(Capture([&] { characterComponent->TrackItemsAdded(eInventoryType::BRICKS, 3); }));
ASSERT_EQ(statistics.size(), 1);
EXPECT_EQ(statistics[0].updateID, static_cast<int32_t>(BricksCollected));
EXPECT_EQ(statistics[0].updateValue, 3);
EXPECT_TRUE(Statistics(Capture([&] { characterComponent->TrackItemsAdded(eInventoryType::ITEMS, 1); })).empty());
}
TEST_F(PlayerStatisticTest, ZoneStatisticsFromTheClientLeaveThePassportTotalsAlone) {
// The client reports these per zone; the totals come from what the server sent (not counted twice)
characterComponent->HandleZoneStatisticsUpdate(1100, u"CoinsCollected", 10);
characterComponent->HandleZoneStatisticsUpdate(1100, u"BricksCollected", 2);
characterComponent->HandleZoneStatisticsUpdate(1100, u"EnemiesSmashed", 1);
EXPECT_EQ(characterComponent->StatisticsToString().substr(0, 10), "0;0;0;0;0;");
}
// Live: Die, then (to the killer) EnemiesSmashed for an NPC or SmashablesSmashed for another smashable, then the loot
TEST_F(PlayerStatisticTest, SmashingCountsEnemiesAndSmashables) {
// Smash finds the killer through the entity manager, which looks the new entity up in the CDClient
CDClientDatabase::Connect(":memory:");
CDClientDatabase::ExecuteDML("CREATE TABLE ComponentsRegistry (id INTEGER, component_type INTEGER, component_id INTEGER);");
ASSERT_NE(Game::entityManager->CreateEntity(info, nullptr, nullptr, true, 0x3FFFFFFFFFFELL), nullptr); // the zone control object loot asks
auto* killer = Game::entityManager->CreateEntity(info, nullptr, nullptr, false, PLAYER + 1);
ASSERT_NE(killer, nullptr);
auto* killerCharacter = killer->AddComponent<CharacterComponent>(-1, character.get(), ClientAddress());
killerCharacter->InitializeStatisticsFromString("");
LWOOBJID victimID = 0x3FFF000000000001LL;
const auto smash = [&](bool npc, bool smashable) {
auto* victim = Game::entityManager->CreateEntity(info, nullptr, nullptr, false, victimID++);
auto* destroyable = victim->AddComponent<DestroyableComponent>(-1);
destroyable->SetMaxHealth(10.0f);
destroyable->SetHealth(10);
destroyable->SetIsNPC(npc);
destroyable->SetIsSmashable(smashable);
return Capture([&] { destroyable->Smash(killer->GetObjectID()); });
};
for (const auto& [npc, smashable, expected] : { std::tuple{ true, true, EnemiesSmashed }, std::tuple{ false, true, SmashablesSmashed } }) {
const auto packets = smash(npc, smashable);
size_t die = packets.size(), statistic = packets.size();
for (size_t i = 0; i < packets.size(); i++) {
RakNet::BitStream bitStream(const_cast<uint8_t*>(packets[i].bytes.data()), packets[i].bytes.size(), false);
LWOOBJID target{};
MessageType::Game msgId{};
if (!GameMessages::NetGameMsg::ReadPacketHeader(bitStream, target, msgId)) continue;
if (msgId == MessageType::Game::DIE && die == packets.size()) die = i;
if (msgId == MessageType::Game::UPDATE_PLAYER_STATISTIC) statistic = i;
}
ASSERT_LT(die, packets.size());
ASSERT_LT(statistic, packets.size());
EXPECT_LT(die, statistic);
const auto statistics = Statistics({ packets[statistic] });
ASSERT_EQ(statistics.size(), 1);
EXPECT_EQ(statistics[0].target, killer->GetObjectID());
EXPECT_EQ(statistics[0].updateID, static_cast<int32_t>(expected));
}
// Neither an NPC nor smashable (e.g. a collectible spawner): nothing
EXPECT_TRUE(Statistics(smash(false, false)).empty());
killer->SetCharacter(nullptr);
}