show server-defined courtroom background on join

AO2XPbase/ao2xp_themes/default/theme.py

@@ -1,5 +1,33 @@
 self.gamewindow.setFixedSize(820, 730)
 
+self.text.setGeometry(16, 32, VIEWPORT_W - 32, 112)
+self.text.setStyleSheet('background-color: rgba(0, 0, 0, 0); color: white;')
+
+self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112)
+self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;")
+
+self.name.setStyleSheet('color: white')
+self.name.move(16, -1)
+self.name.resize(248, 32)
+
+self.icchatinput.setGeometry(0, VIEWPORT_H, VIEWPORT_W, 23)
+self.emotedropdown.setGeometry(164 - 28, 344 + 66 + 4, 72, 20)
+self.colordropdown.setGeometry(self.emotedropdown.x(), 376 + 64, 72, 20)
+self.posdropdown.setGeometry(self.emotedropdown.x() + self.emotedropdown.size().width() + 4, self.emotedropdown.y(), 72, 20)
+
+self.flipbutton.move(self.posdropdown.x() + self.posdropdown.width() + 4, self.colordropdown.y() - 5)
+self.sfxbutton.move(self.flipbutton.x(), self.flipbutton.y() + 14)
+self.nointerruptbtn.move(self.flipbutton.x() + 140, self.flipbutton.y())
+self.additivebtn.move(self.nointerruptbtn.x(), self.sfxbutton.y())
+
+self.deskbtn.move(self.flipbutton.x()+70, self.flipbutton.y())
+self.effectdropdown.setGeometry(self.posdropdown.x(), self.colordropdown.y(), 72, 20)
+self.callmodbtn.setGeometry(10, 376 + 62, 60, 23)
+self.settingsbtn.setGeometry(self.callmodbtn.x()+self.callmodbtn.size().width(), 376 + 62, self.callmodbtn.width(), 23)
+self.changechar.setGeometry(10, 344 + 66 + 4, self.callmodbtn.size().width() + self.settingsbtn.size().width(), 23)
+
+self.shownameedit.setGeometry(self.posdropdown.x() + self.posdropdown.width() + 4, self.posdropdown.y(), 168 + 56, 20)
+
 self.ooclog.setGeometry(814 - 288, 0, 288, 248)
 self.oocnameinput.resize(self.oocnameinput.sizeHint().width() - 32, self.oocnameinput.sizeHint().height())
 self.oocnameinput.move(814 - 288, 248)
@@ -8,29 +36,54 @@ self.oocinput.move(814 - 288 + self.oocnameinput.size().width(), 248)
 self.ooclogin.resize(48, 20)
 self.ooclogin.move(814 - (self.ooclogin.size().width()), self.oocinput.y() + self.ooclogin.size().height())
 
-self.musicitems.setGeometry(814 - 288, 468, 288, 256)
+self.musicareatabs.setGeometry(814 - 288, 468, 288, 256)
 
 self.icLog.setGeometry(8, 8, 714 - 304 - 22, 212)
 
 self.evidencedropdown.setGeometry(8, 8, 192, 20)
+self.privatedropdown.setGeometry(8, 8, 192, 20)
 self.evidencedesc.setGeometry(8, 108, 714 - 304 - 22, 112)
 self.evidenceimage.setGeometry(326, 8, 70, 70)
+
 self.evidenceadd.move(8, 32)
