pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +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
6 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/expedition.cpp
+16 -10
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;
}