Skip to content

deprecate "chat" deskmod #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Salanto merged 4 commits into from
May 14, 2023
Merged

deprecate "chat" deskmod #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dbb1d5
ignore deskmod when zoom speaking
lambdcalculus May 10, 2023
da0b65c
clean up deskmod a bit
lambdcalculus May 11, 2023
ba110c7
actually use the enums i made lol
lambdcalculus May 11, 2023
86b7e3f
fix typo
lambdcalculus May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/courtroom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class Courtroom : public QMainWindow {
void set_pair_list();

// sets desk and bg based on pos in chatmessage
void set_scene(QString f_desk_mod, QString f_side);
void set_scene(bool show_desk, QString f_side);

// sets ui_vp_player_char according to SELF_OFFSET, only a function bc it's used with desk_mod 4 and 5
void set_self_offset(const QString& p_list);
Expand Down
11 changes: 11 additions & 0 deletions include/datatypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,17 @@ enum EMOTE_MOD_TYPE {
PREANIM_ZOOM = 6,
};

enum DESK_MOD_TYPE {
DESK_HIDE = 0,
DESK_SHOW,
DESK_EMOTE_ONLY,
DESK_PRE_ONLY,
DESK_EMOTE_ONLY_EX,
DESK_PRE_ONLY_EX,
//"EX" for "expanded"
//dumb, i know, but throw the first stone if you have a better idea
};

enum MUSIC_EFFECT { FADE_IN = 1, FADE_OUT = 2, SYNC_POS = 4 };

#endif // DATATYPES_H
75 changes: 33 additions & 42 deletions src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,9 +1379,7 @@ void Courtroom::set_background(QString p_background, bool display)
QString f_side = current_side;
if (current_side == "")
f_side = ao_app->get_char_side(current_char);
set_scene(
QString::number(ao_app->get_desk_mod(current_char, current_emote)),
f_side);
set_scene(true, f_side);
}
}

Expand Down Expand Up @@ -1838,22 +1836,21 @@ void Courtroom::on_chat_return_pressed()
else
f_side = current_side;

QString f_desk_mod = "chat";
int f_desk_mod = DESK_SHOW;

if (ao_app->desk_mod_supported) {
f_desk_mod =
QString::number(ao_app->get_desk_mod(current_char, current_emote));
f_desk_mod = ao_app->get_desk_mod(current_char, current_emote);
if (!ao_app->expanded_desk_mods_supported) {
if (f_desk_mod == "2" || f_desk_mod == "4")
f_desk_mod = "0";
else if (f_desk_mod == "3" || f_desk_mod == "5")
f_desk_mod = "1";
if (f_desk_mod == DESK_PRE_ONLY_EX || f_desk_mod == DESK_PRE_ONLY)
f_desk_mod = DESK_HIDE;
else if (f_desk_mod == DESK_EMOTE_ONLY_EX || f_desk_mod == DESK_EMOTE_ONLY)
f_desk_mod = DESK_SHOW;
}
if (f_desk_mod == "-1")
f_desk_mod = "chat";
if (f_desk_mod == -1)
f_desk_mod = DESK_SHOW;
}

packet_contents.append(f_desk_mod);
packet_contents.append(QString::number(f_desk_mod));

QString f_pre = ao_app->get_pre_emote(current_char, current_emote);
int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
Expand Down Expand Up @@ -2471,8 +2468,6 @@ void Courtroom::display_character()
else {
ui_vp_sticker->stop();
}
// Initialize the correct pos (called SIDE here for some reason) with DESK_MOD to determine if we should hide the desk or not.
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);

// Arrange the netstrings of the frame SFX for the character to know about
if (!m_chatmessage[FRAME_SFX].isEmpty() &&
Expand Down Expand Up @@ -3475,20 +3470,20 @@ void Courtroom::play_preanim(bool immediate)
ui_vp_player_char->set_play_once(true);
ui_vp_player_char->load_image(f_preanim, f_char, preanim_duration, true);

switch(m_chatmessage[DESK_MOD].toInt()) {
case 4:
switch (m_chatmessage[DESK_MOD].toInt()) {
case DESK_EMOTE_ONLY_EX:
ui_vp_sideplayer_char->hide();
ui_vp_player_char->move_and_center(0, 0);
[[fallthrough]];
case 2:
set_scene("0", m_chatmessage[SIDE]);
break;
case 5:
case 3:
set_scene("1", m_chatmessage[SIDE]);
case DESK_EMOTE_ONLY:
case DESK_HIDE:
set_scene(false, m_chatmessage[SIDE]);
break;
default:
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);

case DESK_PRE_ONLY_EX:
case DESK_PRE_ONLY:
case DESK_SHOW:
set_scene(true, m_chatmessage[SIDE]);
break;
}

Expand Down Expand Up @@ -3526,21 +3521,21 @@ void Courtroom::start_chat_ticking()

// handle expanded desk mods
switch(m_chatmessage[DESK_MOD].toInt()) {
case 4:
case DESK_EMOTE_ONLY_EX:
set_self_offset(m_chatmessage[SELF_OFFSET]);
[[fallthrough]];
case 2:
set_scene("1", m_chatmessage[SIDE]);
case DESK_EMOTE_ONLY:
case DESK_SHOW:
set_scene(true, m_chatmessage[SIDE]);
break;
case 5:

case DESK_PRE_ONLY_EX:
ui_vp_sideplayer_char->hide();
ui_vp_player_char->move_and_center(0, 0);
[[fallthrough]];
case 3:
set_scene("0", m_chatmessage[SIDE]);
break;
default:
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);
case DESK_PRE_ONLY:
case DESK_HIDE:
set_scene(false, m_chatmessage[SIDE]);
break;
}

Expand Down Expand Up @@ -3912,19 +3907,15 @@ void Courtroom::play_sfx()
ao_app->get_sfx_looping(current_char, current_emote) == "1");
}

void Courtroom::set_scene(const QString f_desk_mod, const QString f_side)
void Courtroom::set_scene(bool show_desk, const QString f_side)
{
ui_vp_background->load_image(ao_app->get_pos_path(f_side));
ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true));

if (f_desk_mod == "0" ||
(f_desk_mod != "1" &&
(f_side == "jud" || f_side == "hld" || f_side == "hlp"))) {
ui_vp_desk->hide();
}
else {
if (show_desk)
ui_vp_desk->show();
}
else
ui_vp_desk->hide();
}

void Courtroom::set_self_offset(const QString& p_list) {
Expand Down