-self.evidenceedit.move(8, 56)
+self.evidenceadd.resize(30, 26)
-self.evidencedelete.move(8, 80)
+evidenceadd_size = self.evidenceadd.size()
+self.evidenceedit.resize(evidenceadd_size)
+self.evidencedelete.resize(evidenceadd_size)
+self.evidenceload.resize(evidenceadd_size)
+self.evidencesave.resize(evidenceadd_size)
+self.evidencemoveprivate.resize(evidenceadd_size)
+self.evidencemoveallprivate.resize(evidenceadd_size)
+self.evidencemoveglobal.resize(evidenceadd_size)
+self.evidencemoveallglobal.resize(evidenceadd_size)
+self.evidenceswitchprivate.resize(evidenceadd_size)
+self.evidenceswitchglobal.resize(evidenceadd_size)
+self.evidenceedit.move(3 + self.evidenceadd.x() + self.evidenceadd.size().width(), self.evidenceadd.y())
+self.evidencedelete.move(3 + self.evidenceedit.x() + self.evidenceedit.size().width(), self.evidenceadd.y())
+self.evidencemoveprivate.move(3 + self.evidencedelete.x() + self.evidencedelete.size().width(), self.evidenceadd.y())
+self.evidencemoveallprivate.move(3 + self.evidencemoveprivate.x() + self.evidencemoveprivate.size().width(), self.evidenceadd.y())
+self.evidencemoveglobal.move(3 + self.evidencedelete.x() + self.evidencedelete.size().width(), self.evidenceadd.y())
+self.evidencemoveallglobal.move(3 + self.evidencemoveprivate.x() + self.evidencemoveprivate.size().width(), self.evidenceadd.y())
+self.evidenceswitchprivate.move(3 + self.evidencemoveallprivate.x() + self.evidencemoveallprivate.size().width(), self.evidenceadd.y())
+self.evidenceswitchglobal.move(3 + self.evidencemoveallprivate.x() + self.evidencemoveallprivate.size().width(), self.evidenceadd.y())
+
+self.evidenceload.move(3 + self.evidenceswitchprivate.x() + self.evidenceswitchprivate.size().width(), self.evidenceadd.y())
+self.evidencesave.move(3 + self.evidenceload.x() + self.evidenceload.size().width(), self.evidenceadd.y())
+
 self.evidencepresent.move((714 - 304 - 22) / 2 - self.evidencepresent.button_off.size().width() / 2, self.evidencedesc.y() - self.evidencepresent.button_off.size().height())
 
 self.msgqueueList.setGeometry(8, 8, 714 - 304 - 22, 180)
 self.playerList.setGeometry(8, 8, 714 - 304 - 22, 180)
 self.removeQueue.resize(self.removeQueue.sizeHint())
 self.removeQueue.move(8, self.msgqueueList.size().height() + 16)
+self.clearQueue.move(self.removeQueue.x() + self.removeQueue.size().width(), self.removeQueue.y())
 
 self.playerPair.resize(self.playerPair.sizeHint())
-self.playerPair.move(8, self.playerList.size().height() + 16)
 self.playerKick.resize(self.playerKick.sizeHint())
-self.playerKick.move(16 + self.playerPair.size().width(), self.playerList.size().height() + 16)
 self.playerBan.resize(self.playerBan.sizeHint())
-self.playerBan.move(24 + self.playerPair.size().width() + self.playerKick.size().width(), self.playerList.size().height() + 16)
+self.playerPair.move(8, self.playerList.size().height() + 16)
+self.playerKick.move(8 + self.playerPair.x() + self.playerPair.size().width(), self.playerList.size().height() + 16)
+self.playerBan.move(8 + self.playerKick.x() + self.playerKick.size().width(), self.playerList.size().height() + 16)
 
 self.notmutedlabel.move(8, 8)
 self.unmutedlist.setGeometry(8, 24, 160, 192)
@@ -73,3 +126,6 @@ self.sliderlabel2.move(self.soundslider.x() + self.soundslider.size().width()+8,
 self.sliderlabel3.move(self.blipslider.x() + self.blipslider.size().width()+8, self.blipslider.y())
 
 self.pinglabel.setGeometry(self.sliderlabel3.x() + 32, self.sliderlabel3.y(), 96, 14)
+
+self.defensebar.moveBar(265 + 164, 164 + 304)
+self.prosecutionbar.moveBar(265 + 164, 178 + 304)

mainmenu.py

@@ -481,7 +481,7 @@ class AOServerInfo(QtCore.QThread):
         gotChars = False
         hplist = []
         joinooc = []
-        areas = [[], [], [], []]
+        areas = [[], [], [], [], []]
         features = []
         evidence = []
         playerlist = {}
@@ -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:
@@ -624,17 +624,19 @@ class AOServerInfo(QtCore.QThread):
                 elif header == "ARUP": #AO2 2.6 new feature: area update
                     del network[0]
                     type = int(network[0])
-                    if type == 0: #player count
+                    areas[type] = [network[i] for i in range(1, len(network))]
-                        areas[type] = [network[i] for i in range(1, len(network))]
+                    areas_len = len(areas[type])
-                    else: #area status, casemakers or locked area
+                    print '[client]', 'the server has %d areas' % areas_len
-                        areas[type] = [network[i] for i in range(1, len(network))]
+                    for i in range(areas_len):
+                        areas[4].append(musiclist[0])
+                        del musiclist[0]
                     
                 elif header == 'DONE':
                     if self.disconnect:
                         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':