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

Add hints in testimony, add pause alias. (#397)
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 
* Add hints in testimony, add pause alias.

end is most commonly used, provides more clarity that the testimony has "stopped" and further testimony is via /add and /update.

* Fix examine cmd on-going examination check

Previously did not stop users from calling examine mid-examination.

* formating attempt

i am sorry clang-format

* Change "your" to "the".

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>

---------

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>
This commit is contained in:
Wiso 2025-02-05 16:32:09 +02:00 committed by GitHub
parent b1b06cc9f2
commit dc89b713bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/config_sample/command_extensions.ini
View File

@ -89,4 +89,7 @@ aliases = kickother
aliases = jukeboxskip aliases = jukeboxskip
[play_ambience] [play_ambience]
aliases = playambience playa aliases = playambience playa
[pause]
aliases = end

28
src/commands/casing.cpp
View File

@ -113,12 +113,12 @@ void AOClient::cmdTestify(int argc, QStringList argv)
AreaData *l_area = server->getAreaById(areaId()); AreaData *l_area = server->getAreaById(areaId());
if (l_area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING) { if (l_area->testimonyRecording() == AreaData::TestimonyRecording::RECORDING) {
sendServerMessage("Testimony recording is already in progress. Please stop it before starting a new one."); sendServerMessage("Testimony recording is already in progress. Please stop it with /end before starting a new one.");
} }
else { else {
clearTestimony(); clearTestimony();
l_area->setTestimonyRecording(AreaData::TestimonyRecording::RECORDING); l_area->setTestimonyRecording(AreaData::TestimonyRecording::RECORDING);
sendServerMessage("Started testimony recording."); sendServerMessage("Started testimony recording. The next IC message will be a title. Use /end to stop recording.");
} }
} }
@ -129,15 +129,19 @@ void AOClient::cmdExamine(int argc, QStringList argv)
AreaData *l_area = server->getAreaById(areaId()); AreaData *l_area = server->getAreaById(areaId());
if (l_area->testimony().size() - 1 > 0) { if (l_area->testimony().size() - 1 > 0) {
l_area->restartTestimony(); if (l_area->testimonyRecording() == AreaData::TestimonyRecording::PLAYBACK) {
server->broadcast(PacketFactory::createPacket("RT", {"testimony2", "0"}), areaId()); sendServerMessage("An examination is already running. Use /testimony to view the testimony.");
server->broadcast(PacketFactory::createPacket("MS", {l_area->testimony()[0]}), areaId()); }
return; else {
l_area->restartTestimony();
server->broadcast(PacketFactory::createPacket("RT", {"testimony2", "0"}), areaId());
server->broadcast(PacketFactory::createPacket("MS", {l_area->testimony()[0]}), areaId());
return;
}
}
else {
sendServerMessage("Unable to start replay without prior testimony. Use /testify to start Or load a testimony with /loadtestimony.");
} }
if (l_area->testimonyRecording() == AreaData::TestimonyRecording::PLAYBACK)
sendServerMessage("Unable to examine while another examination is running");
else
sendServerMessage("Unable to start replay without prior examination.");
} }
void AOClient::cmdTestimony(int argc, QStringList argv) void AOClient::cmdTestimony(int argc, QStringList argv)
@ -182,7 +186,7 @@ void AOClient::cmdUpdateStatement(int argc, QStringList argv)
Q_UNUSED(argv); Q_UNUSED(argv);
server->getAreaById(areaId())->setTestimonyRecording(AreaData::TestimonyRecording::UPDATE); server->getAreaById(areaId())->setTestimonyRecording(AreaData::TestimonyRecording::UPDATE);
sendServerMessage("The next IC-Message will replace the last displayed replay message."); sendServerMessage("The next IC-Message will replace the currently selected testimony line.");
} }
void AOClient::cmdPauseTestimony(int argc, QStringList argv) void AOClient::cmdPauseTestimony(int argc, QStringList argv)
@ -193,7 +197,7 @@ void AOClient::cmdPauseTestimony(int argc, QStringList argv)
AreaData *l_area = server->getAreaById(areaId()); AreaData *l_area = server->getAreaById(areaId());
l_area->setTestimonyRecording(AreaData::TestimonyRecording::STOPPED); l_area->setTestimonyRecording(AreaData::TestimonyRecording::STOPPED);
server->broadcast(PacketFactory::createPacket("RT", {"testimony1", "1"}), areaId()); server->broadcast(PacketFactory::createPacket("RT", {"testimony1", "1"}), areaId());
sendServerMessage("Testimony has been stopped."); sendServerMessage("Testimony has been stopped. Use /examine to begin cross-examination.");
} }
void AOClient::cmdAddStatement(int argc, QStringList argv) void AOClient::cmdAddStatement(int argc, QStringList argv)