pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 12:18:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Truncate expedition members to max on creation

Browse Source 
This implements the new behavior from live's September 16, 2020
(test server's September 8, 2020) patch

Expeditions can be created even when the client's group or raid
exceeds the expedition's max player requirement. Members are added
until the max player count is reached and the rest are ignored.

Raid members are added ordered by their raid group number with
ungrouped members having the lowest priority

Rename expedition request method ValidateMembers to CanMembersJoin

Change some expedition messages to System color (live changes)
This commit is contained in:
hg
2020-09-08 23:44:26 -04:00
parent a597753bee
commit 1d24432e47
6 changed files with 72 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/expedition.cpp
+10 -4
View File
@@ -40,6 +40,8 @@ const char* const EXPEDITION_OTHER_BELONGS = "{} attempted to create an expedi
const char* const DZADD_INVITE_WARNING = "Warning! You will be given replay timers for the following events if you enter %s:";
const char* const DZADD_INVITE_WARNING_TIMER = "%s - %sD:%sH:%sM";
const char* const KICKPLAYERS_EVERYONE = "Everyone";
// message string 8312 added in September 08 2020 Test patch (used by both dz and shared tasks)
const char* const CREATE_NOT_ALL_ADDED = "Not all players in your {} were added to the {}. The {} can take a maximum of {} players, and your {} has {}.";
const int32_t Expedition::REPLAY_TIMER_ID = -1;
const int32_t Expedition::EVENT_TIMER_ID = 1;
@@ -130,10 +132,14 @@ Expedition* Expedition::TryCreate(
inserted.first->second->SendUpdatesToZoneMembers();
inserted.first->second->SendWorldExpeditionUpdate(ServerOP_ExpeditionCreate); // cache in other zones
inserted.first->second->SendLeaderMessage(request.GetLeaderClient(),
Chat::System, EXPEDITION_AVAILABLE, { request.GetExpeditionName() });
inserted.first->second->SendLeaderMessage(
request.GetLeaderClient(), Chat::Yellow, EXPEDITION_AVAILABLE, { request.GetExpeditionName() }
);
if (!request.GetNotAllAddedMessage().empty())
{
Client::SendCrossZoneMessage(request.GetLeaderClient(), request.GetLeaderName(),
Chat::System, request.GetNotAllAddedMessage());
}
return inserted.first->second.get();
}
@@ -889,7 +895,7 @@ bool Expedition::ConfirmLeaderCommand(Client* requester)
if (leader.char_id != requester->CharacterID())
{
requester->MessageString(Chat::Red, EXPEDITION_NOT_LEADER, leader.name.c_str());
requester->MessageString(Chat::System, EXPEDITION_NOT_LEADER, leader.name.c_str());
return false;
}