mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-18 17:55:27 +00:00
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:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -204,6 +204,7 @@ json ToJson(const GameMessages::ReportBug& m);
|
||||
json ToJson(const GameMessages::VerifyAck& m);
|
||||
json ToJson(const GameMessages::Help& m);
|
||||
json ToJson(const GameMessages::DisplayGuildCreateBox& m);
|
||||
json ToJson(const GameMessages::GetEditorLevel& m);
|
||||
json ToJson(const GameMessages::OpenPropertyVendor& m);
|
||||
json ToJson(const GameMessages::OpenPropertyManagement& m);
|
||||
json ToJson(const GameMessages::DownloadPropertyData& m);
|
||||
@@ -1806,6 +1807,12 @@ json ToJson(const GameMessages::DisplayGuildCreateBox& m) {
|
||||
j["bShow"] = ToJson(m.bShow);
|
||||
return j;
|
||||
}
|
||||
json ToJson(const GameMessages::GetEditorLevel& m) {
|
||||
json j = json::object();
|
||||
j["editorEnabled"] = ToJson(m.editorEnabled);
|
||||
j["editorLevel"] = ToJson(m.editorLevel);
|
||||
return j;
|
||||
}
|
||||
json ToJson(const GameMessages::OpenPropertyVendor& m) {
|
||||
json j = json::object();
|
||||
return j;
|
||||
@@ -2724,6 +2731,7 @@ const std::vector<Entry>& Entries() {
|
||||
{ MessageType::Game::VERIFY_ACK, eDirection::TO_CLIENT, "VerifyAck", &ReadWith<GameMessages::VerifyAck> },
|
||||
{ MessageType::Game::HELP, eDirection::TO_CLIENT, "Help", &ReadWith<GameMessages::Help> },
|
||||
{ MessageType::Game::DISPLAY_GUILD_CREATE_BOX, eDirection::TO_CLIENT, "DisplayGuildCreateBox", &ReadWith<GameMessages::DisplayGuildCreateBox> },
|
||||
{ MessageType::Game::GET_EDITOR_LEVEL, eDirection::TO_SERVER, "GetEditorLevel", &ReadWith<GameMessages::GetEditorLevel> },
|
||||
{ MessageType::Game::OPEN_PROPERTY_VENDOR, eDirection::TO_CLIENT, "OpenPropertyVendor", &ReadWith<GameMessages::OpenPropertyVendor> },
|
||||
{ MessageType::Game::OPEN_PROPERTY_MANAGEMENT, eDirection::TO_CLIENT, "OpenPropertyManagement", &ReadWith<GameMessages::OpenPropertyManagement> },
|
||||
{ MessageType::Game::DOWNLOAD_PROPERTY_DATA, eDirection::TO_CLIENT, "DownloadPropertyData", &ReadWith<GameMessages::DownloadPropertyData> },
|
||||
|
||||
@@ -222,6 +222,7 @@ namespace {
|
||||
{ TOGGLE_GHOST_REFERENCE_OVERRIDE, []() { return std::make_unique<ToggleGhostReferenceOverride>(); } },
|
||||
{ SET_GHOST_REFERENCE_POSITION, []() { return std::make_unique<SetGhostReferencePosition>(); } },
|
||||
{ MODIFY_GHOSTING_DISTANCE, []() { return std::make_unique<ModifyGhostingDistance>(); } },
|
||||
{ GET_EDITOR_LEVEL, []() { return std::make_unique<GetEditorLevel>(); } },
|
||||
};
|
||||
};
|
||||
|
||||
@@ -270,8 +271,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
|
||||
}
|
||||
|
||||
// The Happy Flower editor's messages, logged always until the server handles them (what a client sends while editing)
|
||||
const bool isHappyFlower = messageID == MessageType::Game::GET_EDITOR_LEVEL
|
||||
|| (messageID >= MessageType::Game::HF_ATTRIBUTES_PUSH && messageID <= MessageType::Game::HF_GETS_WANT_PATH);
|
||||
const bool isHappyFlower = messageID >= MessageType::Game::HF_ATTRIBUTES_PUSH && messageID <= MessageType::Game::HF_GETS_WANT_PATH;
|
||||
if (isHappyFlower) LOG("Received unhandled Happy Flower GM: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());
|
||||
else LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#include "PlayerMessages.h"
|
||||
|
||||
#include "PlayerManager.h"
|
||||
|
||||
#include "Logger.h"
|
||||
#include "BitStreamUtils.h"
|
||||
#include "Character.h"
|
||||
@@ -265,4 +267,28 @@ namespace GameMessages {
|
||||
bool DisplayGuildCreateBox::Deserialize(RakNet::BitStream& bitStream) {
|
||||
return bitStream.Read(bShow);
|
||||
}
|
||||
|
||||
void GetEditorLevel::Serialize(RakNet::BitStream& bitStream) const {
|
||||
bitStream.Write(editorEnabled);
|
||||
bitStream.Write(editorLevel);
|
||||
}
|
||||
|
||||
bool GetEditorLevel::Deserialize(RakNet::BitStream& bitStream) {
|
||||
// A question: whatever it carries is not needed to answer it
|
||||
if (bitStream.GetNumberOfUnreadBits() < 33) return true;
|
||||
return bitStream.Read(editorEnabled) && bitStream.Read(editorLevel);
|
||||
}
|
||||
|
||||
void GetEditorLevel::Handle(Entity& entity, const SystemAddress& sysAddr) {
|
||||
// Only about the asker's own character
|
||||
auto* const player = PlayerManager::GetPlayer(sysAddr);
|
||||
if (!player || player != &entity) return;
|
||||
const auto* const character = entity.GetComponent<CharacterComponent>();
|
||||
if (!character) return;
|
||||
GetEditorLevel answer;
|
||||
answer.target = entity.GetObjectID();
|
||||
answer.editorEnabled = character->GetEditorEnabled();
|
||||
answer.editorLevel = character->GetEditorLevel();
|
||||
answer.SendToClient(sysAddr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -193,6 +193,18 @@ namespace GameMessages {
|
||||
|
||||
bool bShow{ true };
|
||||
};
|
||||
|
||||
// Client -> server, and the server's answer to that client: whether the client's level editor is on for the
|
||||
// player and at which level (the character's editor level, 0 for none). What a client sends is not used.
|
||||
struct GetEditorLevel : public NetGameMsg {
|
||||
GetEditorLevel() : NetGameMsg(MessageType::Game::GET_EDITOR_LEVEL) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
bool Deserialize(RakNet::BitStream& bitStream) override;
|
||||
void Handle(Entity& entity, const SystemAddress& sysAddr) override;
|
||||
|
||||
bool editorEnabled{ false };
|
||||
int32_t editorLevel{ 0 };
|
||||
};
|
||||
}
|
||||
|
||||
#endif // PLAYERMESSAGES_H
|
||||
|
||||
Reference in New Issue
Block a user