mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-10 23:03:44 +00:00
feat(skills): save running skill cooldown groups (charxml <skil sc>)
The client reads the cooldowns still running from the charxml on load
(LWOSkillComponent::LoadFromSaveData 0x00c2a9c0): <skil sc="..."> split
on ';' and ':' (the delimiter string at 0x015b1714 is L";:") into a
cooldown group and the seconds left, each put in its cooldown map under
{hasCooldownGroup = 1, group}, the key it checks when the player casts a
skill of that group (0x00c11400). Live wrote <skil/> with nothing running
and e.g. <skil sc="17:15.6958;"/> otherwise (226 live charxmls; groups
8, 17 and 78 seen, the times below the groups' SkillBehavior cooldowns).
The claude-client-re-docs page described sc as "id;time" pairs; the
live saves and the delimiters show "group:time;".
DLU wrote no <skil>, so relogging or changing zones cleared every
cooldown (e.g. the 90 s imagination and faction skills).
- A player's successful cast (CastPlayerSkill) starts its
SkillBehavior.cooldowngroup's cooldown (groups 0 and up, cooldown > 0),
counted down in Update.
- Saved as live wrote it; loaded back when the player's SkillComponent
is created, so a cooldown survives several zone changes. Old saves
without <skil> load with none running.
Check in game: use a skill with a long cooldown (e.g. a faction kit's
special skill, a consumable with a cooldown), change zones or log out and
back in right away: its cooldown is still shown and counts down from
where it was (minus the loading time on the server).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -8,6 +8,9 @@
|
||||
#include "Entity.h"
|
||||
#include "GameMessages.h"
|
||||
#include "MissionComponent.h"
|
||||
#include "SkillComponent.h"
|
||||
#include "CDSkillBehaviorTable.h"
|
||||
#include "CDClientManager.h"
|
||||
#include "eMissionLockState.h"
|
||||
|
||||
#include "tinyxml2.h"
|
||||
@@ -109,3 +112,54 @@ TEST_F(CharacterSaveFieldsTests, TooltipFlagsMissingInOldSave) {
|
||||
characterComponent->UpdateXml(doc);
|
||||
EXPECT_STREQ(doc.FirstChildElement("obj")->FirstChildElement("char")->Attribute("ttip"), "0");
|
||||
}
|
||||
|
||||
// <skil sc>: the cooldown groups still running and the seconds left, as live wrote them (sc="17:15.6958;") and the
|
||||
// client reads them (split on ';' and ':').
|
||||
TEST_F(CharacterSaveFieldsTests, SkillCooldownsRoundTrip) {
|
||||
CDSkillBehavior skill{};
|
||||
skill.skillID = 394;
|
||||
skill.cooldowngroup = 17;
|
||||
skill.cooldown = 30.0f;
|
||||
CDClientManager::GetEntriesMutable<CDSkillBehaviorTable>()[394] = skill;
|
||||
CDSkillBehavior ungrouped{};
|
||||
ungrouped.skillID = 395;
|
||||
ungrouped.cooldowngroup = static_cast<uint32_t>(-1);
|
||||
ungrouped.cooldown = 30.0f;
|
||||
CDClientManager::GetEntriesMutable<CDSkillBehaviorTable>()[395] = ungrouped;
|
||||
|
||||
tinyxml2::XMLDocument doc;
|
||||
Parse(doc, R"(<obj v="1"><skil sc="8:26.6559;78:30.7363;"/></obj>)");
|
||||
|
||||
Entity player(26, info);
|
||||
auto* const skills = player.AddComponent<SkillComponent>(-1);
|
||||
skills->LoadFromXml(doc);
|
||||
ASSERT_EQ(skills->GetCooldownGroups().size(), 2u);
|
||||
EXPECT_FLOAT_EQ(skills->GetCooldownGroups().at(8), 26.6559f);
|
||||
|
||||
skills->Update(26.7f); // group 8 runs out
|
||||
skills->StartCooldown(394);
|
||||
skills->StartCooldown(395); // no group: not saved
|
||||
skills->UpdateXml(doc);
|
||||
EXPECT_EQ(Print(doc), R"(<obj v="1"><skil sc="17:30;78:4.0363;"/></obj>)");
|
||||
|
||||
Entity reloaded(27, info);
|
||||
auto* const reloadedSkills = reloaded.AddComponent<SkillComponent>(-1);
|
||||
reloadedSkills->LoadFromXml(doc);
|
||||
EXPECT_EQ(reloadedSkills->GetCooldownGroups().size(), 2u);
|
||||
EXPECT_FLOAT_EQ(reloadedSkills->GetCooldownGroups().at(17), 30.0f);
|
||||
|
||||
CDClientManager::GetEntriesMutable<CDSkillBehaviorTable>().clear();
|
||||
}
|
||||
|
||||
// Saves without <skil> load with no cooldowns and gain <skil/>, as live wrote it with none running.
|
||||
TEST_F(CharacterSaveFieldsTests, SkillCooldownsMissingInOldSave) {
|
||||
tinyxml2::XMLDocument doc;
|
||||
Parse(doc, R"(<obj v="1"/>)");
|
||||
|
||||
Entity player(28, info);
|
||||
auto* const skills = player.AddComponent<SkillComponent>(-1);
|
||||
skills->LoadFromXml(doc);
|
||||
EXPECT_TRUE(skills->GetCooldownGroups().empty());
|
||||
skills->UpdateXml(doc);
|
||||
EXPECT_EQ(Print(doc), R"(<obj v="1"><skil/></obj>)");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user