More work on shared tasks

zone/client.h

@@ -234,6 +234,7 @@ struct PendingSharedTask {
 	int id;
 	int task_master_id;
 	Timer timeout;		// so if we take a very long time to get messages back from world, we time out and fail
+	std::vector<std::string> members; // members ahh I guess if verification takes a long time raid could change?
 	PendingSharedTask() : id(0), task_master_id(0) {}
 };
 
@@ -1035,6 +1036,7 @@ public:
 	inline bool IsTaskEnabled(int TaskID) { return (taskstate ? taskstate->IsTaskEnabled(TaskID) : false); }
 	inline void ProcessTaskProximities(float X, float Y, float Z) { if(taskstate) taskstate->ProcessTaskProximities(this, X, Y, Z); }
 	inline void AssignTask(int TaskID, int NPCID, bool enforce_level_requirement = false) { if (taskstate) taskstate->AcceptNewTask(this, TaskID, NPCID, enforce_level_requirement); }
+	inline void AssignSharedTask(int TaskID, int NPCID, int id) { if (taskstate) taskstate->AcceptNewSharedTask(this, TaskID, NPCID, id); }
 	inline int ActiveSpeakTask(int NPCID) { if(taskstate) return taskstate->ActiveSpeakTask(NPCID); else return 0; }
 	inline int ActiveSpeakActivity(int NPCID, int TaskID) { if(taskstate) return taskstate->ActiveSpeakActivity(NPCID, TaskID); else return 0; }
 	inline void FailTask(int TaskID) { if(taskstate) taskstate->FailTask(this, TaskID); }
@@ -1054,10 +1056,12 @@ public:
 	inline int GetTaskLockoutExpire(int id) { return 0; } // stub
 
 	inline void SetPendingTask(int id, int task_master_id) { pending_task.id = id; pending_task.task_master_id = task_master_id; }
-	inline bool HasPendingTask() const { return pending_task.id == 0; }
+	inline bool HasPendingTask() const { return pending_task.id != 0; }
 	inline int GetPendingTaskID() const { return pending_task.id; }
 	inline int GetPendingTaskMasterID() const { return pending_task.task_master_id; }
 	inline void StartPendingTimer() { pending_task.timeout.Start(PENDING_TASK_TIMEOUT); }
+	inline void ResetPendingTask() { pending_task.id = 0; pending_task.task_master_id = 0; pending_task.timeout.Disable(); pending_task.members.clear(); }
+	inline void PendingTaskAddMember(const char *name) { pending_task.members.push_back(name); }
 
 	inline const EQEmu::versions::ClientVersion ClientVersion() const { return m_ClientVersion; }
 	inline const uint32 ClientVersionBit() const { return m_ClientVersionBit; }

zone/client_process.cpp

@@ -161,8 +161,7 @@ bool Client::Process() {
 
 		if (pending_task.timeout.Check(false)) {
 			Message(13, "Shared task timed out.");
-			pending_task.id = 0;
-			pending_task.task_master_id = 0;
+			ResetPendingTask();
 		}
 
 		if (linkdead_timer.Check()) {

zone/tasks.cpp

@@ -3444,6 +3444,11 @@ void ClientTaskState::PendSharedTask(Client *c, int TaskID, int NPCID, bool enfo
 	bool task_failed = false;
 	if (group) {
 		for (int i = 0; i < MAX_GROUP_MEMBERS; ++i) {
+			if (group->members[i] == c)
+				continue;
+
+			c->PendingTaskAddMember(group->membername[i]);
+
 			if (group->members[i] && group->members[i]->IsClient()) {
 				auto *client = group->members[i]->CastToClient();
 				auto *task_state = client->GetTaskState();
@@ -3476,6 +3481,11 @@ void ClientTaskState::PendSharedTask(Client *c, int TaskID, int NPCID, bool enfo
 		}
 	} else if (raid) {
 		for (int i = 0; i < MAX_RAID_MEMBERS; ++i) {
+			if (raid->members[i].member == c)
+				continue;
+
+			c->PendingTaskAddMember(raid->members[i].membername);
+
 			if (raid->members[i].member) {
 				auto *client = raid->members[i].member;
 				auto *task_state = client->GetTaskState();
@@ -3527,6 +3537,11 @@ void ClientTaskState::PendSharedTask(Client *c, int TaskID, int NPCID, bool enfo
 	delete pack;
 }
 
+void ClientTaskState::AcceptNewSharedTask(Client *c, int TaskID, int NPCID, int id)
+{
+
+}
+
 void ClientTaskState::ProcessTaskProximities(Client *c, float X, float Y, float Z) {
 
 	float LastX = c->ProximityX();

zone/tasks.h

@@ -265,7 +265,7 @@ public:
 	int GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID);
 	int GetTaskStartTime(TaskType type, int index);
 	void AcceptNewTask(Client *c, int TaskID, int NPCID, bool enforce_level_requirement = false);
-//	void AcceptNewSharedTask(Client *c, int TaskID, int NPCID, bool enforce_level_requirement = false);
+	void AcceptNewSharedTask(Client *c, int TaskID, int NPCID, int id);
 	void PendSharedTask(Client *c, int TaskID, int NPCID, bool enforce_level_requirement = false);
 	void FailTask(Client *c, int TaskID);
 	int TaskTimeLeft(int TaskID);

zone/worldserver.cpp

@@ -1936,6 +1936,44 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
+	case ServerOP_TaskGrant:
+	{
+		int id = pack->ReadUInt32();
+		char name[64] = { 0 };
+		pack->ReadString(name);
+		auto client = entity_list.GetClientByName(name);
+		if (client && client->HasPendingTask()) // if they don't have it, ignore it I guess :P
+			client->AssignSharedTask(client->GetPendingTaskID(), client->GetPendingTaskMasterID(), id);
+		break;
+	}
+	case ServerOP_TaskReject:
+	{
+		int message = pack->ReadUInt32();
+		char name[64] = { 0 };
+		pack->ReadString(name);
+		auto client = entity_list.GetClientByName(name);
+		if (client && client->HasPendingTask()) {
+			client->ResetPendingTask();
+			if (message == 0)
+				client->Message(13, "Shared task assignment has failed.");
+			else if (message > 0)
+				client->Message_StringID(13, message);
+			// negative nothing I guess
+		}
+		break;
+	}
+	case ServerOP_TaskRequest:
+	{
+		int id = pack->ReadUInt32(); // we need the ID when reply to world so we know which shared task we're going to
+		int task_id = pack->ReadUInt32();
+		char name[64] = { 0 };
+		pack->ReadString(name);
+		auto client = entity_list.GetClientByName(name);
+		if (client) {
+			// do check
+		}
+		break;
+	}
 	default: {
 		std::cout << " Unknown ZSopcode:" << (int)pack->opcode;
 		std::cout << " size:" << pack->size << std::endl;