pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Tasks] Zone Version Matching (#2303)

Browse Source
This commit is contained in:
Chris Miles 2022-07-14 02:57:23 -05:00 committed by GitHub
parent ddb5794462
commit ffe4d528e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/repositories/base/base_task_activities_repository.h
View File

@ -34,6 +34,7 @@ public:
int goalcount; int goalcount;
int delivertonpc; int delivertonpc;
std::string zones; std::string zones;
int zone_version;
int optional; int optional;
}; };
@ -60,6 +61,7 @@ public:
"goalcount", "goalcount",
"delivertonpc", "delivertonpc",
"zones", "zones",
"zone_version",
"optional", "optional",
}; };
} }
@ -82,6 +84,7 @@ public:
"goalcount", "goalcount",
"delivertonpc", "delivertonpc",
"zones", "zones",
"zone_version",
"optional", "optional",
}; };
} }
@ -138,6 +141,7 @@ public:
entry.goalcount = 1; entry.goalcount = 1;
entry.delivertonpc = 0; entry.delivertonpc = 0;
entry.zones = ""; entry.zones = "";
entry.zone_version = -1;
entry.optional = 0; entry.optional = 0;
return entry; return entry;
@ -189,7 +193,8 @@ public:
entry.goalcount = atoi(row[12]); entry.goalcount = atoi(row[12]);
entry.delivertonpc = atoi(row[13]); entry.delivertonpc = atoi(row[13]);
entry.zones = row[14] ? row[14] : ""; entry.zones = row[14] ? row[14] : "";
entry.optional = atoi(row[15]); entry.zone_version = atoi(row[15]);
entry.optional = atoi(row[16]);
return entry; return entry;
} }
@ -238,7 +243,8 @@ public:
update_values.push_back(columns[12] + " = " + std::to_string(task_activities_entry.goalcount)); update_values.push_back(columns[12] + " = " + std::to_string(task_activities_entry.goalcount));
update_values.push_back(columns[13] + " = " + std::to_string(task_activities_entry.delivertonpc)); update_values.push_back(columns[13] + " = " + std::to_string(task_activities_entry.delivertonpc));
update_values.push_back(columns[14] + " = '" + Strings::Escape(task_activities_entry.zones) + "'"); update_values.push_back(columns[14] + " = '" + Strings::Escape(task_activities_entry.zones) + "'");
update_values.push_back(columns[15] + " = " + std::to_string(task_activities_entry.optional)); update_values.push_back(columns[15] + " = " + std::to_string(task_activities_entry.zone_version));
update_values.push_back(columns[16] + " = " + std::to_string(task_activities_entry.optional));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -275,6 +281,7 @@ public:
insert_values.push_back(std::to_string(task_activities_entry.goalcount)); insert_values.push_back(std::to_string(task_activities_entry.goalcount));
insert_values.push_back(std::to_string(task_activities_entry.delivertonpc)); insert_values.push_back(std::to_string(task_activities_entry.delivertonpc));
insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'"); insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'");
insert_values.push_back(std::to_string(task_activities_entry.zone_version));
insert_values.push_back(std::to_string(task_activities_entry.optional)); insert_values.push_back(std::to_string(task_activities_entry.optional));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
@ -320,6 +327,7 @@ public:
insert_values.push_back(std::to_string(task_activities_entry.goalcount)); insert_values.push_back(std::to_string(task_activities_entry.goalcount));
insert_values.push_back(std::to_string(task_activities_entry.delivertonpc)); insert_values.push_back(std::to_string(task_activities_entry.delivertonpc));
insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'"); insert_values.push_back("'" + Strings::Escape(task_activities_entry.zones) + "'");
insert_values.push_back(std::to_string(task_activities_entry.zone_version));
insert_values.push_back(std::to_string(task_activities_entry.optional)); insert_values.push_back(std::to_string(task_activities_entry.optional));
insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")"); insert_chunks.push_back("(" + Strings::Implode(",", insert_values) + ")");
@ -369,7 +377,8 @@ public:
entry.goalcount = atoi(row[12]); entry.goalcount = atoi(row[12]);
entry.delivertonpc = atoi(row[13]); entry.delivertonpc = atoi(row[13]);
entry.zones = row[14] ? row[14] : ""; entry.zones = row[14] ? row[14] : "";
entry.optional = atoi(row[15]); entry.zone_version = atoi(row[15]);
entry.optional = atoi(row[16]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -409,7 +418,8 @@ public:
entry.goalcount = atoi(row[12]); entry.goalcount = atoi(row[12]);
entry.delivertonpc = atoi(row[13]); entry.delivertonpc = atoi(row[13]);
entry.zones = row[14] ? row[14] : ""; entry.zones = row[14] ? row[14] : "";
entry.optional = atoi(row[15]); entry.zone_version = atoi(row[15]);
entry.optional = atoi(row[16]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }

7
common/tasks.h
View File

@ -67,14 +67,17 @@ struct ActivityInformation {
int deliver_to_npc; int deliver_to_npc;
std::vector<int> zone_ids; std::vector<int> zone_ids;
std::string zones; // IDs ; separated, ZoneID is the first in this list for older clients -- default empty string, max length 64 std::string zones; // IDs ; separated, ZoneID is the first in this list for older clients -- default empty string, max length 64
int zone_version;
bool optional; bool optional;
inline bool CheckZone(int zone_id) inline bool CheckZone(int zone_id, int version)
{ {
if (zone_ids.empty()) { if (zone_ids.empty()) {
return true; return true;
} }
return std::find(zone_ids.begin(), zone_ids.end(), zone_id) != zone_ids.end(); bool found_zone = std::find(zone_ids.begin(), zone_ids.end(), zone_id) != zone_ids.end();
return found_zone && (zone_version == version || zone_version == -1);
} }
void SerializeSelector(SerializeBuffer& out, EQ::versions::ClientVersion client_version) const void SerializeSelector(SerializeBuffer& out, EQ::versions::ClientVersion client_version) const

1
utils/sql/db_update_manifest.txt
View File

@ -440,6 +440,7 @@
9184|2022_05_21_schema_consistency.sql|SELECT * FROM db_version WHERE version >= 9184|empty| 9184|2022_05_21_schema_consistency.sql|SELECT * FROM db_version WHERE version >= 9184|empty|
9185|2022_05_07_discord_webhooks.sql|SHOW TABLES LIKE 'discord_webhooks'|empty| 9185|2022_05_07_discord_webhooks.sql|SHOW TABLES LIKE 'discord_webhooks'|empty|
9186|2022_07_09_zone_expansion_deprecate.sql|SHOW COLUMNS FROM 'zone' LIKE 'expansion'|notempty| 9186|2022_07_09_zone_expansion_deprecate.sql|SHOW COLUMNS FROM 'zone' LIKE 'expansion'|notempty|
9187|2022_07_09_task_zone_version_matching.sql|SHOW COLUMNS FROM `task_activities` LIKE 'zone_version'|empty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

1
utils/sql/git/required/2022_07_09_task_zone_version_matching.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `task_activities` ADD COLUMN `zone_version` int(11) default -1 AFTER zones;

18
zone/task_client_state.cpp
View File

@ -621,7 +621,7 @@ bool ClientTaskState::UpdateTasksByNPC(Client *client, TaskActivityType activity
continue; continue;
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
LogTasks( LogTasks(
"[UPDATE] character [{}] task_id [{}] activity_id [{}] activity_type [{}] for NPC [{}] failed zone check", "[UPDATE] character [{}] task_id [{}] activity_id [{}] activity_type [{}] for NPC [{}] failed zone check",
client->GetName(), client->GetName(),
@ -699,7 +699,7 @@ int ClientTaskState::ActiveSpeakTask(int npc_type_id)
continue; continue;
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
continue; continue;
} }
// Is the activity_information to speak with this type of NPC ? // Is the activity_information to speak with this type of NPC ?
@ -748,7 +748,7 @@ int ClientTaskState::ActiveSpeakActivity(int npc_type_id, int task_id)
continue; continue;
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
continue; continue;
} }
@ -809,7 +809,7 @@ void ClientTaskState::UpdateTasksForItem(Client *client, TaskActivityType activi
continue; continue;
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
LogTasks( LogTasks(
"[UpdateTasksForItem] Error: Character [{}] activity_information type [{}] for Item [{}] failed zone check", "[UpdateTasksForItem] Error: Character [{}] activity_information type [{}] for Item [{}] failed zone check",
client->GetName(), client->GetName(),
@ -881,7 +881,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *client, int explore_id)
if (activity_info->activity_type != TaskActivityType::Explore) { if (activity_info->activity_type != TaskActivityType::Explore) {
continue; continue;
} }
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
LogTasks( LogTasks(
"[UpdateTasksOnExplore] character [{}] explore_id [{}] failed zone check", "[UpdateTasksOnExplore] character [{}] explore_id [{}] failed zone check",
client->GetName(), client->GetName(),
@ -977,7 +977,7 @@ bool ClientTaskState::UpdateTasksOnDeliver(
continue; continue;
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
Log( Log(
Logs::General, Logs::Tasks, Logs::General, Logs::Tasks,
"[UPDATE] Char: %s Deliver activity_information failed zone check (current zone %i, need zone " "[UPDATE] Char: %s Deliver activity_information failed zone check (current zone %i, need zone "
@ -1039,7 +1039,7 @@ bool ClientTaskState::UpdateTasksOnDeliver(
return is_updated; return is_updated;
} }
void ClientTaskState::UpdateTasksOnTouch(Client *client, int zone_id) void ClientTaskState::UpdateTasksOnTouch(Client *client, int zone_id, uint16 version)
{ {
// If the client has no tasks, there is nothing further to check. // If the client has no tasks, there is nothing further to check.
@ -1077,7 +1077,7 @@ void ClientTaskState::UpdateTasksOnTouch(Client *client, int zone_id)
if (activity_info->goal_method != METHODSINGLEID) { if (activity_info->goal_method != METHODSINGLEID) {
continue; continue;
} }
if (!activity_info->CheckZone(zone_id)) { if (!activity_info->CheckZone(zone_id, version)) {
LogTasks( LogTasks(
"[UpdateTasksOnTouch] character [{}] Touch activity_information failed zone check", "[UpdateTasksOnTouch] character [{}] Touch activity_information failed zone check",
client->GetName() client->GetName()
@ -1929,7 +1929,7 @@ void ClientTaskState::TaskPeriodicChecks(Client *client)
// the zone before we send the 'Task activity_information Completed' message. // the zone before we send the 'Task activity_information Completed' message.
// //
if (!m_checked_touch_activities) { if (!m_checked_touch_activities) {
UpdateTasksOnTouch(client, zone->GetZoneID()); UpdateTasksOnTouch(client, zone->GetZoneID(), zone->GetInstanceVersion());
m_checked_touch_activities = true; m_checked_touch_activities = true;
} }
} }

2
zone/task_client_state.h
View File

@ -38,7 +38,7 @@ public:
void UpdateTasksOnExplore(Client *client, int explore_id); void UpdateTasksOnExplore(Client *client, int explore_id);
bool UpdateTasksOnSpeakWith(Client *client, int npc_type_id); bool UpdateTasksOnSpeakWith(Client *client, int npc_type_id);
bool UpdateTasksOnDeliver(Client *client, std::list<EQ::ItemInstance *> &items, int cash, int npc_type_id); bool UpdateTasksOnDeliver(Client *client, std::list<EQ::ItemInstance *> &items, int cash, int npc_type_id);
void UpdateTasksOnTouch(Client *client, int zone_id); void UpdateTasksOnTouch(Client *client, int zone_id, uint16 version);
void ProcessTaskProximities(Client *client, float x, float y, float z); void ProcessTaskProximities(Client *client, float x, float y, float z);
bool TaskOutOfTime(TaskType task_type, int index); bool TaskOutOfTime(TaskType task_type, int index);
void TaskPeriodicChecks(Client *client); void TaskPeriodicChecks(Client *client);

3
zone/task_manager.cpp
View File

@ -236,6 +236,7 @@ bool TaskManager::LoadTasks(int single_task)
activity_data->goal_match_list = task_activity.goal_match_list; activity_data->goal_match_list = task_activity.goal_match_list;
activity_data->goal_count = task_activity.goalcount; activity_data->goal_count = task_activity.goalcount;
activity_data->deliver_to_npc = task_activity.delivertonpc; activity_data->deliver_to_npc = task_activity.delivertonpc;
activity_data->zone_version = task_activity.zone_version;
// zones // zones
activity_data->zones = task_activity.zones; activity_data->zones = task_activity.zones;
@ -1853,7 +1854,7 @@ void TaskManager::HandleUpdateTasksOnKill(Client *client, uint32 npc_type_id, st
} }
// Is there a zone restriction on the activity_information ? // Is there a zone restriction on the activity_information ?
if (!activity_info->CheckZone(zone->GetZoneID())) { if (!activity_info->CheckZone(zone->GetZoneID(), zone->GetInstanceVersion())) {
LogTasks( LogTasks(
"[HandleUpdateTasksOnKill] character [{}] task_id [{}] activity_id [{}] activity_type [{}] for NPC [{}] failed zone check", "[HandleUpdateTasksOnKill] character [{}] task_id [{}] activity_id [{}] activity_type [{}] for NPC [{}] failed zone check",
client->GetName(), client->GetName(),