pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-05 08:23:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Dynamic Zones] Store min and max players on dz (#1355)

Browse Source 
This starts some changes that move storage of things from expeditions to
dynamic zone class so other systems can possibly use them. This will also
make it easier to move window packet creation methods to DynamicZone.

For now these will remain on the expeditions table in the database. This
can be re-evaluated once other components are moved and seeing how other
systems may want to handle their player requirements.
This commit is contained in:
hg 2021-05-12 20:59:48 -04:00 committed by GitHub
parent 4cc24dea75
commit c1c2d7b302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/dynamic_zone_base.h
View File

@ -61,6 +61,8 @@ public:
uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
uint32_t GetID() const { return m_id; }
uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); }
uint32_t GetMaxPlayers() const { return m_max_players; }
uint32_t GetMinPlayers() const { return m_min_players; }
uint32_t GetSecondsRemaining() const;
uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); }
uint32_t GetZoneIndex() const { return (m_instance_id << 16) | (m_zone_id & 0xffff); }
@ -86,6 +88,8 @@ public:
void SetCompass(const DynamicZoneLocation& location, bool update_db = false);
void SetCompass(uint32_t zone_id, float x, float y, float z, bool update_db = false);
void SetLeaderName(const std::string& leader_name) { m_leader_name = leader_name; }
void SetMaxPlayers(uint32_t max_players) { m_max_players = max_players; }
void SetMinPlayers(uint32_t min_players) { m_min_players = min_players; }
void SetName(const std::string& name) { m_name = name; }
void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
void SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db = false);
@ -113,6 +117,8 @@ protected:
uint32_t m_zone_id = 0;
uint32_t m_instance_id = 0;
uint32_t m_zone_version = 0;
uint32_t m_min_players = 0;
uint32_t m_max_players = 0;
bool m_never_expires = false;
bool m_has_zonein = false;
std::string m_name;

9
common/expedition_base.cpp
View File

@ -3,15 +3,12 @@
#include "rulesys.h"
ExpeditionBase::ExpeditionBase(uint32_t id, const std::string& uuid,
const std::string& expedition_name, const DynamicZoneMember& leader,
uint32_t min_players, uint32_t max_players
const std::string& expedition_name, const DynamicZoneMember& leader
) :
m_id(id),
m_uuid(uuid),
m_expedition_name(expedition_name),
m_leader(leader),
m_min_players(min_players),
m_max_players(max_players)
m_leader(leader)
{
}
@ -20,8 +17,6 @@ void ExpeditionBase::LoadRepositoryResult(ExpeditionsRepository::ExpeditionWithL
m_id = entry.id;
m_uuid = std::move(entry.uuid);
m_expedition_name = std::move(entry.expedition_name);
m_min_players = entry.min_players;
m_max_players = entry.max_players;
m_add_replay_on_join = entry.add_replay_on_join;
m_is_locked = entry.is_locked;
m_leader.id = entry.leader_id;

6
common/expedition_base.h
View File

@ -19,8 +19,6 @@ public:
uint32_t GetID() const { return m_id; }
uint32_t GetLeaderID() const { return m_leader.id; }
uint32_t GetMinPlayers() const { return m_min_players; }
uint32_t GetMaxPlayers() const { return m_max_players; }
uint32_t GetMemberCount() const { return static_cast<uint32_t>(m_members.size()); }
const std::string& GetName() const { return m_expedition_name; }
const std::string& GetLeaderName() const { return m_leader.name; }
@ -41,14 +39,12 @@ public:
protected:
ExpeditionBase() = default;
ExpeditionBase(uint32_t id, const std::string& uuid, const std::string& expedition_name,
const DynamicZoneMember& leader, uint32_t min_players, uint32_t max_players);
const DynamicZoneMember& leader);
DynamicZoneMember GetMemberData(uint32_t character_id);
DynamicZoneMember GetMemberData(const std::string& character_name);
uint32_t m_id = 0;
uint32_t m_min_players = 0;
uint32_t m_max_players = 0;
bool m_is_locked = false;
bool m_add_replay_on_join = true;
std::string m_uuid;

4
world/expedition_state.cpp
View File

