Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocinando mi propia caca
Some checks are pending
CI / build-windows (push) Blocked by required conditions
Details
CI / build-linux (push) Blocked by required conditions
Details
CI / check-clang-format (push) Waiting to run
Details

Browse Source
This commit is contained in:
simio 2025-03-29 07:33:41 -03:00
parent 0f277791f2
commit 9840e05605
2 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/area_data.h
View File

@ -41,6 +41,9 @@ class AreaData : public QObject
Q_OBJECT
public:
int m_autopair[2] = {-1, -1};
int m_lastWitChar = -1;
/**
* @brief Constructor for the AreaData class.
*

52
src/packet/packet_ms.cpp
View File

@ -285,6 +285,7 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
QString l_other_emote = "0";
QString l_other_offset = "0";
QString l_other_flip = "0";
if (client.m_pairing_with != -1) {
for (int l_client_id : area->joinedIDs()) {
AOClient *l_client = client.getServer()->getClientByID(l_client_id);
if (l_client->m_pairing_with == client.m_char_id && l_other_charid != client.m_char_id && l_client->m_char_id == client.m_pairing_with && l_client->m_pos == client.m_pos) {
@ -295,16 +296,67 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
l_pairing = true;
}
}
}
if (!l_pairing) {
if (client.m_pos == "wit" && area->status() != AreaData::Status::CASING) {
int pair_index = -1;
for (int i = 0; i < 2; ++i) {
if (area->m_autopair[i] == client.m_char_id) {
pair_index = i;
}
}
if (pair_index == -1) {
int not_last_spoke_pair_index = 1;
for (int i = 0; i < 2; ++i) {
if (area->m_autopair[i] != area->m_lastWitChar) {
not_last_spoke_pair_index = i;
}
}
area->m_autopair[not_last_spoke_pair_index] = client.m_char_id;
pair_index = not_last_spoke_pair_index;
}
l_other_charid = area->m_autopair[pair_index == 0 ? 1 : 0];
bool client_found = false;
for (int l_client_id : area->joinedIDs()) {
if(l_client_id == client.clientId()){
continue;
}
AOClient *l_client = client.getServer()->getClientByID(l_client_id);
if (l_client->m_char_id == l_other_charid) {
l_other_name = l_client->m_current_iniswap;
l_other_emote = l_client->m_emote;
l_other_flip = l_client->m_flipping;
client.m_offset = pair_index == 0 ? "-25&0" : "25&0";
if(l_client->m_offset == "0&0" || l_client->m_offset == "") l_other_offset = pair_index == 0 ? "25&0" : "-25&0";
else l_other_offset = l_client->m_offset;
l_front_back = l_front_back == "" ? "^0" : l_front_back;
client_found = true;
}
}
if (!client_found){
l_other_charid = -1;
l_front_back = "";
area->m_autopair[1] = client.m_char_id;
client.m_offset = l_incoming_args[17].toString();
}
area->m_lastWitChar = client.m_char_id;
}
}else {
l_other_charid = -1;
l_front_back = "";
client.m_offset = l_incoming_args[17].toString();
}
l_args.append(QString::number(l_other_charid) + l_front_back);
l_args.append(l_other_name);
l_args.append(l_other_emote);
// self offset
if (l_incoming_args[17].toString() != "0&0" && client.m_offset != "0&0") {
client.m_offset = l_incoming_args[17].toString();
}
// versions 2.6-2.8 cannot validate y-offset so we send them just the x-offset
if ((client.m_version.release == 2) && (client.m_version.major == 6 || client.m_version.major == 7 || client.m_version.major == 8)) {
QString l_x_offset = client.m_offset.split("&")[0];