Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard -> disable modcalls, bugfixes for guard button, etc.

Browse Source
This commit is contained in:
iamgoofball 2019-01-19 14:39:42 -08:00
parent 248444307f
commit c44832a707
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
base/sounds/general/adminhelp.ogg Normal file
View File

Binary file not shown.

2
base/themes/default/courtroom_design.ini
View File

@ -107,7 +107,7 @@ pre = 5, 490, 80, 21
flip = 104, 490, 51, 21 flip = 104, 490, 51, 21
; Guard button ; Guard button
guard = 200, 560, 61, 21 guard = 200, 580, 81, 21
pre_no_interrupt = 200, 490, 80, 21 pre_no_interrupt = 200, 490, 80, 21

2
base/themes/default/courtroom_sounds.ini
View File

@ -3,6 +3,6 @@ witness_testimony = sfx-testimony2.wav
cross_examination = sfx-testimony.wav cross_examination = sfx-testimony.wav
evidence_present = sfx-evidenceshoop.wav evidence_present = sfx-evidenceshoop.wav
word_call = sfx-gaspen-yeah!.wav word_call = sfx-gaspen-yeah!.wav
mod_call = sfx-gallery.wav mod_call = adminhelp.ogg
not_guilty = sfx-notguilty.wav not_guilty = sfx-notguilty.wav
guilty = sfx-guilty.wav guilty = sfx-guilty.wav

15
src/courtroom.cpp
View File

@ -193,7 +193,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_flip->setText("Flip"); ui_flip->setText("Flip");
ui_flip->hide(); ui_flip->hide();
ui_guard = new QCheckBox(this); ui_guard = new QCheckBox(this);
ui_guard->setText("Guard"); ui_guard->setText("Disable Modcalls");
ui_guard->hide(); ui_guard->hide();
ui_casing = new QCheckBox(this); ui_casing = new QCheckBox(this);
ui_casing->setChecked(ao_app->get_casing_enabled()); ui_casing->setChecked(ao_app->get_casing_enabled());
@ -1085,6 +1085,12 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message, QSt
colour = ao_app->get_color("ooc_default_color", "courtroom_design.ini").name(); colour = ao_app->get_color("ooc_default_color", "courtroom_design.ini").name();
if (p_colour == "1") if (p_colour == "1")
colour = ao_app->get_color("ooc_server_color", "courtroom_design.ini").name(); colour = ao_app->get_color("ooc_server_color", "courtroom_design.ini").name();
qDebug() << p_message;
if(p_message == "Logged in as a moderator.")
{
ui_guard->show();
append_server_chatmessage("CLIENT", "You were granted the Disable Modcalls button.", "1");
}
ui_server_chatlog->append_chatmessage(p_name, p_message, colour); ui_server_chatlog->append_chatmessage(p_name, p_message, colour);
} }
@ -2855,7 +2861,7 @@ void Courtroom::toggle_judge_buttons(bool is_on)
void Courtroom::mod_called(QString p_ip) void Courtroom::mod_called(QString p_ip)
{ {
ui_server_chatlog->append(p_ip); ui_server_chatlog->append(p_ip);
if (ui_guard->isChecked()) if (!ui_guard->isChecked())
{ {
modcall_player->play(ao_app->get_sfx("mod_call")); modcall_player->play(ao_app->get_sfx("mod_call"));
ao_app->alert(this); ao_app->alert(this);
@ -2897,11 +2903,6 @@ void Courtroom::on_ooc_return_pressed()
toggle_judge_buttons(false); toggle_judge_buttons(false);
} }
} }
else if (ooc_message.startsWith("/login"))
{
ui_guard->show();
append_server_chatmessage("CLIENT", "You were granted the Guard button.", "1");
}
else if (ooc_message.startsWith("/rainbow") && ao_app->yellow_text_enabled && !rainbow_appended) else if (ooc_message.startsWith("/rainbow") && ao_app->yellow_text_enabled && !rainbow_appended)
{ {
//ui_text_color->addItem("Rainbow"); //ui_text_color->addItem("Rainbow");