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

Added jur and sea positions.

Browse Source
This commit is contained in:
Cerapter 2018-09-04 22:45:07 +02:00
parent d0a6e081de
commit adfe21afd6
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
courtroom.cpp
View File

@ -137,6 +137,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_pos_dropdown->addItem("jud"); ui_pos_dropdown->addItem("jud");
ui_pos_dropdown->addItem("hld"); ui_pos_dropdown->addItem("hld");
ui_pos_dropdown->addItem("hlp"); ui_pos_dropdown->addItem("hlp");
ui_pos_dropdown->addItem("jur");
ui_pos_dropdown->addItem("sea");
ui_defense_bar = new AOImage(this, ao_app); ui_defense_bar = new AOImage(this, ao_app);
ui_prosecution_bar = new AOImage(this, ao_app); ui_prosecution_bar = new AOImage(this, ao_app);
@ -1482,7 +1484,7 @@ void Courtroom::handle_chatmessage_3()
//shifted by 1 because 0 is no evidence per legacy standards //shifted by 1 because 0 is no evidence per legacy standards
QString f_image = local_evidence_list.at(f_evi_id - 1).image; QString f_image = local_evidence_list.at(f_evi_id - 1).image;
//def jud and hlp should display the evidence icon on the RIGHT side //def jud and hlp should display the evidence icon on the RIGHT side
bool is_left_side = !(f_side == "def" || f_side == "hlp" || f_side == "jud"); bool is_left_side = !(f_side == "def" || f_side == "hlp" || f_side == "jud" || f_side == "jur");
ui_vp_evidence_display->show_evidence(f_image, is_left_side, ui_sfx_slider->value()); ui_vp_evidence_display->show_evidence(f_image, is_left_side, ui_sfx_slider->value());
} }
@ -2321,6 +2323,16 @@ void Courtroom::set_scene()
f_background = "prohelperstand"; f_background = "prohelperstand";
f_desk_image = "prohelperdesk"; f_desk_image = "prohelperdesk";
} }
else if (f_side == "jur")
{
f_background = "jurystand";
f_desk_image = "jurydesk";
}
else if (f_side == "sea")
{
f_background = "seancestand";
f_desk_image = "seancedesk";
}
else else
{ {
if (is_ao2_bg) if (is_ao2_bg)

2
server/aoprotocol.py
View File

@ -427,7 +427,7 @@ class AOProtocol(asyncio.Protocol):
if self.client.pos: if self.client.pos:
pos = self.client.pos pos = self.client.pos
else: else:
if pos not in ('def', 'pro', 'hld', 'hlp', 'jud', 'wit'): if pos not in ('def', 'pro', 'hld', 'hlp', 'jud', 'wit', 'jur', 'sea'):
return return
msg = text[:256] msg = text[:256]
if self.client.shaken: if self.client.shaken:

4
server/client_manager.py
View File

@ -345,8 +345,8 @@ class ClientManager:
return self.server.char_list[self.char_id] return self.server.char_list[self.char_id]
def change_position(self, pos=''): def change_position(self, pos=''):
if pos not in ('', 'def', 'pro', 'hld', 'hlp', 'jud', 'wit'): if pos not in ('', 'def', 'pro', 'hld', 'hlp', 'jud', 'wit', 'jur', 'sea'):
raise ClientError('Invalid position. Possible values: def, pro, hld, hlp, jud, wit.') raise ClientError('Invalid position. Possible values: def, pro, hld, hlp, jud, wit, jur, sea.')
self.pos = pos self.pos = pos
def set_mod_call_delay(self): def set_mod_call_delay(self):

11
server/evidence.py
View File

@ -24,7 +24,16 @@ class EvidenceList:
def __init__(self): def __init__(self):
self.evidences = [] self.evidences = []
self.poses = {'def':['def', 'hld'], 'pro':['pro', 'hlp'], 'wit':['wit'], 'hlp':['hlp', 'pro'], 'hld':['hld', 'def'], 'jud':['jud'], 'all':['hlp', 'hld', 'wit', 'jud', 'pro', 'def', ''], 'pos':[]} self.poses = {'def':['def', 'hld'],
'pro':['pro', 'hlp'],
'wit':['wit', 'sea'],
'sea':['sea', 'wit'],
'hlp':['hlp', 'pro'],
'hld':['hld', 'def'],
'jud':['jud', 'jur'],
'jur':['jur', 'jud'],
'all':['hlp', 'hld', 'wit', 'jud', 'pro', 'def', 'jur', 'sea', ''],
'pos':[]}
def login(self, client): def login(self, client):
if client.area.evidence_mod == 'FFA': if client.area.evidence_mod == 'FFA':