@ -110,6 +110,10 @@ void ExpeditionState::CacheExpeditions(
}
}
// stored on expedition in db but on dz in memory cache
expedition->GetDynamicZone().SetMinPlayers(entry.min_players);
expedition->GetDynamicZone().SetMaxPlayers(entry.max_players);
expedition->CacheMemberStatuses();
m_expeditions.emplace_back(std::move(expedition));

26
zone/expedition.cpp
View File

@ -50,8 +50,8 @@ const int32_t Expedition::EVENT_TIMER_ID = 1;
Expedition::Expedition(
uint32_t id, const std::string& uuid, DynamicZone&& dz, const std::string& expedition_name,
const DynamicZoneMember& leader, uint32_t min_players, uint32_t max_players
) : ExpeditionBase(id, uuid, expedition_name, leader, min_players, max_players)
const DynamicZoneMember& leader
) : ExpeditionBase(id, uuid, expedition_name, leader)
{
SetDynamicZone(std::move(dz));
}
@ -80,6 +80,9 @@ Expedition* Expedition::TryCreate(
return nullptr;
}
dynamiczone.SetMinPlayers(request.GetMinPlayers());
dynamiczone.SetMaxPlayers(request.GetMaxPlayers());
auto dynamic_zone_id = dynamiczone.Create();
if (dynamic_zone_id == 0)
{
@ -109,9 +112,7 @@ Expedition* Expedition::TryCreate(
expedition_uuid,
std::move(dynamiczone),
request.GetExpeditionName(),
DynamicZoneMember{ request.GetLeaderID(), request.GetLeaderName() },
request.GetMinPlayers(),
request.GetMaxPlayers()
DynamicZoneMember{ request.GetLeaderID(), request.GetLeaderName() }
);
LogExpeditions(
@ -120,8 +121,8 @@ Expedition* Expedition::TryCreate(
expedition->GetName(),
expedition->GetDynamicZone().GetInstanceID(),
expedition->GetLeaderName(),
expedition->GetMinPlayers(),
expedition->GetMaxPlayers()
expedition->GetDynamicZone().GetMinPlayers(),
expedition->GetDynamicZone().GetMaxPlayers()
);
expedition->SaveMembers(request);
@ -207,6 +208,10 @@ void Expedition::CacheExpeditions(
}
}
// stored on expedition in db but on dz in memory cache
expedition->GetDynamicZone().SetMinPlayers(entry.min_players);
expedition->GetDynamicZone().SetMaxPlayers(entry.max_players);
expedition->SendWorldExpeditionUpdate(ServerOP_ExpeditionGetMemberStatuses);
auto inserted = zone->expedition_cache.emplace(entry.id, std::move(expedition));
@ -673,9 +678,10 @@ bool Expedition::ProcessAddConflicts(Client* leader_client, Client* add_client,
{
has_conflict = true;
}
else if (member_count >= m_max_players)
else if (member_count >= GetDynamicZone().GetMaxPlayers())
{
SendLeaderMessage(leader_client, Chat::Red, DZADD_EXCEED_MAX, { fmt::format_int(m_max_players).str() });
SendLeaderMessage(leader_client, Chat::Red, DZADD_EXCEED_MAX, {
fmt::format_int(GetDynamicZone().GetMaxPlayers()).str() });
has_conflict = true;
}
}
@ -1323,7 +1329,7 @@ std::unique_ptr<EQApplicationPacket> Expedition::CreateInfoPacket(bool clear)
info->assigned = true;
strn0cpy(info->dz_name, m_expedition_name.c_str(), sizeof(info->dz_name));
strn0cpy(info->leader_name, m_leader.name.c_str(), sizeof(info->leader_name));
info->max_players = m_max_players;
info->max_players = GetDynamicZone().GetMaxPlayers();
}
return outapp;
}

2
zone/expedition.h
View File

@ -52,7 +52,7 @@ class Expedition : public ExpeditionBase
public:
Expedition() = default;
Expedition(uint32_t id, const std::string& uuid, DynamicZone&& dz, const std::string& expedition_name,
const DynamicZoneMember& leader, uint32_t min_players, uint32_t max_players);
const DynamicZoneMember& leader);
static Expedition* TryCreate(Client* requester, DynamicZone& dynamiczone, ExpeditionRequest& request);