cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show server-defined courtroom background on join

Browse Source
This commit is contained in:
cidoku 2025-02-19 13:09:46 -03:00
parent c61733de05
commit 3cceac4d0c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gameview.py
View File

@ -2180,8 +2180,11 @@ class gui(QtGui.QWidget):
style += "color: rgb("+str(color.red())+", "+str(color.green())+", "+str(color.blue())+")"
self.ao2text.setStyleSheet(style)
def set_scene(self):
def set_scene(self, init=False):
if not init:
side = self.m_chatmessage[SIDE]
else:
side = 'wit'
if side == 'def':
self.court.setPixmap(self.side_def)
@ -2935,6 +2938,9 @@ class gui(QtGui.QWidget):
self.icLog.append(logstart)
self.setBackground(background.lower())
self.set_scene(True)
self.chatbox.hide()
for msg in oocjoin:
self.ooclog.append(msg)

12
mainmenu.py
View File

@ -571,7 +571,7 @@ class AOServerInfo(QtCore.QThread):
self.setConnectProgress.emit('Requesting music list (%d)...' % maxmusic)
self.tcp.send('RM#%')
print '[client]', 'received characters (%d)' % len(charlist)
print '[client]', 'Received characters (%d)' % len(charlist)
elif header == 'SM':
if self.disconnect:
@ -582,7 +582,7 @@ class AOServerInfo(QtCore.QThread):
self.setConnectProgress.emit('Finishing...')
self.tcp.send('RD#%')
print '[client]', 'received songs (%d)' % len(musiclist)
print '[client]', 'Received songs (%d)' % len(musiclist)
elif header == 'CharsCheck':
if self.disconnect or not gotChars:
@ -595,7 +595,7 @@ class AOServerInfo(QtCore.QThread):
if self.disconnect:
continue
background = network[1]
print '[client]', 'courtroom background: %s' % background
print '[client]', 'Courtroom background: %s' % background
elif header == 'LE':
if self.disconnect:
@ -612,7 +612,7 @@ class AOServerInfo(QtCore.QThread):
evi[0] = decode_ao_str(evi[0].decode("utf-8"))
evi[1] = decode_ao_str(evi[1].decode("utf-8"))
evi[2] = decode_ao_str(evi[2].decode("utf-8"))
print '[client]', 'received evidence'
print '[client]', 'Received evidence'
elif header == 'HP':
if self.disconnect:
@ -626,7 +626,7 @@ class AOServerInfo(QtCore.QThread):
type = int(network[0])
areas[type] = [network[i] for i in range(1, len(network))]
areas_len = len(areas[type])
print '[client]', 'received areas (%d)' % areas_len
print '[client]', 'the server has %d areas' % areas_len
for i in range(areas_len):
areas[4].append(musiclist[0])
del musiclist[0]
@ -636,7 +636,7 @@ class AOServerInfo(QtCore.QThread):
continue
self.setConnectProgress.emit('Done, loading...')
self.readySoon.emit()
print '[client]', 'finished requesting data, loading game...'
print '[client]', 'Finished requesting data. Loading game...'
readytick = 4
elif header == 'CT':