feat(character): the editor level is the account's GM level, and the client is told it

A character's editor level is its account's GM level for accounts at editor_gm_level
or above, and 0 for everyone else (it was 1 or 0). It is written as the save's edit
attribute, sent with the character after the GM level (the editor flag, then the
level) and given in answer to the GetEditorLevel game message.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 19:11:29 -06:00
parent ca7d166c0b
commit dbe0722095
9 changed files with 139 additions and 35 deletions

View File

@@ -64,8 +64,7 @@ CharacterComponent::CharacterComponent(Entity* parent, const int32_t componentID
m_PvpEnabled = false;
m_GMLevel = character->GetGMLevel();
m_EditorEnabled = false;
m_EditorLevel = m_GMLevel;
RefreshEditorLevel();
m_Reputation = 0;
m_CurrentActivity = eGameActivity::NONE;
@@ -307,6 +306,16 @@ void CharacterComponent::SetPvpEnabled(const bool value) {
m_PvpEnabled = value;
}
void CharacterComponent::RefreshEditorLevel() {
const auto* const parentUser = m_Character ? m_Character->GetParentUser() : nullptr;
const auto accountLevel = parentUser ? parentUser->GetMaxGMLevel() : eGameMasterLevel::CIVILIAN;
const auto editorGmLevel = Game::config ? GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("editor_gm_level")).value_or(DEFAULT_EDITOR_GM_LEVEL) : DEFAULT_EDITOR_GM_LEVEL;
const auto level = static_cast<eGameMasterLevel>(EditAttribute(accountLevel, editorGmLevel));
if (level != m_EditorLevel) m_DirtyGMInfo = true;
m_EditorLevel = level;
m_EditorEnabled = level != eGameMasterLevel::CIVILIAN;
}
void CharacterComponent::SetGMLevel(eGameMasterLevel gmlevel) {
m_DirtyGMInfo = true;
if (gmlevel > eGameMasterLevel::CIVILIAN) m_IsGM = true;
@@ -402,8 +411,6 @@ void CharacterComponent::LoadFromSaveData(const tinyxml2::XMLDocument& doc) {
if (m_GMLevel > eGameMasterLevel::CIVILIAN) {
m_IsGM = true;
m_DirtyGMInfo = true;
m_EditorLevel = m_GMLevel;
m_EditorEnabled = false; //We're not currently in HF if we're loading in
}
LoadGuild();
@@ -481,12 +488,10 @@ void CharacterComponent::WriteSaveData(tinyxml2::XMLDocument& doc) {
// cm, the most coins the character can hold: always 9223372036854775807 on live, the client's own value without
// it. Nothing here caps coins by it, and one that is already in the save is left as it is.
if (!character->FindAttribute("cm")) character->SetAttribute("cm", std::numeric_limits<int64_t>::max());
// edit, the editor level: the client takes anything but 0 as the editor being on. 1 for a character whose account
// has the GM level of editor_gm_level (9 unless set), 0 for everyone else
const auto* const parentUser = m_Character ? m_Character->GetParentUser() : nullptr;
const auto accountLevel = parentUser ? parentUser->GetMaxGMLevel() : eGameMasterLevel::CIVILIAN;
const auto editorGmLevel = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("editor_gm_level")).value_or(DEFAULT_EDITOR_GM_LEVEL);
character->SetAttribute("edit", EditAttribute(accountLevel, editorGmLevel, m_EditorEnabled, m_EditorLevel));
// edit, the editor level: the client takes anything but 0 as the editor being on. The account's GM level for an
// account at editor_gm_level (9 unless set) or above, 0 for everyone else
RefreshEditorLevel();
character->SetAttribute("edit", static_cast<uint32_t>(m_EditorLevel));
// mldt, when the property moderation notice was last shown: not kept here, 0 as on most live saves
if (!character->FindAttribute("mldt")) character->SetAttribute("mldt", 0);
// gid and gn, the guild (0 and empty without one)

View File

@@ -474,30 +474,37 @@ private:
eGameMasterLevel m_GMLevel;
/**
* Whether the character has HF enabled
* Whether the client's level editor is on for the character: its editor level is not 0
*/
bool m_EditorEnabled;
bool m_EditorEnabled{};
public:
// editor_gm_level when the settings don't have it
static constexpr uint32_t DEFAULT_EDITOR_GM_LEVEL = 9;
/**
* The save's edit attribute (the client takes anything but 0 as the editor being on): 1 for an account whose GM
* level is at least editorGmLevel, else the editor level when the editor flag is on, else 0
* A character's editor level, which is also the save's edit attribute (the client takes anything but 0 as the
* editor being on): the account's GM level for an account at editorGmLevel or above, 0 for everyone else
*/
static uint32_t EditAttribute(const eGameMasterLevel accountLevel, const uint32_t editorGmLevel, const bool editorEnabled, const eGameMasterLevel editorLevel) {
static uint32_t EditAttribute(const eGameMasterLevel accountLevel, const uint32_t editorGmLevel) {
// (a civilian never, whatever the setting)
if (accountLevel != eGameMasterLevel::CIVILIAN && static_cast<uint32_t>(accountLevel) >= editorGmLevel) return 1;
return editorEnabled ? static_cast<uint32_t>(editorLevel) : 0;
if (accountLevel == eGameMasterLevel::CIVILIAN || static_cast<uint32_t>(accountLevel) < editorGmLevel) return 0;
return static_cast<uint32_t>(accountLevel);
}
// The editor level as the client is told it (construction, the save, GetEditorLevel): 0 when the editor is off
uint8_t GetEditorLevel() const { return static_cast<uint8_t>(m_EditorLevel); }
bool GetEditorEnabled() const { return m_EditorEnabled; }
// Works the editor level out again from the account's GM level and editor_gm_level
void RefreshEditorLevel();
private:
/**
* The level of the character in HF
* The character's editor level (EditAttribute), 0 for none
*/
eGameMasterLevel m_EditorLevel;
eGameMasterLevel m_EditorLevel{};
/**
* Whether the currently active activity has been changed