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

Send area messages when testimony is advanced (#340)

Browse Source 
* Send area messages when testimony is advanced

* improve clarity
This commit is contained in:
in1tiate 2024-02-20 23:05:23 -06:00 committed by GitHub
parent 686b871b90
commit d74dadd808
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/packet/packet_ms.cpp
View File

@ -363,12 +363,16 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
} }
// Testimony playback // Testimony playback
QString client_name = client.m_ooc_name;
if (client_name == "") {
client_name = client.m_current_char; // fallback in case of empty ooc name
}
if (area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING || area->testimonyRecording() == AreaData::TestimonyRecording::ADD) { if (area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING || area->testimonyRecording() == AreaData::TestimonyRecording::ADD) {
if (l_args[5] != "wit") if (l_args[5] != "wit")
return PacketFactory::createPacket("MS", l_args); return PacketFactory::createPacket("MS", l_args);
if (area->statement() == -1) { if (area->statement() == -1) {
l_args[4] = "~~\\n-- " + l_args[4] + " --"; l_args[4] = "~~-- " + l_args[4] + " --";
l_args[14] = "3"; l_args[14] = "3";
client.getServer()->broadcast(PacketFactory::createPacket("RT", {"testimony1"}), client.m_current_area); client.getServer()->broadcast(PacketFactory::createPacket("RT", {"testimony1"}), client.m_current_area);
} }
@ -386,6 +390,8 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
l_args = l_statement.first; l_args = l_statement.first;
l_progress = l_statement.second; l_progress = l_statement.second;
client.sendServerMessageArea(client_name + " moved to the next statement.");
if (l_progress == AreaData::TestimonyProgress::LOOPED) { if (l_progress == AreaData::TestimonyProgress::LOOPED) {
client.sendServerMessageArea("Last statement reached. Looping to first statement."); client.sendServerMessageArea("Last statement reached. Looping to first statement.");
} }
@ -396,6 +402,8 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
l_args = l_statement.first; l_args = l_statement.first;
l_progress = l_statement.second; l_progress = l_statement.second;
client.sendServerMessageArea(client_name + " moved to the previous statement.");
if (l_progress == AreaData::TestimonyProgress::STAYED_AT_FIRST) { if (l_progress == AreaData::TestimonyProgress::STAYED_AT_FIRST) {
client.sendServerMessage("First statement reached."); client.sendServerMessage("First statement reached.");
} }
@ -406,10 +414,13 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
QRegularExpressionMatch match = jump.match(l_decoded_message); QRegularExpressionMatch match = jump.match(l_decoded_message);
if (match.hasMatch()) { if (match.hasMatch()) {
client.m_pos = "wit"; client.m_pos = "wit";
auto l_statement = area->jumpToStatement(match.captured("int").toInt()); int jump_idx = match.captured("int").toInt();
auto l_statement = area->jumpToStatement(jump_idx);
l_args = l_statement.first; l_args = l_statement.first;
l_progress = l_statement.second; l_progress = l_statement.second;
client.sendServerMessageArea(client_name + " jumped to statement number " + QString::number(jump_idx) + ".");
switch (l_progress) { switch (l_progress) {
case AreaData::TestimonyProgress::LOOPED: case AreaData::TestimonyProgress::LOOPED:
{ {