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

populate areas on ARUP

Browse Source
This commit is contained in:
cidoku 2025-02-19 03:23:17 -03:00
parent 246f4545a8
commit 4517786004
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AO2XPbase/ao2xp_themes/default/theme.py
View File

@ -46,6 +46,18 @@ self.evidencedesc.setGeometry(8, 108, 714 - 304 - 22, 112)
self.evidenceimage.setGeometry(326, 8, 70, 70)
self.evidenceadd.move(8, 32)
self.evidenceadd.resize(30, 26)
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())

25
gameview.py
View File

@ -843,7 +843,6 @@ class gui(QtGui.QWidget):
self.evidenceadd = QtGui.QPushButton(QtGui.QIcon(AO2XPpath + "icons/" + "add.png"), "", self.gametab_evidence)
self.evidenceadd.setToolTip('Add new evidence')
self.evidenceadd.clicked.connect(self.onAddEvidence)
self.evidenceadd.resize(self.evidenceadd.sizeHint())
self.evidenceedit = QtGui.QPushButton(QtGui.QIcon(AO2XPpath + "icons/" + "edit.png"), "", self.gametab_evidence)
self.evidenceedit.setToolTip('Edit selected evidence')
self.evidenceedit.clicked.connect(self.onEditEvidence)
@ -878,17 +877,6 @@ class gui(QtGui.QWidget):
self.evidenceswitchglobal.setToolTip('Switch to global inventory')
self.evidenceswitchglobal.clicked.connect(self.onSwitchInventory)
self.evidenceedit.resize(self.evidenceadd.size())
self.evidencedelete.resize(self.evidenceadd.size())
self.evidenceload.resize(self.evidenceadd.size())
self.evidencesave.resize(self.evidenceadd.size())
self.evidencemoveprivate.resize(self.evidenceadd.size())
self.evidencemoveallprivate.resize(self.evidenceadd.size())
self.evidencemoveglobal.resize(self.evidenceadd.size())
self.evidencemoveallglobal.resize(self.evidenceadd.size())
self.evidenceswitchprivate.resize(self.evidenceadd.size())
self.evidenceswitchglobal.resize(self.evidenceadd.size())
self.evidencepresent = PresentButton(self, self.gametab_evidence)
self.privatedropdown.hide()
@ -1756,10 +1744,8 @@ class gui(QtGui.QWidget):
return
evi = self.evidence
if len(evi) == 0:
self.selectedevi = -1
else:
self.selectedevi = ind
self.selectedevi = ind
if len(evi) > 0:
self.evidencedesc.setText(evi[ind][1])
self.setEvidenceImg(self.evidenceimage, evi[ind][2])
@ -3439,14 +3425,17 @@ class TCP_Thread(QtCore.QThread):
elif header == 'PR':
del network[0]
#print "(PR) id: %s, type: %d" % (network[0], int(network[1]))
self.updatePlayerList.emit(network[0], 0, int(network[1]), "")
elif header == 'PU':
del network[0]
#print "(PU) id: %s, type: %d, data: %s" % (network[0], int(network[1]), network[2])
self.updatePlayerList.emit(network[0], 1, int(network[1]), network[2].decode('utf-8'))
elif header == 'ARUP':
del network[0]
type = int(network[0])
self.parent.areas[type] = [network[i] for i in range(1, len(network))]
class DownloadThread(QtCore.QThread):
# Part of the evil HTTPS music download hack for XP systems
finished_signal = QtCore.pyqtSignal(int)

5
mainmenu.py
View File

@ -624,10 +624,7 @@ 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))]
else: #area status, casemakers or locked area
areas[type] = [network[i] for i in range(1, len(network))]
areas[type] = [network[i] for i in range(1, len(network))]
elif header == 'DONE':
if self.disconnect: